Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/ProductServiceImpl.java

@@ -88,12 +88,14 @@ public class ProductServiceImpl extends CommonBaseServiceImpl<ProductMapper, Pro
         //校验明细仓库是否重复
         validRepeatWarehouse(productDetailList);
 
+        //保存
+        String code = pushMaxnubmer(product.getPr_code(), product.getId());
+
         if(product.getId() == 0){
-            //保存
-            String code = pushMaxnubmer(product.getPr_code(), product.getId());
             product.setCompanyId(companyId);
             product.setCreatorId(userId);
             product.setCreateTime(new Date());
+            product.setPr_code(code);
             //保存主表
             getMapper().insertSelective(product);
             //保存明细表数据
@@ -159,6 +161,7 @@ public class ProductServiceImpl extends CommonBaseServiceImpl<ProductMapper, Pro
 
             product.setUpdaterId(BaseContextHolder.getUserId());
             product.setUpdateTime(new Date());
+            product.setPr_code(code);
             getMapper().updateByPrimaryKeySelective(product);
             docBaseDTO = generateMsgObj(product.getId(), product.getPr_code());
             //记录LOG

frontend/saas-web/app/view/document/customer/BasePanel.js

@@ -154,14 +154,7 @@ Ext.define('saas.view.document.customer.BasePanel', {
                 var format = '0,000.' + xr.join();
                 return Ext.util.Format.number(v, format);
             }
-        }, 
-        {
-            text : "开户银行", 
-            dataIndex : "cu_bankaccount"
-        },{
-            text : "银行账户", 
-            dataIndex : "cu_bankcode"
-        },{
+        }, {
             text : "客户状态", 
             dataIndex : "cu_status", 
         }, 

frontend/saas-web/app/view/money/fundtransfer/QueryPanel.js

@@ -12,9 +12,9 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
         name : "ft_code",
         fieldLabel : "单据编号",
     },{
-        xtype : "textfield",
-        name : "ft_recorder",
-        fieldLabel : "制单人",
+        xtype: 'textfield',
+        name: 'creatorName',
+        fieldLabel: '录入人'
     },{
         xtype : "textfield",
         name : "ft_auditman",
@@ -75,10 +75,6 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
         xtype : "bandinfoDbfindTrigger",
         name : "ftd_inbankname",
         fieldLabel : "转入账号",
-    },{
-        xtype: 'textfield',
-        name: 'creatorName',
-        fieldLabel: '录入人'
     }],
     moreQueryFormItems: [],
     queryGridConfig: {

frontend/saas-web/app/view/money/othreceipts/QueryPanel.js

@@ -29,10 +29,10 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
         xtype: 'customerDbfindTrigger',
         name: 'or_custname',
         fieldLabel: '客户名称',
-    }, {
+    },{
         xtype: 'textfield',
-        name: 'or_recorder',
-        fieldLabel: '制单人'
+        name: 'creatorName',
+        fieldLabel: '录入人'
     },{
         xtype: 'textfield',
         name: 'or_auditman',
@@ -76,10 +76,6 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
         fieldLabel: '收入类别',
         xtype : "remotecombo",
         storeUrl:'/api/document/fundinouttype/getCombo?condition=收入',
-    },{
-        xtype: 'textfield',
-        name: 'creatorName',
-        fieldLabel: '录入人'
     }],
     moreQueryFormItems: [],
     queryGridConfig: {

frontend/saas-web/app/view/money/othspendings/QueryPanel.js

@@ -29,10 +29,10 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
         xtype: 'vendorDbfindTrigger',
         name: 'os_vendname',
         fieldLabel: '供应商名称'
-    }, {
+    },{
         xtype: 'textfield',
-        name: 'os_recorder',
-        fieldLabel: '制单人',
+        name: 'creatorName',
+        fieldLabel: '录入人'
     }, {
         xtype: 'hidden',
         name: 'os_auditman',
@@ -75,10 +75,6 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
         fieldLabel: '支出类别',
         xtype : "remotecombo",
         storeUrl:'/api/document/fundinouttype/getCombo?condition=支出',
-    },{
-        xtype: 'textfield',
-        name: 'creatorName',
-        fieldLabel: '录入人'
     }],
     moreQueryFormItems: [],
     queryGridConfig: {

frontend/saas-web/app/view/purchase/purchase/FormPanel.js

@@ -139,19 +139,6 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                     }                     
                     return v;    
                 }
-            },
-            {
-                text : "最小包装数", 
-                xtype: 'numbercolumn',
-                dataIndex : "pr_zxbzs",
-                align: 'end',
-                ignore:true,
-                renderer: function (v, m, r) {
-                    if(!v){
-                        return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null; 
-                    }                     
-                    return v; 
-                }
             },            
             {
                 text : "数量", 
@@ -293,6 +280,19 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                     return Ext.util.Format.number(v, format);
                 }
             },
+            {
+                text : "最小包装数", 
+                xtype: 'numbercolumn',
+                dataIndex : "pr_zxbzs",
+                align: 'end',
+                ignore:true,
+                renderer: function (v, m, r) {
+                    if(!v){
+                        return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null; 
+                    }                     
+                    return v; 
+                }
+            },
             {
                 text : "关联销售单号", 
                 dataIndex : "pd_salecode", 

frontend/saas-web/app/view/purchase/purchase/QueryPanel.js

@@ -89,7 +89,8 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
         addXtype: 'purchase-purchase-formpanel',
         defaultCondition:'',
         baseVastUrl: '/api/purchase/purchase/',
-        baseColumn: [{
+        baseColumn: [
+        {
             text: 'id',
             dataIndex: 'pu_id',
             width: 100,
@@ -164,7 +165,8 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
             xtype: 'datecolumn',
             width: 0
         }],
-        relativeColumn: [{
+        relativeColumn: [
+        {
             text: 'id',
             dataIndex: 'pu_id',
             width: 100,
@@ -198,28 +200,31 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
             text: '序号',
             dataIndex: 'pd_detno',
             xtype: 'numbercolumn',
-            width: 120
+            width: 120, 
+            renderer : function(v) {
+            return Ext.util.Format.number(v, '0');
+            }
         }, {
             text: '物料编号',
             dataIndex: 'pd_prodcode',
-            width: 120
+            width: 150
         },{
             text: '物料名称',
             dataIndex: 'pr_detail',
-            width: 120
+            width: 180
         }, {
             text: '物料规格',
             dataIndex: 'pr_spec',
-            width: 120
+            width: 180
         }, {
             text: '单位',
             dataIndex: 'pr_spec',
-            width: 120
+            width: 100
         },{
             text: '采购数量',
             dataIndex: 'pd_qty',
             xtype: 'numbercolumn',
-            width: 120,
+            width: 100,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
@@ -235,18 +240,18 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
             text: '单价',
             dataIndex: 'pd_price',
             xtype: 'numbercolumn',
-            width: 120,
+            width: 100,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
+                var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
                 var format = '0,000.' + xr.join();
                 return Ext.util.Format.number(v, format);
-            },
+            }
         }, {
             text: '税率',
             dataIndex: 'pd_taxrate',
             xtype: 'numbercolumn',
-            width: 120,
+            width: 100,
             renderer : function(v) {
                 return Ext.util.Format.number(v, '0');
             },
@@ -254,18 +259,18 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
             text: '金额',
             dataIndex: 'pd_total',
             xtype: 'numbercolumn',
-            width: 120,
+            width: 100,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
                 var format = '0,000.' + xr.join();
                 return Ext.util.Format.number(v, format);
-            },
+            }
         },{
             text: '备注',
             dataIndex: 'pu_remark',
             xtype: 'numbercolumn',
-            width: 120
+            width: 250
         }]
     }
 });