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

src/custom/beans/accountbalance/Accountbalance.java

@@ -138,6 +138,7 @@ public class Accountbalance extends BaseClass {
         sqlFactory.addParameter("class", cashbillEntity.getType());
         sqlFactory.addParameter("subclass", cashbillEntity.getTypemx());
         sqlFactory.addParameter("period", cashbillEntity.getPeriod());
+        sqlFactory.addParameter("billdate", cashbillEntity.getBilldate());
         if (ischeck) {
             BigDecimal balance = BigDecimal.ZERO;  //当前账户余额
             sqlFactory.addParameter("status", "审核");
@@ -232,6 +233,7 @@ public class Accountbalance extends BaseClass {
         sqlFactory.addParameter("sa_cashbillid_rebate", "null");
         sqlFactory.addParameter("updatek3flag", "");
         sqlFactory.addParameter("period", cashbillEntity.getPeriod());
+        sqlFactory.addParameter("billdate", cashbillEntity.getBilldate());
         if (ischeck) {
             BigDecimal balance = BigDecimal.ZERO;  //当前账户余额
             sqlFactory.addParameter("status", "审核");
@@ -312,6 +314,7 @@ public class Accountbalance extends BaseClass {
         sqlFactory.addParameter("sa_cashbillid_rebate", "null");
         sqlFactory.addParameter("updatek3flag", "");
         sqlFactory.addParameter("period", cashbillEntity.getPeriod());
+        sqlFactory.addParameter("billdate", cashbillEntity.getBilldate());
         if (ischeck) {
             BigDecimal balance = BigDecimal.ZERO;  //当前账户余额
             sqlFactory.addParameter("status", "审核");
@@ -387,6 +390,7 @@ public class Accountbalance extends BaseClass {
 //        sqlFactory.addParameter("class", cashbillEntity.getType());
 //        sqlFactory.addParameter("subclass", cashbillEntity.getTypemx());
 //        sqlFactory.addParameter("period", cashbillEntity.getPeriod());
+//        sqlFactory.addParameter("billdate", cashbillEntity.getBilldate());
 //        if (ischeck) {
 //            BigDecimal balance = BigDecimal.ZERO;  //当前账户余额
 //            sqlFactory.addParameter("status", "审核");

src/custom/beans/accountbalance/CashbillEntity.java

@@ -16,6 +16,9 @@ public class CashbillEntity {
 
     private String period;
 
+    private String billdate;
+
+
 
     private String type = "货款";
 
@@ -36,7 +39,16 @@ public class CashbillEntity {
         this.typemx = typemx;
     }
 
+    public String getBilldate() {
+        if (this.billdate == null) {
+            billdate = BaseClass.getDate_Str();
+        }
+        return billdate;
+    }
 
+    public void setBilldate(String billdate) {
+        this.billdate = billdate;
+    }
     public String getPeriod() {
         if (this.period == null) {
             period = BaseClass.getDate_Str();

src/custom/beans/accountbalance/SQL/收支凭证新增.sql

@@ -1,8 +1,8 @@
 insert into sa_cashbill (siteid, sa_cashbillid, createuserid, createby, createdate, billno, changeuserid, changeby,
                          changedate, checkby, checkdate, sys_enterpriseid, sa_accountclassid, type, remarks, amount,discountamount,
                          status, source, sourcenote, ownertable, ownerid, balance, sa_cashbillid_rebate, class,
-                         subclass, period, updatek3flag)
+                         subclass, period, updatek3flag,billdate)
 values ($siteid$, $sa_cashbillid$, $userid$, $username$, CURRENT_TIME, $billno$, $userid$, $username$, CURRENT_TIME,
         $checkby$, $checkdate$, $sys_enterpriseid$, $sa_accountclassid$, $type$, $remarks$,
         $amount$,$discountamount$,$status$, $source$, $sourcenote$, $ownertable$, $ownerid$, $balance$, $sa_cashbillid_rebate$, $class$,
-        $subclass$, $period$, $updatek3flag$);
+        $subclass$, $period$, $updatek3flag$,$billdate$);

src/custom/restcontroller/webmanage/sale/bankstatement/SQL/收入凭证新增.sql

@@ -1,6 +1,6 @@
 insert into sa_cashbill (sa_cashbillid, siteid, createuserid, createby, createdate, changeuserid, changeby, changedate,
                          sys_enterpriseid, sa_accountclassid, type, status, checkby, checkdate, billno, amount,
-                         class, subclass, source, sourcenote, ownertable, ownerid, remarks)
+                         class, subclass, source, sourcenote, ownertable, ownerid, remarks,billdate)
 values ($sa_cashbillid$, $siteid$, $userid$, $username$, CURRENT_TIME, $userid$, $username$, CURRENT_TIME,
         $sys_enterpriseid$, $sa_accountclassid$, 1, '审核', $username$, CURRENT_TIME, $billno$, $amount$,
-        '货款', '回款', '银企直联', '银企直联', 'sa_bankstatement', $ownerid$, $remarks$)
+        '货款', '回款', '银企直联', '银企直联', 'sa_bankstatement', $ownerid$, $remarks$,CURRENT_TIME)