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/OthreceiptsServiceImpl.java

@@ -137,7 +137,7 @@ public class OthreceiptsServiceImpl extends CommonBaseServiceImpl<OthreceiptsMap
         Double or_amount = othreceipts.getOr_amount();
         //收款
         Bankinformation bankinformation = bankinformationMapper.selectByPrimaryKey(bk_inid);
-        Double beginamount = bankinformation.getBk_beginamount();
+        Double beginamount = bankinformation.getBk_beginamount() == null ? new Double(0) : bankinformation.getBk_beginamount();
         Double spending = bankinformation.getBk_spending() == null ? new Double(0) : bankinformation.getBk_spending();
         Double incomme = bankinformation.getBk_income() == null ? new Double(0) : bankinformation.getBk_income();
         bankinformation.setBk_thisamount(beginamount + incomme - spending + or_amount);
@@ -234,7 +234,7 @@ public class OthreceiptsServiceImpl extends CommonBaseServiceImpl<OthreceiptsMap
         Double or_amount = othreceipts.getOr_amount();
         //收款
         Bankinformation bankinformation = bankinformationMapper.selectByPrimaryKey(bk_inid);
-        Double beginamount = bankinformation.getBk_beginamount();
+        Double beginamount = bankinformation.getBk_beginamount() == null ? new Double(0) : bankinformation.getBk_beginamount();
         Double spending = bankinformation.getBk_spending() == null ? new Double(0) : bankinformation.getBk_spending();
         Double incomme = bankinformation.getBk_income() == null ? new Double(0) : bankinformation.getBk_income();
         bankinformation.setBk_thisamount(beginamount + incomme - spending - or_amount);

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

@@ -267,7 +267,7 @@ public class OthspendingsServiceImpl extends CommonBaseServiceImpl<OthspendingsM
         Double bk_amount = othspendings.getOs_amount();
         //付款方
         Bankinformation bankinformation = bankinformationMapper.selectByPrimaryKey(bk_id);
-        Double beginamount = bankinformation.getBk_beginamount();
+        Double beginamount = bankinformation.getBk_beginamount() == null ? new Double(0) : bankinformation.getBk_beginamount();
         Double spending = bankinformation.getBk_spending() == null ? new Double(0) : bankinformation.getBk_spending();
         Double incomme = bankinformation.getBk_income() == null ? new Double(0) : bankinformation.getBk_income();
         bankinformation.setBk_thisamount(beginamount + incomme - spending + bk_amount);

applications/money/money-server/src/main/resources/mapper/PaybalanceMapper.xml

@@ -114,8 +114,7 @@
     ve_leftamount
   </sql>
   <sql id="detail_Column_List">
-    pd_bankname,pd_amount,pd_paymethod,pd_remark,pbd_slcode,pbd_slkind,
-    pbd_sldate,pbd_amount,pbd_nowbalance
+    pd_bankname,pd_amount,pd_paymethod,pd_remark
   </sql>
   <select id="selectList" resultMap="BaseResultMap">
     select
@@ -459,7 +458,6 @@
     <include refid="Base_Column_List" />,
     <include refid="detail_Column_List" />
     from paybalance left join paybalancedet on pd_pbid=pb_id and paybalance.companyId=paybalancedet.companyId
-    left join paybalancedetail on pbd_pbid=pb_id and paybalancedetail.companyId=paybalance.companyId
     <where>
       <if test="con != null">
         ${con}
@@ -475,7 +473,6 @@
     <include refid="Base_Column_List" />,
     <include refid="detail_Column_List" />
     from paybalance left join paybalancedet on pd_pbid=pb_id and paybalance.companyId=paybalancedet.companyId
-    left join paybalancedetail on pbd_pbid=pb_id and paybalancedetail.companyId=paybalance.companyId
     <where>
       <if test="con != null">
         ${con}

applications/money/money-server/src/main/resources/mapper/RecbalanceMapper.xml

@@ -114,8 +114,7 @@
     cu_leftamount
   </sql>
   <sql id="detail_Column_List">
-      rd_bankname,rd_amount,rd_paymethod,rd_paycode,rd_remark,rbd_slcode,rbd_slkind,
-    rbd_sldate,rbd_amount,rbd_nowbalance
+      rd_bankname,rd_amount,rd_paymethod,rd_paycode,rd_remark
   </sql>
 
   <select id="selectByExample" parameterType="com.usoftchina.saas.money.po.RecbalanceExample" resultMap="BaseResultMap">
@@ -145,7 +144,6 @@
     <include refid="Base_Column_List" />,
     <include refid="detail_Column_List" />
     from recbalance left join recbalancedet on rd_rbid=rb_id and recbalance.companyId=recbalancedet.companyId
-    left join recbalancedetail on rbd_rbid=rb_id and recbalancedetail.companyId=recbalance.companyId
     <where>
       <if test="con != null">
         ${con}
@@ -160,8 +158,7 @@
     select
     <include refid="Base_Column_List" />,
     <include refid="detail_Column_List" />
-    from recbalance left join recbalancedet on rd_rbid=rb_id and recbalance.comranyId=recbalancedet.comranyId
-    left join recbalancedetail on rbd_rbid=rb_id and recbalancedetail.comranyId=recbalance.comranyId
+    from recbalance left join recbalancedet on rd_rbid=rb_id and recbalance.companyId=recbalancedet.companyId
     <where>
       <if test="con != null">
         ${con}

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

@@ -285,7 +285,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
             text: "本次核销金额",
             xtype: 'numbercolumn',
             dataIndex: "pbd_nowbalance",
-            width: 120,
+            width: 140,
             editor : {
                 xtype : "numberfield",
                 decimalPrecision: 2

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

@@ -33,6 +33,7 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
         xtype: 'bandinfoDbfindTrigger',
         name: 'pd_bankname',
         fieldLabel: '资金账户',
+        showDetail: true
     },{
         xtype: 'condatefield',
         name: 'pb_date',
@@ -70,15 +71,47 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
         codeField: 'pb_code',
         addTitle: '付款单',
         addXtype: 'money-paybalance-formpanel',
-        defaultCondition:'',
+        defaultCondition: '',
         baseVastUrl: '/api/money/paybalance/',
         baseColumn: [
-        {
+            {
+                text: 'id',
+                dataIndex: 'id',
+                width: 0,
+                xtype: 'numbercolumn',
+                hidden: true
+            }, {
+                text: '付款单号',
+                dataIndex: 'pb_code',
+                width: 150
+            }, {
+                text: '日期',
+                dataIndex: 'pb_date',
+                xtype: 'datecolumn',
+                width: 110
+            }, {
+                text: '供应商名称',
+                dataIndex: 'pb_vendname',
+                width: 250,
+            }, {
+                text: '单据状态',
+                dataIndex: 'pb_status',
+                width: 90
+            }, {
+                text: '付款人',
+                dataIndex: 'pb_manname',
+                width: 110
+            }, {
+                text: '备注',
+                dataIndex: 'pb_remark',
+                width: 250
+            }],
+        relativeColumn: [{
             text: 'id',
             dataIndex: 'id',
             width: 0,
             xtype: 'numbercolumn',
-            hidden:true
+            hidden: true
         }, {
             text: '付款单号',
             dataIndex: 'pb_code',
@@ -92,35 +125,41 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
             text: '供应商名称',
             dataIndex: 'pb_vendname',
             width: 250,
+        }, {
+            text: '单据状态',
+            dataIndex: 'pb_status',
+            width: 90
+        }, {
+            text: '付款人',
+            dataIndex: 'pb_manname',
+            width: 110
+        },{
+            text: '资金账户',
+            dataIndex: 'pd_bankname',
+            width: 110
         },{
             text: '付款金额',
             xtype: 'numbercolumn',
             dataIndex: 'pd_amount',
             width: 120,
-            renderer : function(v) {
+            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: 'pb_status',
-            width: 90
-        }, {
-            text: '付款人',
-            dataIndex: 'pb_manname',
-            width: 110
-        }, {
+        } ,{
+            text: '结算方式',
+            dataIndex: 'pd_paymethod',
+            width: 250
+        },{
+            text: '结算号',
+            dataIndex: 'pd_paycode',
+            width: 250
+        },{
             text: '备注',
-            dataIndex: 'pb_remark',
+            dataIndex: 'pd_remark',
             width: 250
-        }],
-        relativeColumn: []
-    },
-
-    // override
-    getQueryMode: function() {
-        return 'MAIN';
+        }]
     }
 });

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

@@ -288,7 +288,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
             text: "本次核销金额",
             xtype: 'numbercolumn',
             dataIndex: "rbd_nowbalance",
-            width:120,
+            width:140,
             editor : {
                 xtype : "numberfield",
                 decimalPrecision: 2

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

@@ -25,6 +25,7 @@ Ext.define('saas.view.money.recBalance.QueryPanel', {
         xtype: 'bandinfoDbfindTrigger',
         name: 'rd_bankname',
         fieldLabel: '资金账户',
+        showDetail: true
     },{
         xtype: 'condatefield',
         name: 'rb_date',
@@ -83,6 +84,50 @@ Ext.define('saas.view.money.recBalance.QueryPanel', {
             text: '客户名称',
             dataIndex: 'rb_custname',
             width: 250,
+        }, {
+            text: '单据状态',
+            dataIndex: 'rb_status',
+            width: 90
+        }, {
+            text: '收款人',
+            dataIndex: 'rb_manname',
+            width: 110
+        }, {
+            text: '备注',
+            dataIndex: 'rb_remark',
+            width: 250
+        }],
+        relativeColumn:[{
+            text: 'id',
+            dataIndex: 'id',
+            width: 100,
+            xtype: 'numbercolumn',
+            hidden: true
+        }, {
+            text: '收款单号',
+            dataIndex: 'rb_code',
+            width: 150
+        }, {
+            text: '日期',
+            dataIndex: 'rb_date',
+            xtype: 'datecolumn',
+            width: 110
+        }, {
+            text: '单据状态',
+            dataIndex: 'rb_status',
+            width: 90
+        }, {
+            text: '客户名称',
+            dataIndex: 'rb_custname',
+            width: 250,
+        },{
+            text: '收款人',
+            dataIndex: 'rb_manname',
+            width: 110
+        },{
+            text: '资金账户',
+            dataIndex: 'rd_bankname',
+            width: 110
         },{
             text: '收款金额',
             xtype: 'numbercolumn',
@@ -95,21 +140,17 @@ Ext.define('saas.view.money.recBalance.QueryPanel', {
                 return Ext.util.Format.number(v, format);
             }
         }, {
-            text: '单据状态',
-            dataIndex: 'rb_status',
+            text: '结算方式',
+            dataIndex: 'rd_paymethod',
             width: 90
         }, {
-            text: '收款人',
-            dataIndex: 'rb_manname',
-            width: 110
-        }, {
+            text: '结算号',
+            dataIndex: 'rd_paycode',
+            width: 90
+        },{
             text: '备注',
             dataIndex: 'rb_remark',
             width: 250
         }]
-    },
-    // override
-    getQueryMode: function() {
-        return 'MAIN';
     }
 });

frontend/saas-web/app/view/money/report/CustomerCheck.js

@@ -7,7 +7,7 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
 
     viewName: 'money-report-customercheck',
 
-    groupField: 'pi_custname',
+    // groupField: 'pi_custname',
     listUrl: '/api/money/report/customercheck',
     defaultCondition: null,
     reportTitle: '客户对账单',
@@ -88,19 +88,19 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
             width: 110,
             dataIndex: 'pd_total',
             xtype: 'numbercolumn',
-            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);
-            },
-            summaryType: 'sum',
-            summaryRenderer: 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);
-            }
+            // 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);
+            // },
+            // summaryType: 'sum',
+            // summaryRenderer: 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: '不含税单价',
             width: 110,
@@ -112,19 +112,19 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
             xtype: 'numbercolumn',
             dataIndex: 'pd_nettotal',
             xtype: 'numbercolumn',
-            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);
-            },
-            summaryType: 'sum',
-            summaryRenderer: 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);
-            }
+            // 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);
+            // },
+            // summaryType: 'sum',
+            // summaryRenderer: 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: 'pd_remark',

frontend/saas-web/app/view/money/report/VendorCheck.js

@@ -79,19 +79,19 @@ Ext.define('saas.view.money.report.VendorCheck', {
             dataIndex: 'qty',
             xtype: 'numbercolumn',
             width: 110,
-            renderer : function(v) {
-                var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
-	            var format = '0.' + xr.join();
-                return Ext.util.Format.number(v, format);
-            },
-            summaryType: 'sum',
-            summaryRenderer: function(v) {
-                var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
-	            var format = '0.' + xr.join();
-                return Ext.util.Format.number(v, format);
-            }
+            // renderer : function(v) {
+            //     var arr = (v + '.').split('.');
+            //     var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
+	         //    var format = '0.' + xr.join();
+            //     return Ext.util.Format.number(v, format);
+            // },
+            // summaryType: 'sum',
+            // summaryRenderer: function(v) {
+            //     var arr = (v + '.').split('.');
+            //     var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
+	         //    var format = '0.' + xr.join();
+            //     return Ext.util.Format.number(v, format);
+            // }
         }, {
             text: '单价',
             dataIndex: 'pd_orderprice',
@@ -108,19 +108,19 @@ Ext.define('saas.view.money.report.VendorCheck', {
             dataIndex: 'pd_total',
             xtype: 'numbercolumn',
             width: 110,
-            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);
-            },
-            summaryType: 'sum',
-            summaryRenderer: 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);
-            }
+            // 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);
+            // },
+            // summaryType: 'sum',
+            // summaryRenderer: 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: 'pd_netprice',

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

@@ -281,11 +281,12 @@ Ext.define('saas.view.money.verification.FormPanel', {
                 text: "本次核销金额",
                 dataIndex: "vcd_nowbalance",
                 xtype: 'numbercolumn',
+                width: 150,
+                allowBlank : false,
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 2
                 },
-                width: 110,
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
                     var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
@@ -369,6 +370,14 @@ Ext.define('saas.view.money.verification.FormPanel', {
                 defaultValue: new Date(),
                 allowBlank : false,
                 name: 'vc_date'
+            }, {
+                xtype: 'hidden',
+                name: 'vc_amount1',
+                fieldLabel: '核销金额'
+            }, {
+                xtype: "hidden",
+                name: "vc_amount2",
+                fieldLabel: "未核销金额"
             }],
             details: ['detail1', 'detail2']
         },
@@ -414,6 +423,14 @@ Ext.define('saas.view.money.verification.FormPanel', {
                 defaultValue: new Date(),
                 allowBlank : false,
                 name: 'vc_date'
+            }, {
+                xtype: 'hidden',
+                name: 'vc_amount1',
+                fieldLabel: '核销金额'
+            }, {
+                xtype: "hidden",
+                name: "vc_amount2",
+                fieldLabel: "未核销金额"
             }],
             details: ['detail1', 'detail2']
         },
@@ -457,6 +474,14 @@ Ext.define('saas.view.money.verification.FormPanel', {
                 defaultValue: new Date(),
                 allowBlank : false,
                 name: 'vc_date'
+            }, {
+                xtype: 'hidden',
+                name: 'vc_amount1',
+                fieldLabel: '核销金额'
+            }, {
+                xtype: "hidden",
+                name: "vc_amount2",
+                fieldLabel: "未核销金额"
             }],
             details: ['detail1']
         },
@@ -500,6 +525,14 @@ Ext.define('saas.view.money.verification.FormPanel', {
                 defaultValue: new Date(),
                 allowBlank : false,
                 name: 'vc_date'
+            }, {
+                xtype: 'hidden',
+                name: 'vc_amount1',
+                fieldLabel: '核销金额'
+            }, {
+                xtype: "hidden",
+                name: "vc_amount2",
+                fieldLabel: "未核销金额"
             }],
             details: ['detail1']
         },