Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform 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/core/report/ReportPanel.js

@@ -13,7 +13,7 @@ Ext.define('saas.view.core.report.ReportPanel', {
 
     layout: 'vbox',
     autoScroll: true,
-    border: 1,
+    bodyBorder:false,
     bodyPadding: 5,
 
     groupField: null, // 分组字段
@@ -49,7 +49,7 @@ Ext.define('saas.view.core.report.ReportPanel', {
                         style: {
                             float: 'right'
                         },
-                        text: '导出为...',
+                        text: '导出',
                         menu: {
                             defaults: {
                                 handler: 'exportTo'
@@ -112,7 +112,7 @@ Ext.define('saas.view.core.report.ReportPanel', {
                 width: '100%',
                 cls: 'x-report-grid',
                 flex: 1,
-                border: 1,
+                border: 0,
                 sortableColumns: false,
                 enableColumnHide: false,
                 rowLines: false,

frontend/saas-web/app/view/core/report/ReportPanel.scss

@@ -34,6 +34,12 @@
                 border-color: #999 !important;
                 border-width: 1px !important;
             }
+            .x-panel-default-outer-border-rl {
+                border-right-color: #999 !important;
+                border-right-width: 1px !important;
+                border-left-color:  #999 !important;
+                border-left-width: 1px !important;
+            }
         }
     }
 }

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/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",