소스 검색

资金模块-解决付款单

huangx 7 년 전
부모
커밋
7bf857de7c

+ 2 - 2
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){

+ 1 - 1
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'
                         },{