Merge branch 'develop' into develop2

src/custom/beans/accountbalance/Accountbalance.java

@@ -122,6 +122,7 @@ public class Accountbalance extends BaseClass {
         sqlFactory.addParameter("sa_cashbillid_rebate", "null");
         sqlFactory.addParameter("class", cashbillEntity.getType());
         sqlFactory.addParameter("subclass", cashbillEntity.getTypemx());
+        sqlFactory.addParameter("period", cashbillEntity.getPeriod());
         if (ischeck) {
             BigDecimal balance = BigDecimal.ZERO;  //当前账户余额
             sqlFactory.addParameter("status", "审核");
@@ -216,6 +217,7 @@ public class Accountbalance extends BaseClass {
         sqlFactory.addParameter("subclass", cashbillEntity.getTypemx());
         sqlFactory.addParameter("sa_cashbillid_rebate", "null");
         sqlFactory.addParameter("updatek3flag", "");
+        sqlFactory.addParameter("period", cashbillEntity.getPeriod());
         if (ischeck) {
             BigDecimal balance = BigDecimal.ZERO;  //当前账户余额
             sqlFactory.addParameter("status", "审核");
@@ -292,6 +294,7 @@ public class Accountbalance extends BaseClass {
         sqlFactory.addParameter("subclass", cashbillEntity.getTypemx());
         sqlFactory.addParameter("sa_cashbillid_rebate", "null");
         sqlFactory.addParameter("updatek3flag", "");
+        sqlFactory.addParameter("period", cashbillEntity.getPeriod());
         if (ischeck) {
             BigDecimal balance = BigDecimal.ZERO;  //当前账户余额
             sqlFactory.addParameter("status", "审核");
@@ -368,6 +371,7 @@ public class Accountbalance extends BaseClass {
         sqlFactory.addParameter("sa_cashbillid_rebate", sa_cashbillid_rebate);
         sqlFactory.addParameter("class", cashbillEntity.getType());
         sqlFactory.addParameter("subclass", cashbillEntity.getTypemx());
+        sqlFactory.addParameter("period", cashbillEntity.getPeriod());
         if (ischeck) {
             BigDecimal balance = BigDecimal.ZERO;  //当前账户余额
             sqlFactory.addParameter("status", "审核");

src/custom/beans/accountbalance/CashbillEntity.java

@@ -1,5 +1,6 @@
 package beans.accountbalance;
 
+import common.BaseClass;
 import org.apache.commons.lang.StringUtils;
 
 import java.math.BigDecimal;
@@ -13,6 +14,8 @@ public class CashbillEntity {
     private String ownertable;
     private long ownerid;
 
+    private String period;
+
 
     private String type = "货款";
 
@@ -32,8 +35,22 @@ public class CashbillEntity {
         this.typemx = typemx;
     }
 
+
+    public String getPeriod() {
+        if (this.period == null) {
+            period = BaseClass.getDate_Str();
+        }
+        return period;
+    }
+
+    public void setPeriod(String period) {
+        this.period = period;
+    }
+
     public String getType() {
-        if (this.type == null) type = "";
+        if (this.type == null) {
+            type = "";
+        }
         return type;
     }
 
@@ -42,7 +59,9 @@ public class CashbillEntity {
     }
 
     public String getTypemx() {
-        if (this.typemx == null) typemx = "";
+        if (this.typemx == null) {
+            typemx = "";
+        }
         return typemx;
     }
 

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

@@ -1,4 +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,status,source,sourcenote,ownertable,ownerid,balance,sa_cashbillid_rebate,class,subclass,period,updatek3flag)
-values ($siteid$, $sa_cashbillid$,$userid$,$username$, CURRENT_TIME, $billno$,$userid$, $username$, CURRENT_TIME,$checkby$,$checkdate$,$sys_enterpriseid$,$sa_accountclassid$,$type$,$remarks$,
-        $amount$,$status$,$source$,$sourcenote$,$ownertable$,$ownerid$,$balance$,$sa_cashbillid_rebate$,$class$,$subclass$,current_date,$updatek3flag$);
+insert into sa_cashbill (siteid, sa_cashbillid, createuserid, createby, createdate, billno, changeuserid, changeby,
+                         changedate, checkby, checkdate, sys_enterpriseid, sa_accountclassid, type, remarks, amount,
+                         status, source, sourcenote, ownertable, ownerid, balance, sa_cashbillid_rebate, class,
+                         subclass, period, updatek3flag)
+values ($siteid$, $sa_cashbillid$, $userid$, $username$, CURRENT_TIME, $billno$, $userid$, $username$, CURRENT_TIME,
+        $checkby$, $checkdate$, $sys_enterpriseid$, $sa_accountclassid$, $type$, $remarks$,
+        $amount$, $status$, $source$, $sourcenote$, $ownertable$, $ownerid$, $balance$, $sa_cashbillid_rebate$, $class$,
+        $subclass$, $period$, $updatek3flag$);

src/custom/restcontroller/webmanage/sale/transferbill/Transferbill.java

@@ -121,6 +121,8 @@ public class Transferbill extends Controller {
         sqlList.add("update sa_transferbill set checkby='" + username + "',checkdate=current_date,status='审核' where siteid='" + siteid + "' and sa_transferbillid=" + sa_transferbillid);
 
         CashbillEntity cashbillEntity = new CashbillEntity(amount.negate(), "", "转账单", rows.get(0).getString("billno"), "sa_transferbill", sa_transferbillid, "货款", "");
+        cashbillEntity.setPeriod(rows.get(0).getString("billno"));
+
         JSONObject cashbillIncome = Accountbalance.createCashbillIncome(this, sys_enterpriseid, sa_accountclassid, cashbillEntity, true, false);
         sqlList.addAll(cashbillIncome.getJSONArray("sqlList").toJavaList(String.class));
         sa_cashbillidList.add(cashbillIncome.getLong("sa_cashbillid"));
@@ -131,9 +133,9 @@ public class Transferbill extends Controller {
         sa_cashbillidList.add(cashbillIncome1.getLong("sa_cashbillid"));
         dbConnect.runSqlUpdate(sqlList);
 
-        String billdate=rows.get(0).getString("billdate");
-        if(!billdate.isEmpty()){
-            dbConnect.runSqlUpdate("update sa_cashbill set  period= '"+billdate+"'   WHERE ownertable='sa_transferbill' and ownerid='"+sa_transferbillid+"'");
+        String billdate = rows.get(0).getString("billdate");
+        if (!billdate.isEmpty()) {
+            dbConnect.runSqlUpdate("update sa_cashbill set  period= '" + billdate + "'   WHERE ownertable='sa_transferbill' and ownerid='" + sa_transferbillid + "'");
         }
 
         for (Long sa_cashbillid : sa_cashbillidList) {