浏览代码

收支凭证新增添加单据日期

hu 1 年之前
父节点
当前提交
a7daa2c0bd

+ 1 - 0
src/custom/restcontroller/sale/cashbill/SQL/收支凭证列表查询.sql

@@ -1,6 +1,7 @@
 SELECT t1.sa_cashbillid,
        t1.type,
        t1.billno,
+       t1.billdate,
        t1.remarks,
        t1.period,
        t1.sys_enterpriseid,

+ 2 - 1
src/custom/restcontroller/sale/cashbill/SQL/收支凭证更新.sql

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

+ 8 - 1
src/custom/restcontroller/sale/cashbill/cashbill.java

@@ -339,7 +339,7 @@ public class cashbill extends Controller {
             sqlList.add(sqlFactory.getSQL());
         } else {
             Rows rowscount = dbConnect.runSqlQuery(
-                    "select status from sa_cashbill where sa_cashbillid=" + sa_cashbillid);
+                    "select status,billdate from sa_cashbill where sa_cashbillid=" + sa_cashbillid);
             if (rowscount.isNotEmpty()){
                 if (!rowscount.get(0).getString("status").equals("新建")) {
                     return getErrReturnObject().setErrMsg("非新建状态的收支凭证无法更新").toString();
@@ -359,6 +359,13 @@ public class cashbill extends Controller {
             sqlFactory.addParameter("source", "");
             sqlFactory.addParameter("sourcenote", "");
             sqlFactory.addParameter("period", period);
+            if( content.containsKey("billdate")){
+                sqlFactory.addParameter("billdate", content.getStringValue("billdate"));
+            }else{
+                sqlFactory.addParameter("billdate", rowscount.get(0).getString("billdate"));
+            }
+
+
             sqlList.add(sqlFactory.getSQL());
         }
         dbConnect.runSqlUpdate(sqlList);