错误修复

src/custom/beans/enterprise_stockbill/bills/BasicBill.java

@@ -140,23 +140,23 @@ public abstract class BasicBill {
             if (!itemskuRowsMap.containsKey(sku)) {
                 throw new YosException("序列号【" + sku + "】不存在");
             }
+            if (!isInStock(ischeck) && itemskuRowsMap.get(sku).get(0).getLong("stockid") != getAgentStockID()) {
+                throw new YosException("序列号【" + sku + "】在正处于美大仓库中");
+            }
             if (itemskuRowsMap.get(sku).get(0).getLong("sys_enterpriseid") != sys_enterpriseid) {
                 throw new YosException("序列号【" + sku + "】非当前经销商所属");
             }
-            if (warrantycardsList.contains(sku)) {
-                throw new YosException("序列号【" + sku + "】已存在保修卡！");
+            if (isInStock(ischeck) && itemskuRowsMap.get(sku).get(0).getLong("stockid") != 0) {
+                throw new YosException("序列号【" + sku + "】总部未出库，无法录入！");
             }
-            if (!isInStock(ischeck) && itemskuRowsMap.get(sku).get(0).getLong("stockid") != getAgentStockID()) {
-                throw new YosException("序列号【" + sku + "】不在经销商仓库中");
+            if (isInStock(ischeck) && itemskuRowsMap.get(sku).get(0).getLong("sys_enterprise_stockid") != 0) {
+                throw new YosException("序列号【" + sku + "】正在仓库中");
             }
             if (!isInStock(ischeck) && itemskuRowsMap.get(sku).get(0).getLong("sys_enterprise_stockid") != sys_enterprise_stockid) {
                 throw new YosException("序列号【" + sku + "】不在仓库中");
             }
-            if (isInStock(ischeck) && itemskuRowsMap.get(sku).get(0).getLong("stockid") != 0) {
-                throw new YosException("序列号【" + sku + "】正在仓库中");
-            }
-            if (isInStock(ischeck) && itemskuRowsMap.get(sku).get(0).getLong("sys_enterprise_stockid") != 0) {
-                throw new YosException("序列号【" + sku + "】正在仓库中");
+            if (warrantycardsList.contains(sku)) {
+                throw new YosException("序列号【" + sku + "】已存在保修卡！");
             }
         }
     }

src/custom/restcontroller/crm/agent/stock/skudbapply.java

@@ -48,6 +48,9 @@ public class skudbapply extends Controller {
         if (skuRows.isEmpty()) {
             return getErrReturnObject().setErrMsg("序列号" + sku + "不存在，请检查").toString();
         }
+        if (dbConnect.runSqlQuery("select * from sys_enterprise_sku_dbapply where sku='" + sku + "' and status='提交'").isNotEmpty()) {
+            return getErrReturnObject().setErrMsg("序列号" + sku + "已存在于待处理的调拨申请单中，请勿重复" + (autosubmit ? "提交" : "申请")).toString();
+        }
         SQLList SQLList = new SQLList();
         if (sys_enterprise_sku_dbapplyid <= 0 || SQLFactory.createQuerySQL(this, "sys_enterprise_sku_dbapply", "sys_enterprise_sku_dbapplyid").setSiteid(siteid).setUniqueid(sys_enterprise_sku_dbapplyid).query().isEmpty()) {
             InsertSQL insertSQL = SQLFactory.createInsertSQL(this, "sys_enterprise_sku_dbapply");
@@ -84,6 +87,10 @@ public class skudbapply extends Controller {
         if (!issubmit && !status.equals("提交")) {
             return getErrReturnObject().setErrMsg("非提交状态无法撤回").toString();
         }
+        String sku = row.getString("sku");
+        if (dbConnect.runSqlQuery("select * from sys_enterprise_sku_dbapply where sku='" + sku + "' and status='提交'").isNotEmpty()) {
+            return getErrReturnObject().setErrMsg("序列号" + sku + "已存在于待处理的调拨申请单中，请勿重复提交").toString();
+        }
         SQLList SQLList = new SQLList();
         UpdateSQL updateSQL = SQLFactory.createUpdateSQL(this, "sys_enterprise_sku_dbapply");
         updateSQL.setValue("status", issubmit ? "提交" : "新建");// 状态

src/custom/restcontroller/crm/agent/stock/stock.java

@@ -20,6 +20,9 @@ public class stock extends Controller {
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sys_enterprise_stock");
         querySQL.setSiteid(siteid);
         querySQL.setWhere("sys_enterpriseid=" + sys_enterpriseid + " or issystem=1");
+        if (content_where.containsKey("isused")) {
+            querySQL.setWhere("isused", content_where.getBooleanValue("isused"));
+        }
         Rows rows = querySQL.query();
         return getSucReturnObject().setData(rows).toString();
     }

src/custom/restcontroller/crm/agent/stock/stockbill.java

@@ -362,7 +362,7 @@ public class stockbill extends Controller {
         }
         long itemid = skuRows.get(0).getLong("itemid");
         Enterprise.addSiteItems(dbConnect, siteid, sys_enterpriseid, itemid);//判断并生成商品档案
-        long sys_enterprise_itemid = 0;
+        long sys_enterprise_itemid = 0L;
         QuerySQL sys_enterprise_itemQuery = SQLFactory.createQuerySQL(dbConnect, "sys_enterprise_item");
         sys_enterprise_itemQuery.setSiteid(siteid);
         sys_enterprise_itemQuery.setWhere("sys_enterpriseid", sys_enterpriseid);
@@ -373,7 +373,6 @@ public class stockbill extends Controller {
         } else {
             sys_enterprise_itemid = itemrow.get(0).getLong("sys_enterprise_itemid");
         }
-
         if (SQLFactory.createQuerySQL(this, "sys_enterprise_stockbill_skus").setWhere("sku", sku).setWhere("sys_enterprise_stockbillid", sys_enterprise_stockbillid).query().isEmpty()) {
             SQLList sqlList = new SQLList();
             if (sys_enterprise_stockbill_itemsid == 0) {//如果没有指定货品明细ID，则自动生成

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

@@ -38,7 +38,12 @@ public class serviceorder extends Controller {
     }
 
     @API(title = "服务申请单新增更新", apiversion = R.ID20230206091403.v1.class)
-    @CACHEING_CLEAN(apiversions = {R.ID20230206091603.v1.class, R.ID20230206091703.v1.class, R.ID20230206101303.v1.class, R.ID20230217100703.v1.class, R.ID20230217133003.v1.class})
+    @CACHEING_CLEAN(apiversions = {
+            R.ID20230206091603.v1.class,
+            R.ID20230206091703.v1.class,
+            R.ID20230206101303.v1.class,
+            R.ID20230217100703.v1.class,
+            R.ID20230217133003.v1.class})
     public String insertormodify_serviceorder() throws YosException {
         SQLList sqlList = new SQLList();
         // 表名
@@ -225,8 +230,6 @@ public class serviceorder extends Controller {
             sys_enterpriseid = content.getLong("sys_enterpriseid");
         }
 
-
-
         /*
          * 过滤条件设置
          */
@@ -266,6 +269,7 @@ public class serviceorder extends Controller {
         querySQL.setTableAlias("t0");
         querySQL.addJoinTable(JOINTYPE.right, sqlFactory, "t1", "t0.siteid='111'", "*");
         querySQL.setPage(pageSize, pageNumber);
+        querySQL.setOrderBy("t1.sa_warrantycardid desc");
         Rows rows = querySQL.query();
         // 默认商品图片
         Rows defaultImageRows = beans.Item.Item.getItemdefaultImage(this);
@@ -398,7 +402,7 @@ public class serviceorder extends Controller {
         } else {
             row.put("backreason", "");
         }
-        row.putIfAbsent("noticedate","");
+        row.putIfAbsent("noticedate", "");
 
         return getSucReturnObject().setData(row).toString();
     }
@@ -666,7 +670,16 @@ public class serviceorder extends Controller {
     }
 
     @API(title = "服务申请单转工单", apiversion = R.ID20230207091003.v1.class)
-    @CACHEING_CLEAN(apiversions = {R.ID20230206091603.v1.class, R.ID20230206091703.v1.class, R.ID20230206101303.v1.class, R.ID20230208140103.v1.class, R.ID20230208140203.v1.class, R.ID20230209091103.v1.class, R.ID20230207154203.v1.class, R.ID20230217100703.v1.class, R.ID20230217133003.v1.class})
+    @CACHEING_CLEAN(apiversions = {
+            R.ID20230206091603.v1.class,
+            R.ID20230206091703.v1.class,
+            R.ID20230206101303.v1.class,
+            R.ID20230208140103.v1.class,
+            R.ID20230208140203.v1.class,
+            R.ID20230209091103.v1.class,
+            R.ID20230207154203.v1.class,
+            R.ID20230217100703.v1.class,
+            R.ID20230217133003.v1.class})
     public String serviceorderToWorkorder() throws YosException {
 
         Long sa_serviceorderid = content.getLong("sa_serviceorderid");
@@ -777,7 +790,10 @@ public class serviceorder extends Controller {
     }
 
     @API(title = "重新指派工单", apiversion = R.ID2025101710510903.v1.class)
-    @CACHEING_CLEAN(apiversions = {serviceorder.class, workorder.class, restcontroller.sale.serviceorder.serviceorder.class})
+    @CACHEING_CLEAN(apiversions = {
+            serviceorder.class,
+            workorder.class,
+            restcontroller.sale.serviceorder.serviceorder.class})
     public String reAssigningWorkorder() throws YosException {
         Long sa_workorderid = content.getLong("sa_workorderid");
         JSONArray projectlearders = content.getJSONArray("projectlearders");
@@ -822,7 +838,12 @@ public class serviceorder extends Controller {
 
 
     @API(title = "删除", apiversion = R.ID20230206091803.v1.class)
-    @CACHEING_CLEAN(apiversions = {R.ID20230206091603.v1.class, R.ID20230206091703.v1.class, R.ID20230206101303.v1.class, R.ID20230217100703.v1.class, R.ID20230217133003.v1.class})
+    @CACHEING_CLEAN(apiversions = {
+            R.ID20230206091603.v1.class,
+            R.ID20230206091703.v1.class,
+            R.ID20230206101303.v1.class,
+            R.ID20230217100703.v1.class,
+            R.ID20230217133003.v1.class})
     public String delete() throws YosException {
 
         JSONArray sa_serviceorderids = content.getJSONArray("sa_serviceorderids");
@@ -847,7 +868,10 @@ public class serviceorder extends Controller {
     }
 
     @API(title = "作废服务申请单", apiversion = R.ID2025121519311203.v1.class)
-    @CACHEING_CLEAN(apiClass = {workorder.class, serviceorder.class, warrantycard.class})
+    @CACHEING_CLEAN(apiClass = {
+            workorder.class,
+            serviceorder.class,
+            warrantycard.class})
     public String cancelServiceOrder() throws YosException {
         long sa_serviceorderid = content.getLong("sa_serviceorderid");
         String voidreason = content.getStringValue("voidreason");
@@ -884,7 +908,10 @@ public class serviceorder extends Controller {
     }
 
     @API(title = "撤回分配服务申请单", apiversion = R.ID2025121818251203.v1.class)
-    @CACHEING_CLEAN(apiClass = {workorder.class, serviceorder.class, warrantycard.class})
+    @CACHEING_CLEAN(apiClass = {
+            workorder.class,
+            serviceorder.class,
+            warrantycard.class})
     public String chehuiServiceOrder() throws YosException {
         long sa_serviceorderid = content.getLong("sa_serviceorderid");
         SQLList sqllist = new SQLList();