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

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

@@ -44,14 +44,12 @@ public class FundtransferServiceImpl implements FundtransferService {
         Fundtransfer fundtransfer = fundtran.getMain();
         List<Fundtransferdetail> fundtransferdetails = fundtran.getItems();
 
-        System.out.println("fun:"+fundtransferdetails);
 
         String ft_code = fundtransfer.getFt_code();
 
         //编号校验
         ft_code = pushMaxnubmer(ft_code, fundtransfer.getId());
 
-        System.out.println("ft_code" + ft_code);
         //单号赋值
         fundtransfer.setFt_code(ft_code);
 
@@ -61,6 +59,7 @@ public class FundtransferServiceImpl implements FundtransferService {
             fundtransferMapper.updateByPrimaryKeySelective(fundtransfer);
         }else {
             fundtransfer.setCompanyId(BaseContextHolder.getCompanyId());
+            fundtransfer.setFt_recorder(BaseContextHolder.getUserName());
             fundtransferMapper.insertSelective(fundtransfer);
             id = fundtransfer.getId();
         }

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

@@ -48,14 +48,12 @@ public class OthreceiptsServiceImpl implements OthreceiptsService {
         Othreceipts othreceipts = othte.getMain();
         List<Othreceiptsdetail> othreceiptsdetail = othte.getItems();
 
-        System.out.println("oth:" + othreceipts);
 
         String or_code = othreceipts.getOr_code();
 
         //编号校验
         or_code = pushMaxnubmer(or_code, othreceipts.getId());
 
-        System.out.println("or_code" + or_code);
         //单号赋值
         othreceipts.setOr_code(or_code);
 
@@ -65,6 +63,7 @@ public class OthreceiptsServiceImpl implements OthreceiptsService {
             othreceiptsMapper.updateByPrimaryKeySelective(othreceipts);
         }else {
             othreceipts.setCompanyId(BaseContextHolder.getCompanyId());
+            othreceipts.setOr_recorder(BaseContextHolder.getUserName());
             othreceiptsMapper.insertSelective(othreceipts);
             id = othreceipts.getId();
         }

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

@@ -61,6 +61,7 @@ public class OthspendingsServiceImpl implements OthspendingsService {
             othspendingsMapper.updateByPrimaryKeySelective(othspendings);
         }else {
             othspendings.setCompanyId(BaseContextHolder.getCompanyId());
+            othspendings.setOs_recorder(BaseContextHolder.getUserName());
             othspendingsMapper.insertSelective(othspendings);
             id = othspendings.getId();
         }

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

@@ -48,14 +48,12 @@ public class PaybalanceServiceImpl implements PaybalanceService {
         List<Paybalancedet> paybalancedet = pay.getItems1();
         List<Paybalancedetail> paybalancedetail = pay.getItems2();
 
-        System.out.println("paybal:"+paybalance);
         String pb_code = paybalance.getPb_code();
         //编号校验
         pb_code = pushMaxnubmer(pb_code, paybalance.getId());
         //单号赋值
         paybalance.setPb_code(pb_code);
 
-        System.out.println("code:"+paybalance.getPb_code());
 
         Long pbId = paybalance.getId();
 
@@ -66,6 +64,7 @@ public class PaybalanceServiceImpl implements PaybalanceService {
             paybalanceMapper.updateByPrimaryKeySelective(paybalance);
         }else {
             paybalance.setCompanyId(BaseContextHolder.getCompanyId());
+            paybalance.setPb_recorder(BaseContextHolder.getUserName());
             paybalanceMapper.insertSelective(paybalance);
             pbId = paybalance.getId();
             System.out.println("rbid:" + pbId);

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

@@ -46,8 +46,6 @@ public class RecbalanceServiceImpl implements RecbalanceService {
         Recbalance recbalance = rec.getMain();
         List<Recbalancedet> recbalancedet = rec.getItems1();
         List<Recbalancedetail> recbalancedetail = rec.getItems2();
-        System.out.println("recbalance:" + recbalance);
-
 
         String pu_code = recbalance.getRb_code();
 
@@ -64,9 +62,9 @@ public class RecbalanceServiceImpl implements RecbalanceService {
             recbalanceMapper.updateByPrimaryKeySelective(recbalance);
         }else {
             recbalance.setCompanyId(BaseContextHolder.getCompanyId());
+            recbalance.setRb_recorder(BaseContextHolder.getUserName());
             recbalanceMapper.insertSelective(recbalance);
             rbId = recbalance.getId();
-            System.out.println("rbid:" + rbId);
         }
 
         Iterator isdet = recbalancedet.iterator();
@@ -98,7 +96,7 @@ public class RecbalanceServiceImpl implements RecbalanceService {
 
     /**
      * 校验数据
-     * @param pay
+     * @param Rec
      */
     private void checkRecbalance(Rec rec){
         Recbalance recbalance = rec.getMain();

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

@@ -183,7 +183,7 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
         readOnly:true
     }, {
         xtype : "datefield", 
-        name : "ft_date",
+        name : "ft_recorddate",
         fieldLabel : "录入日期",
         readOnly:true
     }

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 : "收入类别", 
@@ -150,7 +154,7 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
         readOnly:true
     }, {
         xtype : "datefield", 
-        name : "or_date", 
+        name : "or_recorddate",
         fieldLabel : "录入日期",
         readOnly:true
     }

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 : "支出类别", 
@@ -153,7 +153,7 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
         readOnly:true
     }, {
         xtype : "datefield", 
-        name : "os_date", 
+        name : "os_recorddate",
         fieldLabel : "录入日期",
         readOnly:true
     }

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

@@ -207,24 +207,11 @@ 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",
-            xtype: 'datecolumn',
-            defaultValue: new Date(),
-            hidden: true
+            xtype: 'datecolumn'
         }, {
             text: "单据金额",
             dataIndex: "pbd_amount",
@@ -292,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/payBalance/FormPanelController.js

@@ -109,6 +109,12 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                         },{
                             from: 'sl_namount',
                             to: 'pb_pbdamount'
+                        },{
+                            from:'sl_date',
+                            to:'pbd_sldate'
+                        },{
+                            from:'sl_kind',
+                            to:'pbd_slkind'
                         }],
                         dbtpls: [{
                             field: 'sl_code',
@@ -136,6 +142,11 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                             "flex": 1,
                             "dataIndex": "sl_code",
                             "width": 100
+                        },{
+                            "text": "源单类型",
+                            "flex": 1,
+                            "dataIndex": "sl_kind",
+                            "width": 100
                         }, {
                             "text": "单据金额",
                             "flex": 1,
@@ -155,6 +166,12 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                             "dataIndex": "sl_namount",
                             "width": 100,
                             align:'right'
+                        },{
+                            "text": "单据日期",
+                            "flex": 1,
+                            "dataIndex": "sl_date",
+                            "width": 100,
+                            align:'right'
                         }]
                     });
 

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

@@ -19,8 +19,8 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
         addTitle: '付款单',
         addXtype: 'money-paybalance-formpanel',
         defaultCondition:'1=1',
-        baseVastUrl: '/api/money/paybalance/',
-        // baseVastUrl: 'http://127.0.0.1:8880/paybalance/',
+        // baseVastUrl: '/api/money/paybalance/',
+        baseVastUrl: 'http://192.168.253.129:8881/paybalance/',
         baseColumn: [{
             text: 'id',
             dataIndex: 'id',

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

@@ -219,9 +219,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
         }, {
             text: "单据日期",
             dataIndex: "rbd_sldate",
-            defaultValue: new Date(),
-            xtype: 'datecolumn',
-            hidden: true
+            xtype: 'datecolumn'
         }, {
             text: "单据金额",
             dataIndex: "rbd_amount",
@@ -277,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/money/recBalance/FormPanelController.js

@@ -181,6 +181,12 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                         },{
                             from: 'sl_namount',
                             to: 'rbd_pbdamount'
+                        },{
+                            from:'sl_date',
+                            to:'rbd_sldate'
+                        },{
+                            from:'sl_kind',
+                            to:'rbd_slkind'
                         }],
                         dbtpls: [{
                             field: 'sl_code',
@@ -209,6 +215,11 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                             "dataIndex": "sl_code",
                             "width": 100
                         }, {
+                            "text": "源单类型",
+                            "flex": 1,
+                            "dataIndex": "sl_kind",
+                            "width": 100
+                        },{
                             "text": "单据金额",
                             "flex": 1,
                             "dataIndex": "sl_orderamount",
@@ -227,6 +238,12 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                             "dataIndex": "sl_namount",
                             "width": 100,
                             align:'right'
+                        },{
+                            "text": "单据日期",
+                            "flex": 1,
+                            "dataIndex": "sl_date",
+                            "width": 100,
+                            align:'right'
                         }]
                     });