bug修复

src/custom/restcontroller/R.java

@@ -6951,6 +6951,11 @@ public class R {
         public static class v1 {
         }
     }
+
+    public static class ID2025121515015903 {
+        public static class v1 {
+        }
+    }
 }
 
 

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

@@ -242,7 +242,7 @@ public class serviceorder extends Controller {
         querySQL.setTableAlias("t1");
         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_agents", "t4", "t4.sa_agentsid=t1.sa_agentsid and t4.siteid=t1.siteid", "agentnum");
+        querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t4", "t4.sys_enterpriseid=t1.sys_enterpriseid and t4.siteid=t1.siteid", "agentnum");
         querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t5", "t5.sys_enterpriseid=t4.sys_enterpriseid and t5.siteid=t4.siteid", "contact", "phonenumber", "address");
         querySQL.addJoinTable(JOINTYPE.left, "sa_warrantycard", "t6", "t6.sku=t1.sku and t6.siteid=t1.siteid", "cardno", "begdate", "enddate","isvoid");
         querySQL.addJoinTable(JOINTYPE.left, "sa_customers", "t7", "t6.sa_customersid=t7.sa_customersid and t6.siteid=t7.siteid", "sa_customersid");

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

@@ -1254,12 +1254,12 @@ public class stockbill extends Controller {
                     if (isinstock(st_stockbill.getString("type"), st_stockbill.getString("rb"), true)) {
                         sqllist.add("update sa_itemsku set stockid=" + skustockid + " where sku='" + FMACHINECODE + "'");
                         if (st_stockbill.getString("type").equals("销售出库")) {
-                            sqllist.add("update sa_itemsku set sa_agentsid=0 where sku='" + FMACHINECODE + "'");
+                            sqllist.add("update sa_itemsku set sa_agentsid=0,sys_enterpriseid=0 where sku='" + FMACHINECODE + "'");
                         }
                     } else {
                         sqllist.add("update sa_itemsku set stockid=0 where sku='" + FMACHINECODE + "'");
                         if (st_stockbill.getString("type").equals("销售出库")) {
-                            sqllist.add("update sa_itemsku set sa_agentsid=(select sa_agentsid from sa_agents where sys_enterpriseid=" + st_stockbill.getLong("sys_enterpriseid") + ") where sku='" + FMACHINECODE + "'");
+                            sqllist.add("update sa_itemsku set sys_enterpriseid="+st_stockbill.getLong("sys_enterpriseid")+",sa_agentsid=(select sa_agentsid from sa_agents where sys_enterpriseid=" + st_stockbill.getLong("sys_enterpriseid") + ") where sku='" + FMACHINECODE + "'");
                             if (st_stockbill.getBoolean("iswx")) {
                                 sqllist.add("update sa_itemsku set stockid=(select stockid from st_stock where stockno='00') where sku='" + FMACHINECODE + "'");
                             }

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

@@ -434,6 +434,22 @@ public class toolscode extends Controller {
         return getSucReturnObject().setData(rows).toString();
     }
 
+    @API(title = "判断序列号是否符合要求", apiversion = R.ID2025121515015903.v1.class)
+    public String jundgeSku() throws YosException {
+        if(sys_enterpriseid<=0){
+            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()){
+            return getErrReturnObject().setErrMsg("序列号不存在").toString();
+        }
+        if(skuRows.get(0).getLong("sys_enterpriseid")!=sys_enterpriseid){
+            return getErrReturnObject().setErrMsg("序列号不在当前经销商所在仓").toString();
+        }
+        return getSucReturnObject().toString();
+    }
+
 
     @API(title = "删除", apiversion = R.ID20221215101103.v1.class)
     @CACHEING_CLEAN(apiversions = {R.ID20221215101003.v1.class, R.ID20221215100903.v1.class})