接口调整

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

@@ -111,7 +111,7 @@ public class toolscode extends Controller {
             Rows skuRows = skuquerySQL.query();
             RowsMap skuRowsMap = skuRows.toRowsMap("sku");
             for (Row row : rows) {
-                row.put("sku",row.getString("sku").replaceAll(" ", ""));
+                row.put("sku", row.getString("sku").replaceAll(" ", ""));
             }
             RowsMap rowsMap = rows.toRowsMap("sku");
             for (Row row : rows) {
@@ -127,7 +127,7 @@ public class toolscode extends Controller {
                             iserr = true;
                             row.put("msg", "错误信息:序列号" + row.getString("sku") + "已存在");
                             rowserr.add(row);
-                        }else if(rowsMap.get(row.getString("sku")).size()>1){
+                        } else if (rowsMap.get(row.getString("sku")).size() > 1) {
                             iserr = true;
                             row.put("msg", "错误信息:序列号" + row.getString("sku") + "在excel中重复存在");
                             rowserr.add(row);
@@ -340,8 +340,8 @@ public class toolscode extends Controller {
         skuQuery.addJoinTable(JOINTYPE.left, "plm_item", "t2", "t1.itemid=t2.itemid", "itemid", "itemno", "itemname", "spec", "model", "topclassnum");
         skuQuery.addJoinTable(JOINTYPE.left, "plm_unit", "t3", "t2.unitid=t3.unitid");
         skuQuery.addJoinTable(JOINTYPE.left, "st_stock", "t4", "t4.stockno=t2.stockno");
-        skuQuery.addJoinTable(JOINTYPE.left, "sys_enterprise", "t5", "t1.sys_enterpriseid=t5.sys_enterpriseid", "enterprisename","abbreviation");
-        skuQuery.addJoinTable(JOINTYPE.left, "sa_agents", "t6", "t1.sys_enterpriseid=t6.sys_enterpriseid", "agentnum");
+        skuQuery.addJoinTable(JOINTYPE.left, "sys_enterprise", "t5", "t1.sys_enterpriseid=t5.sys_enterpriseid", "enterprisename", "abbreviation", "sys_enterpriseid");
+        skuQuery.addJoinTable(JOINTYPE.left, "sa_agents", "t6", "t1.sys_enterpriseid=t6.sys_enterpriseid", "agentnum", "sa_agentsid");
         skuQuery.addJoinTable(JOINTYPE.left, "st_stock", "t7", "t1.stockid=t7.stockid", "stockno", "stockname");
 
         skuQuery.addQueryFields("itemstockno", "t2.stockno");
@@ -364,13 +364,13 @@ public class toolscode extends Controller {
                 skuQuery.setWhere("t1.isused", whereObject.getBooleanValue("isused"));
             }
             if (whereObject.containsKey("sku") && !"".equals(whereObject.getString("sku"))) {
-                skuQuery.setWhere("t1.sku",whereObject.getString("sku"));
+                skuQuery.setWhere("t1.sku", whereObject.getString("sku"));
             }
         }
         Rows skuRows = skuQuery.query();
         if (skuRows.isNotEmpty()) {
             RowsMap skuChangeRowsMap = SQLFactory.createQuerySQL(this, "sa_itemsku_change", "sa_itemskuid", "changenotes").setWhere("sa_itemskuid", skuRows.toArrayList("sa_itemskuid")).setOrderBy("sa_itemsku_changeid desc").query().toRowsMap("sa_itemskuid");
-            RowsMap warrantycardRowsMap = SQLFactory.createQuerySQL(this, "sa_warrantycard", "sku","name", "phonenumber","address","sa_customersid","province","city","county","begdate","enddate","cardno").setWhere("sku", skuRows.toArrayList("sku")).setWhere(" isvoid=0 ").query().toRowsMap("sku");
+            RowsMap warrantycardRowsMap = SQLFactory.createQuerySQL(this, "sa_warrantycard", "sku", "name", "phonenumber", "address", "sa_customersid", "province", "city", "county", "begdate", "enddate", "cardno").setWhere("sku", skuRows.toArrayList("sku")).setWhere(" isvoid=0 ").query().toRowsMap("sku");
 
             for (Row skuRow : skuRows) {
                 String sa_itemskuid = skuRow.getString("sa_itemskuid");
@@ -394,19 +394,19 @@ public class toolscode extends Controller {
                     skuRow.put("begdate", warrantycardRow.getString("begdate"));
                     skuRow.put("enddate", warrantycardRow.getString("enddate"));
                     Date date = new Date();
-                    if(StringUtils.isNotBlank(warrantycardRow.getString("enddate"))){
+                    if (StringUtils.isNotBlank(warrantycardRow.getString("enddate"))) {
                         if (date.before(warrantycardRow.getDate("enddate"))) {
                             skuRow.put("warrantystatus", "保内");
-                        }else{
+                        } else {
                             skuRow.put("warrantystatus", "保外");
                         }
-                    }else{
+                    } else {
                         skuRow.put("warrantystatus", "保外");
                     }
-                }else{
+                } else {
                     skuRow.put("name", "");
                     skuRow.put("phonenumber", "");
-                    skuRow.put("address","");
+                    skuRow.put("address", "");
                     skuRow.put("sa_customersid", "");
                     skuRow.put("province", "");
                     skuRow.put("city", "");
@@ -431,12 +431,12 @@ public class toolscode extends Controller {
         querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t5", "t1.sa_agentsidnew=t5.sa_agentsid");
         querySQL.addJoinTable(JOINTYPE.left, "st_stock", "t6", "t1.stockid=t6.stockid");
         querySQL.addJoinTable(JOINTYPE.left, "st_stock", "t7", "t1.stockidnew=t7.stockid");
-        querySQL.addQueryFields("itemno","t2.itemno");
-        querySQL.addQueryFields("itemnonew","t3.itemno");
-        querySQL.addQueryFields("agentnum","t4.agentnum");
-        querySQL.addQueryFields("agentnumnew","t5.agentnum");
-        querySQL.addQueryFields("stockname","t6.stockname");
-        querySQL.addQueryFields("stocknamenew","t7.stockname");
+        querySQL.addQueryFields("itemno", "t2.itemno");
+        querySQL.addQueryFields("itemnonew", "t3.itemno");
+        querySQL.addQueryFields("agentnum", "t4.agentnum");
+        querySQL.addQueryFields("agentnumnew", "t5.agentnum");
+        querySQL.addQueryFields("stockname", "t6.stockname");
+        querySQL.addQueryFields("stocknamenew", "t7.stockname");
         querySQL.setPage(pageSize, pageNumber);
         querySQL.setSiteid(siteid);
         querySQL.setWhere("t1.sa_itemskuid", sa_itemskuid);
@@ -453,15 +453,15 @@ public class toolscode extends Controller {
 
     @API(title = "判断序列号是否符合要求", apiversion = R.ID2025121515015903.v1.class)
     public String jundgeSku() throws YosException {
-        if(content.containsKey("sys_enterpriseid")){
-            sys_enterpriseid=content.getLongValue("sys_enterpriseid");
+        if (content.containsKey("sys_enterpriseid")) {
+            sys_enterpriseid = content.getLongValue("sys_enterpriseid");
         }
-        String sku=content.getString("sku");
-        Rows skuRows =dbConnect.runSqlQuery("select sys_enterpriseid from sa_itemsku where sku='"+sku+"'");
-        if(skuRows.isEmpty()){
+        String sku = content.getString("sku");
+        Rows skuRows = dbConnect.runSqlQuery("select sys_enterpriseid from sa_itemsku where sku='" + sku + "'");
+        if (skuRows.isEmpty()) {
             return getErrReturnObject().setErrMsg("序列号不存在").toString();
         }
-        if(skuRows.get(0).getLong("sys_enterpriseid")!=sys_enterpriseid){
+        if (skuRows.get(0).getLong("sys_enterpriseid") != sys_enterpriseid) {
             return getErrReturnObject().setErrMsg("序列号不在当前经销商所在仓").toString();
         }
         return getSucReturnObject().toString();

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

@@ -1246,7 +1246,7 @@ public class workorder extends Controller {
         querySQL.addJoinTable(JOINTYPE.left, "plm_item", "t2", "t1.itemid=t2.itemid and t1.siteid=t2.siteid", "itemid", "itemno", "itemname", "model", "spec");
         querySQL.addJoinTable(JOINTYPE.left, "plm_unit", "t3", "t3.unitid=t2.unitid and t3.siteid=t2.siteid", "unitname");
         querySQL.addJoinTable(JOINTYPE.left, "sa_warrantycard", "t6", "t6.sku=t1.sku and t6.siteid=t1.siteid", "cardno", "begdate", "enddate", "name", "phonenumber");
-        querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t4", "t4.sa_agentsid=t6.sa_agentsid and t4.siteid=t6.siteid", "agentnum", "sa_agentsid");
+        querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t4", "t4.sa_agentsid=t1.sa_agentsid and t4.siteid=t1.siteid", "agentnum", "sa_agentsid");
         querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t5", "t5.sys_enterpriseid=t4.sys_enterpriseid and t5.siteid=t4.siteid", "enterprisename", "abbreviation", "sys_enterpriseid");
         querySQL.addJoinTable(JOINTYPE.left, "sa_customers", "t7", "t6.sa_customersid=t7.sa_customersid and t6.siteid=t7.siteid", "sa_customersid");
         querySQL.addQueryFields("customername", "t7.name");