资金模块-调整

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

@@ -35,11 +35,11 @@ public class Vendor extends CommonBaseEntity implements Serializable{
     /**
      * 期初应付
      */
-    private double ve_beginapamount;
+    private Double ve_beginapamount;
     /**
      * 期初预付
      */
-    private double ve_beginprepayamount;
+    private Double ve_beginprepayamount;
     /**
      * 承付天数
      */
@@ -173,19 +173,19 @@ public class Vendor extends CommonBaseEntity implements Serializable{
         this.ve_begindate = ve_begindate;
     }
 
-    public double getVe_beginapamount() {
+    public Double getVe_beginapamount() {
         return ve_beginapamount;
     }
 
-    public void setVe_beginapamount(double ve_beginapamount) {
+    public void setVe_beginapamount(Double ve_beginapamount) {
         this.ve_beginapamount = ve_beginapamount;
     }
 
-    public double getVe_beginprepayamount() {
+    public Double getVe_beginprepayamount() {
         return ve_beginprepayamount;
     }
 
-    public void setVe_beginprepayamount(double ve_beginprepayamount) {
+    public void setVe_beginprepayamount(Double ve_beginprepayamount) {
         this.ve_beginprepayamount = ve_beginprepayamount;
     }
 

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

@@ -164,7 +164,7 @@ public class PaybalanceServiceImpl implements PaybalanceService {
     public void audit(Pay pay) {
         Long companyId = BaseContextHolder.getCompanyId();
         int id = Math.toIntExact(pay.getMain().getId());
-        Paybalance paybalance = paybalanceMapper.selectByPrimaryKey(id);
+        Paybalance paybalance = paybalanceMapper.selectByPrimaryKey(Long.valueOf(id));
         paybalance.setPb_status(Status.AUDITED.getDisplay());
         paybalance.setPb_statuscode(Status.AUDITED.name());
         paybalance.setCompanyId(companyId);
@@ -211,10 +211,10 @@ public class PaybalanceServiceImpl implements PaybalanceService {
          * ve_leftamount=ve_beginapamount-ve_beginprepayamount+ve_payamount-ve_preamount;
          */
         Vendor vendorData = paybalanceMapper.selectVendorByPrimaryKey(paybalance.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(paybalance.getPb_vendid())));
@@ -264,7 +264,7 @@ public class PaybalanceServiceImpl implements PaybalanceService {
         paybalanceMapper.updateByPrimaryKeySelective(paybalance);
 
         //删除中间表
-        paybalance = paybalanceMapper.selectByPrimaryKey(id);
+        paybalance = paybalanceMapper.selectByPrimaryKey(Long.valueOf(id));
         subledgerMapper.deleteByPrimaryKey(paybalance.getPb_code(), paybalance.getPb_kind());
         banksubledgerMapper.deleteByPrimaryKey(paybalance.getPb_code(), paybalance.getPb_kind());
 

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

@@ -262,10 +262,10 @@ public class RecbalanceServiceImpl implements RecbalanceService {
         Double pay_preamount = rec.getRb_preamount();
         Double pay_pbdamount = rec.getRb_rbdamount();
         Customer customerData = recbalanceMapper.selectCustomerByPrimaryKey(rec.getRb_custid());
-        Double preamount = customerData.getCu_preamount();
-        Double beginapamount = customerData.getCu_beginaramount();
-        Double beginprepayamount= customerData.getCu_beginprerecamount();
-        Double recamount = customerData.getCu_recamount();
+        Double preamount = customerData.getCu_preamount()==null?(new Double(0)):customerData.getCu_preamount();
+        Double beginapamount = customerData.getCu_beginaramount()==null?new Double(0):customerData.getCu_beginaramount();
+        Double beginprepayamount= customerData.getCu_beginprerecamount()==null?new Double(0):customerData.getCu_beginprerecamount();
+        Double recamount = customerData.getCu_recamount()==null?new Double(0):customerData.getCu_recamount();
         Customer customer = new Customer();
         customer.setId(Long.valueOf(String.valueOf(rec.getRb_custid())));
         customer.setCu_preamount(preamount-pay_preamount);

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

@@ -100,7 +100,7 @@
     from paybalance
   </select>
 
-  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
     select 
     <include refid="Base_Column_List" />
     from paybalance
@@ -698,7 +698,7 @@
         ve_beginym = #{ve_beginym,jdbcType=INTEGER},
       </if>
       <if test="ve_preamount !=null" >
-        ve_preamount = #{ve_preamount,jdbcType=DOUBLE},
+        ve_preamount = #{ve_preamount,jdbcType=DOUBLE}
       </if>
     </set>
     where ve_id = #{id}

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

@@ -23,8 +23,8 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
 
     // _readUrl: 'http://192.168.253.129:8940/money/paybalance/read/',
     // _saveUrl: 'http://192.168.253.129:8940/money/paybalance/save/',
-    // _auditUrl: 'http://192.168.253.129:8940/money/paybalance/audit/',
-    // _unAuditUrl: 'http://192.168.253.129:8940/money/paybalance/unAudit/',
+    // _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/',
     
     initId: 0,
@@ -287,6 +287,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
             text: "本次核销金额",
             xtype: 'numbercolumn',
             dataIndex: "pbd_nowbalance",
+            width: 150,
             editor : {
                 xtype : "numberfield",
                 decimalPrecision: 2

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

@@ -23,6 +23,8 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
     _deleteUrl: '/api/money/recbalance/delete/',
 
     // _saveUrl: 'http://192.168.253.35:8880/recbalance/save/',
+    // _auditUrl: 'http://192.168.253.35:8880/recbalance/audit/',
+    // _unAuditUrl: 'http://192.168.253.35:8880/recbalance/unAudit/',
 
 
     initId: 0,