Merge remote-tracking branch 'origin/dev' into dev

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/PaybalanceServiceImpl.java

@@ -150,7 +150,13 @@ public class PaybalanceServiceImpl implements PaybalanceService {
         //更新本次预付款金额
         Paybalance updatePay = new Paybalance();
         updatePay.setId(paybalance.getId());
-        updatePay.setPb_preamount(amountTotal+paybalance.getPb_discounts()-nowbalanceTotal);
+
+        //折扣
+        Double discounts = paybalance.getPb_discounts();
+        if(discounts == null){
+            discounts = 0.0;
+        }
+        updatePay.setPb_preamount(amountTotal + discounts - nowbalanceTotal);
         paybalanceMapper.updateByPrimaryKeySelective(updatePay);
     }
 

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/RecbalanceServiceImpl.java

@@ -96,7 +96,7 @@ public class RecbalanceServiceImpl implements RecbalanceService {
 
     /**
      * 校验数据
-     * @param Rec
+     * @param rec
      */
     private void checkRecbalance(Rec rec){
         Recbalance recbalance = rec.getMain();
@@ -147,7 +147,13 @@ public class RecbalanceServiceImpl implements RecbalanceService {
         //更新本次预付款金额
         Recbalance updatePay = new Recbalance();
         updatePay.setId(recbalance.getId());
-        updatePay.setRb_preamount(amountTotal+recbalance.getRb_discounts()-nowbalanceTotal);
+
+        //折扣
+        Double discount = recbalance.getRb_discounts();
+        if (discount == null){
+            discount = 0.0;
+        }
+        updatePay.setRb_preamount(amountTotal + discount - nowbalanceTotal);
         recbalanceMapper.updateByPrimaryKeySelective(updatePay);
     }
 

frontend/saas-web/app/util/FormUtil.js

@@ -50,6 +50,7 @@ Ext.define('saas.util.FormUtil', {
                         
                         if(item.xtype == 'datefield') {
                             Ext.applyIf(item, {
+                                editable: false,
                                 format: 'Y-m-d'
                             });
                         }
@@ -122,6 +123,9 @@ Ext.define('saas.util.FormUtil', {
                                         Ext.apply(editor, {
                                             format: 'Y-m-d'
                                         });
+                                        Ext.applyIf(editor, {
+                                            editable: false
+                                        });
                                     }
                                 }
                             });

frontend/saas-web/app/view/core/query/QueryPanel.js

@@ -17,7 +17,7 @@ Ext.define('saas.view.core.query.QueryPanel', {
         xtype: 'core-query-queryformpanel',
         width: '100%',
     }, {
-        margin: '32 0 0 0',
+        margin: '24 0 0 0',
         padding: '24',
         reference: 'querygrid',
         xtype: 'core-query-querygridpanel',

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

@@ -8,17 +8,17 @@ Ext.define('saas.view.document.bom.BasePanel', {
     searchField:[{ 
         xtype : "textfield", 
         name : "bo_mothercode", 
-        emptyText : "母件编号", 
+        emptyText : "产品编号", 
         width:120
     },{
         xtype : "textfield", 
         name : "bo_mothername", 
-        emptyText : "母件名称", 
+        emptyText : "产品名称", 
         width:120
     },{
         xtype : "textfield", 
         name : "bo_status", 
-        emptyText : "BOM状态",    
+        emptyText : "产品状态",    
         width:100
     }],
 
@@ -42,32 +42,32 @@ Ext.define('saas.view.document.bom.BasePanel', {
             dataIndex : "id", 
             xtype : "numbercolumn",   
         },{
-            text : "母件id", 
+            text : "产品id", 
             width : 0, 
             dataIndex : "bo_motherid", 
             xtype : "numbercolumn",   
         },{
-            text : "母件编号", 
+            text : "产品编号", 
             dataIndex : "bo_mothercode",
             width : 200.0,
         }, 
         {
-            text : "母件名称", 
+            text : "产品名称", 
             dataIndex : "bo_mothername", 
             width : 120.0, 
         }, 
         {
-            text : "BOM状态", 
+            text : "产品状态", 
             dataIndex : "bo_status", 
             width : 120.0, 
         }, 
         {
-            text : "BOM状态码", 
+            text : "产品状态码", 
             dataIndex : "bo_statuscode", 
             width : 0, 
         },
         {   
-            text : "BOM版本", 
+            text : "产品版本", 
             dataIndex : "bo_version", 
             width : 120.0, 
         }]

frontend/saas-web/app/view/document/bom/FormPanel.js

@@ -73,7 +73,8 @@ Ext.define('saas.view.document.bom.FormPanel', {
     },{
         xtype: 'textfield',
         name: 'bo_status',
-        fieldLabel: '产品状态'
+        fieldLabel: '产品状态',
+
     },{
         xtype: 'hidden',
         name: 'bo_statuscode',
@@ -105,6 +106,7 @@ Ext.define('saas.view.document.bom.FormPanel', {
                 allowBlank:false,
                 text : "物料编号", 
                 dataIndex : "bd_soncode", 
+                width : 160, 
                 editor : {
                     displayField : "display", 
                     editable : true, 
@@ -148,11 +150,7 @@ Ext.define('saas.view.document.bom.FormPanel', {
                     return v;
                 }
             }, {
-                allowBlank:false,
                 text : "单位", 
-                editor : {
-                    xtype : "textfield"
-                },
                 dataIndex : "bd_unit", 
             },
             {
@@ -195,14 +193,15 @@ Ext.define('saas.view.document.bom.FormPanel', {
                     xtype : "textfield"
                 },
             }]
-    },{
-        xtype : "datefield", 
-        name : "createTime", 
-        fieldLabel : "创建时间"
     },{  
+        xtype : "textfield", 
+        name : "bo_recorder", 
+        reddOnly:true,
+        fieldLabel : "录入人"
+    },{
         xtype : "datefield", 
-        name : "updateTime", 
-        fieldLabel : "更新时间"
+        name : "bo_recorddate", 
+        fieldLabel : "录入时间"
     }],
 
     auditTexts: {

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

@@ -53,6 +53,10 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
          fieldLabel : "账户名称",
          allowBlank : false
      }, {
+        xtype:'datefield',
+        name : 'or_date',
+        fieldLabel : '单据日期'
+    },{
         name : "detailGridField", 
         xtype : "detailGridField", 
         storeModel:'saas.model.money.Othreceipts',
@@ -72,9 +76,9 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
                     xtype : "numberfield",
                     readOnly: true
                 },
-                defaultValue: Ext.Date.format(new Date(), 'Ym'),
+                // defaultValue: Ext.Date.format(new Date(), 'Ym'),
                 width : 120.0,
-                // hidden: true,
+                hidden: true,
                 items : null
             }, {
                 text : "收入类别", 

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

@@ -76,9 +76,9 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
                     xtype : "numberfield",
                     readOnly:true
                 },
-                defaultValue: Ext.Date.format(new Date(), 'Ym'),
+                // defaultValue: Ext.Date.format(new Date(), 'Ym'),
                 width : 120.0, 
-                // hidden: true,
+                hidden: true,
                 items : null
             }, {
                 text : "支出类别", 
@@ -139,7 +139,8 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
     },{
         xtype : 'numberfield',
         name : 'os_amount',
-        fieldLabel : '付款金额'
+        fieldLabel : '付款金额',
+        readOnly:true
     },{
         xtype : "textfield", 
         name : "os_remark", 

frontend/saas-web/app/view/money/payBalance/FormPanel.js

@@ -207,18 +207,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
             }
         }, {
             text: "业务类型",
-            dataIndex: "pbd_slkind",
-            editor : {
-                xtype:'combo',
-                queryMode: 'local',
-                displayField: 'display',
-                valueField: 'value',
-                store:Ext.create('Ext.data.Store', {
-                    fields: ['value', 'display'],
-                    data : [{value:"应付", display:"应付"},
-                        {value:"应收", display:"应收"}]
-                })
-            }
+            dataIndex: "pbd_slkind"
         }, {
             text: "单据日期",
             dataIndex: "pbd_sldate",
@@ -290,6 +279,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
                 xtype : "numberfield",
                 decimalPrecision: 2
             },
+            allowBlank : false,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length)).fill('0');

frontend/saas-web/app/view/money/recBalance/FormPanel.js

@@ -275,6 +275,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
                 xtype : "numberfield",
                 decimalPrecision: 2
             },
+            allowBlank : false,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length)).fill('0');

frontend/saas-web/app/view/stock/make/FormPanelController.js

@@ -499,13 +499,12 @@ Ext.define('saas.view.stock.make.FormPanelController', {
                         mm_prodidid:item.bd_sonid,
                         mm_prodcode:item.bd_soncode,
                         mm_oneuseqty:item.bd_baseqty,
-                        pr_detail:'',
-                        pr_spec:'',
-                        pr_unit:''
+                        pr_detail:item.productDTO.pr_detail,
+                        pr_spec:item.productDTO.pr_spec,
+                        pr_unit:item.productDTO.pr_unit
                     })                
                 });
-                store.loadData(loadData)
-        
+                store.loadData(loadData);
             }
         })
         .catch(function(res) {

frontend/saas-web/resources/json/navigation.json

@@ -112,9 +112,13 @@
     }, {
         "text": "报表",
         "items": [{
-            "text": "物料出入库明细表"
+            "text": "物料出入库明细表",
+            "id":"prodiodetail",
+            "viewType": "stock-report-prodiodetail"
         }, {
-            "text": "物料收发汇总表"
+            "text": "物料收发汇总表",
+            "id":"prodinoutCount",
+            "viewType": "stock-report-prodinoutCount"
         }, {
             "text": "物料库存数量金额表",
             "id":"stock-stockamount-datalist",