Merge remote-tracking branch 'origin/develop' into develop

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

@@ -352,6 +352,9 @@ public class accessoryorder extends Controller {
         ArrayList<Long> ids = rows.toArrayList("itemid", new ArrayList<>());
         //查询附件
         RowsMap attinfoRowsMap = getAttachmentUrl("plm_item", ids);
+
+
+
         for (Row row : rows) {
             row.put("attinfos", attinfoRowsMap.getOrDefault(row.getString("itemid"), new Rows()));
             row.put("contractprice", 0);
@@ -381,11 +384,29 @@ public class accessoryorder extends Controller {
                 "sys_enterprise_tradefieldid");
         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", "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", "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);

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

@@ -453,7 +453,7 @@ public class toolscode extends Controller {
 
     @API(title = "判断序列号是否符合要求", apiversion = R.ID2025121515015903.v1.class)
     public String jundgeSku() throws YosException {
-        if(sys_enterpriseid<=0){
+        if(content.containsKey("sys_enterpriseid")){
             sys_enterpriseid=content.getLongValue("sys_enterpriseid");
         }
         String sku=content.getString("sku");

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

@@ -749,7 +749,7 @@ public class tpartreimbursement extends Controller {
         }
         dbConnect.runSqlUpdate(sqllist);
 
-        return getSucReturnObject().toString();
+        return getSucReturnObject().setData(billno).toString();
     }