bug修复

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

@@ -385,29 +385,28 @@ public class accessoryorder extends Controller {
         querySQL.addJoinTable(JOINTYPE.left, "sa_salearea", "t10", "t10.sa_saleareaid = t9.sa_saleareaid and t10.siteid = t9.siteid",
                 "areaname");
 
-        querySQL.addJoinTable(JOINTYPE.left, "sa_workorder", "t11", "t1.sa_workorderid=t11.sa_workorderid and t1.siteid=t11.siteid");
-        querySQL.addJoinTable(JOINTYPE.left, "sa_warrantycard", "t12", "t12.cardno=t1.cardno and t12.siteid=t1.siteid", "sku", "address");
-        querySQL.addJoinTable(JOINTYPE.left, "plm_item", "t13", "t13.itemid=t12.itemid and t13.siteid=t12.siteid", "iswriteoff");
+        querySQL.addJoinTable(JOINTYPE.left, "sa_workorder", "t14", "t1.sa_workorderid=t14.sa_workorderid and t1.siteid=t14.siteid");
+        querySQL.addJoinTable(JOINTYPE.left, "sa_warrantycard", "t15", "t15.cardno=t1.cardno and t15.siteid=t1.siteid", "sku", "address");
+        querySQL.addJoinTable(JOINTYPE.left, "plm_item", "t16", "t16.itemid=t15.itemid and t16.siteid=t15.siteid", "iswriteoff");
 
 //        querySQL.addJoinTable(JOINTYPE.left, t11, "t11", "t11.sa_orderitemsid = t1.sa_orderitemsid and t11.siteid = t1.siteid");
         querySQL.addJoinTable(JOINTYPE.left, "sa_accountclass", "t12", "t12.sa_accountclassid=t5.sa_accountclassid and t12.siteid=t5.siteid");
-        querySQL.addJoinTable(JOINTYPE.left, "sa_promotion", "t13", "t13.sa_promotionid=t5.sa_promotionid and t13.siteid=t5.siteid", "promnum", "promname");
         querySQL.addQueryFields("accountnames", "if(ifnull(replace(replace(replace(JSON_EXTRACT (t5.sa_accountclassinfos, '$**.accountname' ),'[',''),']',''),'\\\"',''),'')='',t12.accountname,replace(replace(replace(JSON_EXTRACT (t5.sa_accountclassinfos, '$**.accountname' ),'[',''),']',''),'\\\"',''))");
         querySQL.addQueryFields("orderremarks", "t5.remarks");
 
 
-        querySQL.addQueryFields("workorderbillno", "t11.billno");
-        querySQL.addQueryFields("workorderdate", "t11.createdate");
-        querySQL.addQueryFields("workorderstatus", "t11.status");
-        querySQL.addQueryFields("cardname", "t12.name");
-        querySQL.addQueryFields("cardphonenumber", "t12.phonenumber");
-        querySQL.addQueryFields("cardbegdate", "t12.begdate");
-        querySQL.addQueryFields("cardenddate", "t12.enddate");
-        querySQL.addQueryFields("machineitemno", "t13.itemno");
-        querySQL.addQueryFields("machineitemname", "t13.itemname");
-        querySQL.addQueryFields("machinemodel", "t13.model");
-        querySQL.addQueryFields("machinespec", "t13.spec");
-        querySQL.addQueryFields("warrantystatus", "CASE WHEN ifnull(t12.enddate,'')='' then '' else CASE WHEN t12.enddate >= CURDATE() THEN '保内' ELSE '保外' END end");
+        querySQL.addQueryFields("workorderbillno", "t14.billno");
+        querySQL.addQueryFields("workorderdate", "t14.createdate");
+        querySQL.addQueryFields("workorderstatus", "t14.status");
+        querySQL.addQueryFields("cardname", "t15.name");
+        querySQL.addQueryFields("cardphonenumber", "t15.phonenumber");
+        querySQL.addQueryFields("cardbegdate", "t15.begdate");
+        querySQL.addQueryFields("cardenddate", "t15.enddate");
+        querySQL.addQueryFields("machineitemno", "t16.itemno");
+        querySQL.addQueryFields("machineitemname", "t16.itemname");
+        querySQL.addQueryFields("machinemodel", "t16.model");
+        querySQL.addQueryFields("machinespec", "t16.spec");
+        querySQL.addQueryFields("warrantystatus", "CASE WHEN ifnull(t15.enddate,'')='' then '' else CASE WHEN t15.enddate >= CURDATE() THEN '保内' ELSE '保外' END end");
 //        querySQL.addQueryFields("outwarehouseqty", "ifnull(t11.outwarehouseqty,0)");
         //querySQL.addQueryFields("accountclassinfos", "REPLACE(SUBSTRING(JSON_EXTRACT(t5.sa_accountclassinfos, '$[*].accountname'), 2, CHAR_LENGTH(JSON_EXTRACT(t5.sa_accountclassinfos, '$[*].accountname'))-2),'\"','')");
         querySQL.setWhere("t1.siteid", siteid);