收支凭证新增billdate修改

src/custom/restcontroller/sale/cashbill/SQL/收支凭证新增.sql

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

src/custom/restcontroller/sale/cashbill/SQL/收支凭证更新.sql

@@ -12,7 +12,8 @@ SET
     subclass=$subclass$,
     class=$class$,
     period=$period$,
-    discountamount=$discountamount$
+    discountamount=$discountamount$,
+    billdate=$billdate$
 WHERE sa_cashbillid= $sa_cashbillid$ and siteid=$siteid$
 
 

src/custom/restcontroller/sale/cashbill/cashbill.java

@@ -304,7 +304,7 @@ public class cashbill extends Controller {
     public String insertormodify_creditbill() throws YosException {
         Long sa_cashbillid = content.getLong("sa_cashbillid");
         Long type = content.getLong("type"); //收支类型（1:收；0:支）
-        Long sys_enterpriseid = content.getLong("sys_enterpriseid");
+//        Long sys_enterpriseid = content.getLong("sys_enterpriseid");
         Long sa_accountclassid = content.getLong("sa_accountclassid");
         String billcode = "";
         if (type == 1) {
@@ -315,6 +315,8 @@ public class cashbill extends Controller {
         String subclass = content.getStringValue("subclass");
         String class1 = content.getStringValue("class");
         String period = content.getStringValue("period");
+        String billdate = content.getStringValue("billdate");
+
         if (StringUtils.isEmpty(period)) {
             if (type == 1) {
                 return getErrReturnObject().setErrMsg("未填写归属日期").toString();
@@ -348,6 +350,7 @@ public class cashbill extends Controller {
             sqlFactory.addParameter("source", "");
             sqlFactory.addParameter("sourcenote", "");
             sqlFactory.addParameter("period", period);
+            sqlFactory.addParameter("billdate", StringUtils.isBlank(billdate)?"current_time":billdate);
             sqlFactory.addParameter("discountamount", discountamount);
 
             content.put("sa_cashbillid", sa_cashbillid);
@@ -378,6 +381,7 @@ public class cashbill extends Controller {
             sqlFactory.addParameter("source", "");
             sqlFactory.addParameter("sourcenote", "");
             sqlFactory.addParameter("period", period);
+            sqlFactory.addParameter("billdate",StringUtils.isBlank(billdate)?"current_time":billdate);
             sqlFactory.addParameter("discountamount", discountamount);
             sqlList.add(sqlFactory.getSQL());
             sqlList.add(DataContrlLog.createLog(this, "sa_cashbill", sa_cashbillid, "更新", "收支凭证更新成功").getSQL());