资金模块-调整字段

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

@@ -204,7 +204,6 @@ public class PaybalanceServiceImpl implements PaybalanceService {
         updatePay.setPb_pdamount(amountTotal);
         updatePay.setPb_pbdamount(amountTotal2);
         paybalanceMapper.updateByPrimaryKeySelective(updatePay);
-        //updateByPrimaryKeySelective
         /**
          * ve_preamount=nvl(ve_preamount,0)+pb_preamount,
          * ve_payamount=nvl(ve_payamount,0)-pb_pbdamount,
@@ -240,13 +239,13 @@ public class PaybalanceServiceImpl implements PaybalanceService {
          * ve_leftamount=ve_beginapamount-ve_beginprepayamount+ve_payamount-ve_preamount;
          */
         Paybalance pay = paybalanceMapper.selectByPrimaryKey(Long.valueOf(id));
-        Double pay_preamount = pay.getPb_preamount();
-        Double pay_pbdamount = pay.getPb_pbdamount();
+        Double pay_preamount = pay.getPb_preamount()==null?new Double(0):pay.getPb_preamount();
+        Double pay_pbdamount = pay.getPb_pbdamount()==null?new Double(0):pay.getPb_pbdamount();
         Vendor vendorData = paybalanceMapper.selectVendorByPrimaryKey(pay.getPb_vendid());
-        Double preamount = vendorData.getVe_preamount();
-        Double beginapamount = vendorData.getVe_beginapamount();
-        Double beginprepayamount= vendorData.getVe_beginprepayamount();
-        Double payamount = vendorData.getVe_payamount();
+        Double preamount = vendorData.getVe_preamount()==null?new Double(0):vendorData.getVe_preamount();
+        Double beginapamount = vendorData.getVe_beginapamount()==null?new Double(0):vendorData.getVe_beginapamount();
+        Double beginprepayamount= vendorData.getVe_beginprepayamount()==null?new Double(0):vendorData.getVe_beginprepayamount();
+        Double payamount = vendorData.getVe_payamount()==null?new Double(0):vendorData.getVe_payamount();
         Vendor vendor = new Vendor();
         vendor.setId(Long.valueOf(String.valueOf(pay.getPb_vendid())));
         vendor.setVe_preamount(preamount-pay_preamount);

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

@@ -56,6 +56,7 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
         xtype:'datefield',
         name : 'or_date',
         fieldLabel : '单据日期',
+        defaultValue: new Date(),
         allowBlank : false
     },{
         name : "detailGridField", 

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

@@ -56,6 +56,7 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
         xtype:'datefield',
         name : 'os_date',
         fieldLabel : '单据日期',
+        defaultValue: new Date(),
         allowBlank : false
     },{
         name : "detailGridField", 

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

@@ -21,9 +21,9 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
     _unAuditUrl: '/api/money/paybalance/unAudit/',
     _deleteUrl: '/api/money/paybalance/delete/',
 
-    _readUrl: 'http://192.168.253.35:8880/paybalance/read/',
+    // _readUrl: 'http://192.168.253.35:8880/paybalance/read/',
     // _saveUrl: 'http://192.168.253.129:8940/money/paybalance/save/',
-    _auditUrl: 'http://192.168.253.35:8880/paybalance/audit/',
+    // _auditUrl: 'http://192.168.253.35:8880/paybalance/audit/',
     // _unAuditUrl: 'http://192.168.253.35Pb_pdamount:8880/paybalance/unAudit/',
     // _deleteUrl: 'http://192.168.253.129:8940/money/paybalance/delete/',
     
@@ -64,6 +64,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
         xtype: "datefield",
         name: "pb_date",
         fieldLabel: "日期",
+        defaultValue: new Date(),
         allowBlank : false
     },{
         xtype: 'textfield',
@@ -85,7 +86,8 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
     }, {
         xtype: 'numberfield',
         name: 'pb_discounts',
-        fieldLabel: '整单折扣'
+        fieldLabel: '整单折扣',
+        hidden: true
     }, {
         xtype: 'hidden',
         name: 'pb_havebalance',
@@ -244,7 +246,8 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
         }, {
             text: "已核销金额",
             xtype: 'numbercolumn',
-            dataIndex: "pbd_havebalance",
+            dataIndex: "sl_yamount",
+            ignore:true,
             // editor : {
             //     xtype : "numberfield",
             //     decimalPrecision: 2
@@ -265,7 +268,8 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
         }, {
             text: "未核销金额",
             xtype: 'numbercolumn',
-            dataIndex: "pbd_pbdamount",
+            dataIndex: "sl_namount",
+            ignore:true,
             // editor : {
             //     xtype : "numberfield",
             //     decimalPrecision: 2

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

@@ -106,10 +106,10 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                             to: 'pbd_amount'
                         },{
                             from: 'sl_yamount',
-                            to: 'pb_havebalance'
+                            to: 'sl_yamount'
                         },{
                             from: 'sl_namount',
-                            to: 'pb_pbdamount'
+                            to: 'sl_namount'
                         },{
                             from:'sl_date',
                             to:'pbd_sldate'
@@ -160,9 +160,9 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                             align:'end'
                         }, {
                             "text": "已核销金额",
-                            "flex": 0,
+                            "flex": 1,
                             "dataIndex": "sl_yamount",
-                            "width": 200,
+                            "width": 150,
                             xtype: 'numbercolumn',
                             align:'end',
                             "items": null
@@ -177,7 +177,8 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                             "text": "单据日期",
                             "flex": 1,
                             "dataIndex": "sl_date",
-                            "width": 150,
+                            "width": 120,
+                            xtype: 'datecolumn',
                             align:'end'
                         }]
                     });

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

@@ -65,6 +65,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
         xtype: "datefield",
         name: "rb_date",
         fieldLabel: "日期",
+        defaultValue: new Date(),
         allowBlank : false
     }, {
         xtype: "textfield",
@@ -78,7 +79,8 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
     }, {
         xtype: "numberfield",
         name: "rb_discounts",
-        fieldLabel: "整单折扣"
+        fieldLabel: "整单折扣",
+        hidden: true
     }, {
         xtype: 'numberfield',
         name: 'rb_preamount',
@@ -249,7 +251,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
         }, {
             text: "已核销金额",
             xtype: 'numbercolumn',
-            dataIndex: "rbd_havebalance",
+            dataIndex: "sl_yamount",
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length)).fill('0');
@@ -266,7 +268,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
         }, {
             text: "未核销金额",
             xtype: 'numbercolumn',
-            dataIndex: "rbd_pbdamount",
+            dataIndex: "sl_namount",
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length)).fill('0');

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

@@ -184,10 +184,10 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                             to: 'rbd_amount'
                         },{
                             from: 'sl_yamount',
-                            to: 'rbd_havebalance'
+                            to: 'sl_yamount'
                         },{
                             from: 'sl_namount',
-                            to: 'rbd_pbdamount'
+                            to: 'sl_namount'
                         },{
                             from:'sl_date',
                             to:'rbd_sldate'
@@ -255,7 +255,8 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                             "text": "单据日期",
                             "flex": 1,
                             "dataIndex": "sl_date",
-                            "width": 150,
+                            "width": 120,
+                            xtype: 'datecolumn',
                             align:'end'
                         }]
                     });