资金模块-调整列表配置

applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Paybalance.java

@@ -65,6 +65,8 @@ public class Paybalance extends CommonBaseEntity implements Serializable {
 
     private String pd_bankname;
 
+    private Double pd_amount;
+
     private String pd_paymethod;
 
     private String pd_paycode;
@@ -345,4 +347,20 @@ public class Paybalance extends CommonBaseEntity implements Serializable {
     public void setPd_remark(String pd_remark) {
         this.pd_remark = pd_remark;
     }
+
+    public Double getPd_amount() {
+        return pd_amount;
+    }
+
+    public void setPd_amount(Double pd_amount) {
+        this.pd_amount = pd_amount;
+    }
+
+    public String getPd_paycode() {
+        return pd_paycode;
+    }
+
+    public void setPd_paycode(String pd_paycode) {
+        this.pd_paycode = pd_paycode;
+    }
 }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Recbalance.java

@@ -65,6 +65,8 @@ public class Recbalance extends CommonBaseEntity implements Serializable {
 
     private String rd_bankname;
 
+    private Double rd_amount;
+
     private String rd_paymethod;
 
     private String rd_paycode;
@@ -283,4 +285,84 @@ public class Recbalance extends CommonBaseEntity implements Serializable {
     public void setCu_leftamount(Double cu_leftamount) {
         this.cu_leftamount = cu_leftamount;
     }
+
+    public String getRd_bankname() {
+        return rd_bankname;
+    }
+
+    public void setRd_bankname(String rd_bankname) {
+        this.rd_bankname = rd_bankname;
+    }
+
+    public Double getRd_amount() {
+        return rd_amount;
+    }
+
+    public void setRd_amount(Double rd_amount) {
+        this.rd_amount = rd_amount;
+    }
+
+    public String getRd_paymethod() {
+        return rd_paymethod;
+    }
+
+    public void setRd_paymethod(String rd_paymethod) {
+        this.rd_paymethod = rd_paymethod;
+    }
+
+    public String getRd_paycode() {
+        return rd_paycode;
+    }
+
+    public void setRd_paycode(String rd_paycode) {
+        this.rd_paycode = rd_paycode;
+    }
+
+    public String getRd_remark() {
+        return rd_remark;
+    }
+
+    public void setRd_remark(String rd_remark) {
+        this.rd_remark = rd_remark;
+    }
+
+    public String getRbd_slcode() {
+        return rbd_slcode;
+    }
+
+    public void setRbd_slcode(String rbd_slcode) {
+        this.rbd_slcode = rbd_slcode;
+    }
+
+    public String getRbd_slkind() {
+        return rbd_slkind;
+    }
+
+    public void setRbd_slkind(String rbd_slkind) {
+        this.rbd_slkind = rbd_slkind;
+    }
+
+    public Date getRbd_sldate() {
+        return rbd_sldate;
+    }
+
+    public void setRbd_sldate(Date rbd_sldate) {
+        this.rbd_sldate = rbd_sldate;
+    }
+
+    public Double getRbd_amount() {
+        return rbd_amount;
+    }
+
+    public void setRbd_amount(Double rbd_amount) {
+        this.rbd_amount = rbd_amount;
+    }
+
+    public Double getRbd_nowbalance() {
+        return rbd_nowbalance;
+    }
+
+    public void setRbd_nowbalance(Double rbd_nowbalance) {
+        this.rbd_nowbalance = rbd_nowbalance;
+    }
 }

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

@@ -3,6 +3,7 @@ package com.usoftchina.saas.money.service.impl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
+import com.usoftchina.saas.commons.api.CommonService;
 import com.usoftchina.saas.commons.api.MaxnumberService;
 import com.usoftchina.saas.commons.api.MessageLogService;
 import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
@@ -46,6 +47,9 @@ public class PaybalanceServiceImpl extends CommonBaseServiceImpl<PaybalanceMappe
     private StatsinfoMapper statsinfoMapper;
     @Autowired
     private MessageLogService messageLogService;
+    @Autowired
+    private CommonService commonService;
+
 
     public DocBaseDTO insert(Pay pay) {
         Paybalance paybalance = pay.getMain();
@@ -173,8 +177,6 @@ public class PaybalanceServiceImpl extends CommonBaseServiceImpl<PaybalanceMappe
     public DocBaseDTO audit(Pay pay) {
         Long companyId = BaseContextHolder.getCompanyId();
         Paybalance paybalance = pay.getMain();
-        paybalance.setPb_status(Status.AUDITED.getDisplay());
-        paybalance.setPb_statuscode(Status.AUDITED.name());
         paybalance.setCompanyId(companyId);
         Subledger subledger = this.changSubledgerUntil(paybalance);
         if (subledger.getSl_code() == null){
@@ -262,6 +264,9 @@ public class PaybalanceServiceImpl extends CommonBaseServiceImpl<PaybalanceMappe
             statsinfoMapper.update(statsinfo);
         }
         DocBaseDTO baseDTO = getBaseDTOById(id);
+        commonService.commonAudit(BillCodeSeq.PAYBALANCE.getCaller(),
+                "pb_id='+baseDTO.getId()","pb_status","pb_statuscode",
+                "pb_auditdate","pb_auditman");
         //日志记录
         messageLogService.save(baseDTO);
         return baseDTO;
@@ -349,7 +354,6 @@ public class PaybalanceServiceImpl extends CommonBaseServiceImpl<PaybalanceMappe
         messageLogService.save(baseDTO);
     }
 
-
     public void delete(int id){
         paybalanceMapper.deleteByPrimaryKey(id);
         paybalancedetailMapper.deleteByPrimaryKey(id);

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

@@ -3,6 +3,7 @@ package com.usoftchina.saas.money.service.impl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
+import com.usoftchina.saas.commons.api.CommonService;
 import com.usoftchina.saas.commons.api.MaxnumberService;
 import com.usoftchina.saas.commons.api.MessageLogService;
 import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
@@ -46,6 +47,8 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
     private StatsinfoMapper statsinfoMapper;
     @Autowired
     private MessageLogService messageLogService;
+    @Autowired
+    private CommonService commonService;
 
     @Override
     public DocBaseDTO insert(Rec rec) {
@@ -209,8 +212,6 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
     public DocBaseDTO audit(Rec rec) {
         Long companyId = BaseContextHolder.getCompanyId();
         Recbalance recbalance = rec.getMain();
-        recbalance.setRb_status(Status.AUDITED.getDisplay());
-        recbalance.setRb_statuscode(Status.AUDITED.name());
         recbalance.setCompanyId(companyId);
         Subledger subledger = this.changSubledgerUntil(recbalance);
         if (subledger.getSl_code() == null){
@@ -299,6 +300,9 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
             statsinfoMapper.update(statsinfo);
         }
         DocBaseDTO baseDTO = getBaseDTOById(id);
+        commonService.commonAudit(BillCodeSeq.RECBALANCE.getCaller(),
+                "rb_id="+baseDTO.getId(),"rb_status","rb_statuscode",
+                "rb_auditdate","rb_auditman");
         //日志记录
         messageLogService.save(baseDTO);
         return baseDTO;

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

@@ -34,6 +34,7 @@
     <result column="pd_paymethod" jdbcType="VARCHAR" property="pd_paymethod" />
     <result column="pd_paycode" jdbcType="VARCHAR" property="pd_paycode" />
     <result column="pd_remark" jdbcType="VARCHAR" property="pd_remark" />
+    <result column="pd_amount" jdbcType="DOUBLE" property="pd_amount" />
     <result column="pbd_slcode" jdbcType="VARCHAR" property="pbd_slcode" />
     <result column="pbd_slkind" jdbcType="VARCHAR" property="pbd_slkind" />
     <result column="pbd_sldate" jdbcType="TIMESTAMP" property="pbd_sldate" />

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

@@ -31,6 +31,7 @@
     <result column="rb_text5" jdbcType="VARCHAR" property="rb_text5" />
     <result column="cu_leftamount" jdbcType="DOUBLE" property="cu_leftamount" />
     <result column="rd_bankname" jdbcType="VARCHAR" property="rd_bankname" />
+    <result column="rd_amount" jdbcType="DOUBLE" property="rd_amount" />
     <result column="rd_paymethod" jdbcType="VARCHAR" property="rd_paymethod" />
     <result column="rd_paycode" jdbcType="VARCHAR" property="rd_paycode" />
     <result column="rd_remark" jdbcType="VARCHAR" property="rd_remark" />

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

@@ -93,7 +93,6 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
             xtype: 'numbercolumn',
             dataIndex: 'pd_amount',
             width: 120,
-            hidden:true,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');

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

@@ -95,6 +95,17 @@ Ext.define('saas.view.money.recBalance.QueryPanel', {
             dataIndex: 'rd_bankname',
             width: 120,
         },{
+            text: '收款金额',
+            xtype: 'numbercolumn',
+            dataIndex: 'rd_amount',
+            width: 120,
+            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: 'rd_paymethod',
             width: 120,