返修单添加 入库时间，出库时间 两个字段

src/custom/restcontroller/sale/aftersalesmag/aftersalesmag.java

@@ -56,19 +56,30 @@ public class aftersalesmag extends Controller {
             }
         }
 
+        QuerySQL t5 = SQLFactory.createQuerySQL(this, "st_stockbill_items_sku", "sku").setTableAlias("t1");
+        t5.addJoinTable(JOINTYPE.inner, "st_stockbill", "t2", "t2.st_stockbillid=t1.st_stockbillid", "st_stockbillid", "checkdate");
+        t5.setWhere("t2.type='返修入库' and t2.status = '审核'");
+
+
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_aftersalesmag", "*");
         querySQL.setTableAlias("t1");
-        querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t2", "t1.sys_enterpriseid = t2.sys_enterpriseid AND t1.siteid = t2.siteid","enterprisename");
-        querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t3", "t1.sys_enterpriseid = t3.sys_enterpriseid AND t1.siteid = t3.siteid","agentnum");
-        querySQL.addJoinTable(JOINTYPE.left, "sa_aftersalesmag_items", "t4", "t1.sa_aftersalesmagid = t4.sa_aftersalesmagid AND t1.siteid = t4.siteid","name","phonenumber","address",
-                "stockdate","enddate","model","unitname","itemname","itemno","duty","demand","machinecode","reason","qty","itemid");
-        querySQL.addQueryFields("remarksdetail","t4.remarks");
+        querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t2", "t1.sys_enterpriseid = t2.sys_enterpriseid AND t1.siteid = t2.siteid", "enterprisename");
+        querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t3", "t1.sys_enterpriseid = t3.sys_enterpriseid AND t1.siteid = t3.siteid", "agentnum");
+        querySQL.addJoinTable(JOINTYPE.left, "sa_aftersalesmag_items", "t4", "t1.sa_aftersalesmagid = t4.sa_aftersalesmagid AND t1.siteid = t4.siteid", "name", "phonenumber", "address",
+                "stockdate", "enddate", "model", "unitname", "itemname", "itemno", "duty", "demand", "machinecode", "reason", "qty", "itemid");
+
+        querySQL.addJoinTable(JOINTYPE.left, t5, "t5", "t5.sku=t4.machinecode");
+        querySQL.addJoinTable(JOINTYPE.left, "sa_sendrepair", "t6", "t6.sourcetable='st_stockbill' and t6.sourceid=t5.st_stockbillid");
+
+        querySQL.addQueryFields("remarksdetail", "t4.remarks");
+        querySQL.addQueryFields("incheckdate", "t5.checkdate");
+        querySQL.addQueryFields("outcheckdate", "t6.checkdate");
         querySQL.setSiteid(siteid);
         querySQL.setWhere(where.toString());
-        querySQL.setWhere("t1.sys_enterpriseid",sys_enterpriseid);
+        querySQL.setWhere("t1.sys_enterpriseid", sys_enterpriseid);
         querySQL.setPage(pageSize, pageNumber);
         Rows rows = querySQL.query();
-        
+
 //        ArrayList<Long> ids = rows.toArrayList("sa_aftersalesmagid", new ArrayList<>());
 //        //查询反退金额
 //        RowsMap aftersalesmagReturnAmountRowsMap = Aftersalesmag.getAftersalesmagReturnAmount(this, ids);
@@ -163,7 +174,7 @@ public class aftersalesmag extends Controller {
         ArrayList<String> sqlList = new ArrayList<>();
         Rows sa_aftersalesmag_itemsRows = dbConnect.runSqlQuery("select t1.machinecode from sa_aftersalesmag_items t1 where t1.sa_aftersalesmagid=" + sa_aftersalesmagid);
         for (Row row : sa_aftersalesmag_itemsRows) {
-            sqlList.add("update sa_itemsku set isreturn=1,stockid=0 where sku='" + row.getString("machinecode")+"'");
+            sqlList.add("update sa_itemsku set isreturn=1,stockid=0 where sku='" + row.getString("machinecode") + "'");
         }
 
         //        for (Row row : sa_aftersalesmag_itemsRows) {

src/custom/restcontroller/webmanage/sale/aftersalesmag/aftersalesmag.java

@@ -309,15 +309,24 @@ public class aftersalesmag extends Controller {
     @CACHEING
     public String queryaftersalesmagMain() throws YosException {
         Long sa_aftersalesmagid = content.getLong("sa_aftersalesmagid");
+
+        QuerySQL t5 = SQLFactory.createQuerySQL(this, "st_stockbill_items_sku", "sku").setTableAlias("t1");
+        t5.addJoinTable(JOINTYPE.inner, "st_stockbill", "t2", "t2.st_stockbillid=t1.st_stockbillid", "st_stockbillid", "checkdate");
+        t5.setWhere("t2.type='返修入库' and t2.status = '审核'");
+
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_aftersalesmag", "*");
         querySQL.setTableAlias("t1");
         querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t2", "t1.sys_enterpriseid = t2.sys_enterpriseid AND t1.siteid = t2.siteid", "enterprisename","abbreviation");
         querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t3", "t1.sys_enterpriseid = t3.sys_enterpriseid AND t1.siteid = t3.siteid", "agentnum");
         querySQL.addJoinTable(JOINTYPE.left, "sa_aftersalesmag_items", "t4", "t1.sa_aftersalesmagid = t4.sa_aftersalesmagid AND t1.siteid = t4.siteid", "name", "phonenumber", "address",
                 "stockdate", "enddate", "model", "spec", "unitname", "itemname", "itemno", "duty", "demand", "machinecode", "qty", "itemid");
+        querySQL.addJoinTable(JOINTYPE.left, t5, "t5", "t5.sku=t4.machinecode");
+        querySQL.addJoinTable(JOINTYPE.left, "sa_sendrepair", "t6", "t6.sourcetable='st_stockbill' and t6.sourceid=t5.st_stockbillid");
 //        querySQL.addJoinTable(JOINTYPE.left, "sa_warrantycard", "t5", "t5.sku = t4.machinecode AND t5.siteid = t4.siteid", "cardno");
         querySQL.addQueryFields("remarksdetail", "t4.remarks");
         querySQL.addQueryFields("reasondetail", "t4.reason");
+        querySQL.addQueryFields("incheckdate", "t5.checkdate");
+        querySQL.addQueryFields("outcheckdate", "t6.checkdate");
         querySQL.setSiteid(siteid);
         querySQL.setWhere("t1.sa_aftersalesmagid", sa_aftersalesmagid);
         Rows rows = querySQL.query();
@@ -370,14 +379,24 @@ public class aftersalesmag extends Controller {
             }
         }
 
+        QuerySQL t5 = SQLFactory.createQuerySQL(this, "st_stockbill_items_sku", "sku").setTableAlias("t1");
+        t5.addJoinTable(JOINTYPE.inner, "st_stockbill", "t2", "t2.st_stockbillid=t1.st_stockbillid", "st_stockbillid", "checkdate");
+        t5.setWhere("t2.type='返修入库' and t2.status = '审核'");
+
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_aftersalesmag", "*");
         querySQL.setTableAlias("t1");
         querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t2", "t1.sys_enterpriseid = t2.sys_enterpriseid AND t1.siteid = t2.siteid", "enterprisename", "abbreviation");
         querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t3", "t1.sys_enterpriseid = t3.sys_enterpriseid AND t1.siteid = t3.siteid", "agentnum");
         querySQL.addJoinTable(JOINTYPE.left, "sa_aftersalesmag_items", "t4", "t1.sa_aftersalesmagid = t4.sa_aftersalesmagid AND t1.siteid = t4.siteid", "name", "phonenumber", "address",
                 "stockdate", "enddate", "model", "unitname", "itemname", "itemno", "duty", "demand", "machinecode", "qty", "itemid");
+
+        querySQL.addJoinTable(JOINTYPE.left, t5, "t5", "t5.sku=t4.machinecode");
+        querySQL.addJoinTable(JOINTYPE.left, "sa_sendrepair", "t6", "t6.sourcetable='st_stockbill' and t6.sourceid=t5.st_stockbillid");
+
         querySQL.addQueryFields("remarksdetail", "t4.remarks");
         querySQL.addQueryFields("reasondetail", "t4.reason");
+        querySQL.addQueryFields("incheckdate", "t5.checkdate");
+        querySQL.addQueryFields("outcheckdate", "t6.checkdate");
         querySQL.setSiteid(siteid);
         querySQL.setWhere(where.toString());
         querySQL.setWhere("t1.createflag=1 or t1.status !='新建'");

src/resources/application.yaml

@@ -10,6 +10,6 @@ system:
     driver: "com.mysql.cj.jdbc.Driver"
     username: "root"
     password: "root"
-    url: "jdbc:mysql://localhost:2206/mdyos"
+    url: "jdbc:mysql://localhost:3306/mdyos"
     #url: jdbc:mysql://host.docker.internal:3306/yos3
     servicename: "mysql80"