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

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

@@ -124,7 +124,7 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
         Double nowbalanceTotal = new Double(0);
         for(Recbalancedetail detail : recbalancedetail){
             //本次核销金额
-            Double nowbalance = detail.getRbd_nowbalance();
+            Double nowbalance = detail.getRbd_nowbalance()==null?new Double(0):detail.getRbd_nowbalance();
             nowbalanceTotal = nowbalanceTotal + nowbalance;
             //来源单号
             Integer sourceId = detail.getRbd_slid();
@@ -132,7 +132,7 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
             Double namount = new Double(0);
             if(sourceId!=0){
                 Subledger subledger = subledgerMapper.selectByPrimaryKey(sourceId);
-                namount = subledger.getSl_namount();
+                namount = subledger.getSl_namount()==null?new Double(0):subledger.getSl_namount();
             }
             //本次核销金额不能大于未核销金额
             if(nowbalance>namount){

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

@@ -27,7 +27,7 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                     Ext.apply(f,{
                         //赋值 
                         dbfinds:[{
-                            from: 'id', to: 'rb_bankid'
+                            from: 'id', to: 'rd_bankid'
                         }, {
                             from:'bk_bankcode', to:'rd_bankcode'
                         },{

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

@@ -202,7 +202,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
             xtype: 'numbercolumn',
             width: 120, 
             renderer : function(v) {
-            return Ext.util.Format.number(v, '0');
+                return Ext.util.Format.number(v, '0');
             }
         }, {
             text: '物料编号',
@@ -218,7 +218,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
             width: 180
         }, {
             text: '单位',
-            dataIndex: 'pr_spec',
+            dataIndex: 'pr_unit',
             width: 100
         },{
             text: '采购数量',
@@ -232,7 +232,8 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
                 return Ext.util.Format.number(v, format);
             },
         }, {
-            text: '交货日期',
+            // text: '交货日期',
+            text: '需求日期',
             dataIndex: 'pd_delivery',
             xtype: 'datecolumn',
             width: 200
@@ -243,7 +244,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
             width: 100,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
+                var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
                 var format = '0,000.' + xr.join();
                 return Ext.util.Format.number(v, format);
             }

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

@@ -190,13 +190,7 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
         },{
             text: '单位',
             dataIndex: 'pr_unit',
-            width: 120,
-            renderer : function(v) {
-                var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
-                var format = '0,000.' + xr.join();
-                return Ext.util.Format.number(v, format);
-            },
+            width: 120
         },{
             text: '数量',
             dataIndex: 'pd_inqty',

frontend/saas-web/app/view/purchase/report/Purchase.js

@@ -8,7 +8,7 @@ Ext.define('saas.view.purchase.report.Purchase', {
     viewName: 'purchase-report-purchase',
 
     groupField: null,
-    listUrl: '/api/purchase/purchase/list',
+    listUrl: '/api/purchase/report/purchaseDetail',
     defaultCondition: null,
     reportTitle: '采购明细报表',
     QueryWidth:0.2,

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

@@ -162,20 +162,23 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
             width: 200
         }, {
             text: '客户名称',
-            dataIndex: 'sa_cuname',
+            dataIndex: 'sa_custname',
             width: 120
         }, {
             text: '明细序号',
             dataIndex: 'sd_detno',
             xtype: 'numbercolumn',
-            width: 120
+            width: 120,
+            renderer : function(v) {
+                return Ext.util.Format.number(v, '0');
+            }
         }, {
             text: '物料编号',
             dataIndex: 'sd_prodcode',
             width: 120
         }, {
             text: '物料名称',
-            dataIndex: 'pe_detail',
+            dataIndex: 'pr_detail',
             width: 120
         }, {
             text: '物料规格',