错误修复

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

@@ -110,7 +110,7 @@ public class skudbapply extends Controller {
         if (dbapplyRow.isEmpty()) {
             return getErrReturnObject().setErrMsg("数据不存在").toString();
         }
-        if (!dbapplyRow.getString("status").equals("提交")) {
+        if (dbapplyRow.getString("status").equals("审核")) {
             return getErrReturnObject().setErrMsg("该状态无法删除").toString();
         }
         SQLFactory.createDeleteSQL(this, "sys_enterprise_sku_dbapply").setUniqueid(sys_enterprise_sku_dbapplyid).delete();

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

@@ -2,6 +2,7 @@ package restcontroller.crm.manage.stock;
 
 import beans.datacontrllog.DataContrlLog;
 import beans.enterprise.Enterprise;
+import beans.hr.Hr;
 import com.alibaba.fastjson2.JSONObject;
 import common.Controller;
 import common.YosException;
@@ -11,6 +12,8 @@ import common.data.*;
 import common.data.db.SQLList;
 import restcontroller.R;
 
+import java.util.stream.Collectors;
+
 @API(title = "美大CRM_总部_序列号调拨申请")
 public class skudbapply extends Controller {
     public skudbapply(JSONObject content) throws YosException {
@@ -20,16 +23,24 @@ public class skudbapply extends Controller {
     @API(title = "美大CRM_总部_序列号调拨申请列表", type = API.Type.PageQuery, apiversion = R.ID2026041315412601.v1.class)
     public String sys_enterprise_sku_dbapply_querylist() throws YosException {
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sys_enterprise_sku_dbapply", getTableColumnNameArrays("sys_enterprise_sku_dbapply")).setTableAlias("t1");
-        querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t2", "t1.sys_enterpriseid_in=t2.sys_enterpriseid", "t2.enterprisename as enterprisename_in");
-        querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t3", "t1.sys_enterpriseid_out=t3.sys_enterpriseid", "t3.enterprisename as enterprisename_out");
+        querySQL.addJoinTable(JOINTYPE.left, "sv_agents", "t2", "t1.sys_enterpriseid_in=t2.sys_enterpriseid", "t2.enterprisename as enterprisename_in", "t2.abbreviation as abbreviation_in", "t2.agentnum as agentnum_in");
+        querySQL.addJoinTable(JOINTYPE.left, "sv_agents", "t3", "t1.sys_enterpriseid_out=t3.sys_enterpriseid", "t3.enterprisename as enterprisename_out", "t3.abbreviation as abbreviation_in", "t3.agentnum as agentnum_out");
         querySQL.addJoinTable(JOINTYPE.left, "sa_itemsku", "t4", "t1.sku=t4.sku");
         querySQL.addJoinTable(JOINTYPE.left, "plm_item", "t5", "t4.itemid=t5.itemid", "itemno", "itemname", "model", "spec");
         querySQL.setSiteid(siteid);
+        if (usertype == 2) {
+            querySQL.setWhere("t1.status in('提交','审核')");
+            String enterpriseids = Hr.getEnterprise(this, hrid).stream().map(String::valueOf).collect(Collectors.joining(","));
+            querySQL.setWhere("t1.sys_enterpriseid_in in(" + enterpriseids + ") or t1.sys_enterpriseid_out in(" + enterpriseids + ")");
+        } else {
+            querySQL.setWhere("t1.createflag=1 or t1.status in('提交','审核')");
+        }
         querySQL.setPage(pageSize, pageNumber);
         Rows rows = querySQL.query();
         return getSucReturnObject().setData(rows).toString();
     }
 
+
     @API(title = "美大CRM_总部_序列号调拨申请修改", apiversion = R.ID2026041315423401.v1.class, params = {
             @Param(paramname = "sys_enterprise_sku_dbapplyid", fieldtype = FieldType.BigInt, remarks = "数据ID", isrequired = true),
             @Param(paramname = "sys_enterpriseid_in", fieldtype = FieldType.BigInt, remarks = "申请调入企业ID"),
@@ -64,7 +75,7 @@ public class skudbapply extends Controller {
         return getSucReturnObject().toString();
     }
 
-    @API(title = "美大CRM_总部_序列号调拨申请退回", apiversion = R.ID2026041409262901.v1.class, params = {
+    @API(title = "美大CRM_总部_序列号调拨申请退回（作废）", apiversion = R.ID2026041409262901.v1.class, params = {
             @Param(paramname = "sys_enterprise_sku_dbapplyid", fieldtype = FieldType.BigInt, remarks = "数据ID", isrequired = true),
             @Param(paramname = "returnreason", fieldtype = FieldType.Varchar, remarks = "退回原因")})
     public String sys_enterprise_sku_dbapply_return() throws YosException {
@@ -72,12 +83,12 @@ public class skudbapply extends Controller {
         String returnreason = content.getStringValue("returnreason");// 退回原因
         SQLList sqlist = new SQLList();
         UpdateSQL updateSQL = SQLFactory.createUpdateSQL(this, "sys_enterprise_sku_dbapply");
-        updateSQL.setValue("status", "新建");// 状态
+        updateSQL.setValue("status", "作废");// 状态
         updateSQL.setValue("returnreason", returnreason);// 状态
         updateSQL.setSiteid(siteid);
         updateSQL.setUniqueid(sys_enterprise_sku_dbapplyid);
         sqlist.add(updateSQL);
-        sqlist.add(DataContrlLog.createLog(this, "sys_enterprise_sku_dbapply", sys_enterprise_sku_dbapplyid, "反审核", "调拨单反审核成功！"));
+        sqlist.add(DataContrlLog.createLog(this, "sys_enterprise_sku_dbapply", sys_enterprise_sku_dbapplyid, "作废", "调拨单作废成功！"));
         sqlist.commit();
         return getSucReturnObject().toString();
     }
@@ -100,7 +111,7 @@ public class skudbapply extends Controller {
         if (sku.isEmpty()) {
             return getErrReturnObject().setErrMsg("申请调拨序列号为空").toString();
         }
-        Rows skuRows = SQLFactory.createQuerySQL(this, "sa_itemsku", "sys_enterpriseid", "sys_enterprise_stockid", "itemid").setSiteid(siteid).setWhere("sku", sku).query();
+        Rows skuRows = SQLFactory.createQuerySQL(this, "sa_itemsku", "sa_itemskuid", "sys_enterpriseid", "sys_enterprise_stockid", "itemid").setSiteid(siteid).setWhere("sku", sku).query();
         if (skuRows.isEmpty()) {
             return getErrReturnObject().setErrMsg("申请调拨序列号不存在").toString();
         }
@@ -111,6 +122,7 @@ public class skudbapply extends Controller {
             return getErrReturnObject().setErrMsg("申请调入企业为空").toString();
         }
         long itemid = skuRows.get(0).getLong("itemid");
+        long sa_itemskuid = skuRows.get(0).getLong("sa_itemskuid");
         long sys_enterprise_stockid_out = skuRows.get(0).getLong("sys_enterprise_stockid");//调出仓库
         Rows stockRows = SQLFactory.createQuerySQL(this, "sys_enterprise_stock").setWhere("issystem", 1).query();
         if (stockRows.isEmpty()) {
@@ -235,13 +247,23 @@ public class skudbapply extends Controller {
             sqlist.add(invbalInsert);
             sqlist.add(invbalUpdate);
         }
+        long sa_agentsidnew = Enterprise.getAgentsID(this, sys_enterpriseid_in);
         UpdateSQL skuUpdate = SQLFactory.createUpdateSQL(this, "sa_itemsku");
         skuUpdate.setValue("sys_enterpriseid", sys_enterpriseid_in);
         skuUpdate.setValue("sys_enterprise_stockid", sys_enterprise_stockid_in);
+        skuUpdate.setValue("sa_agentsid", sa_agentsidnew);
         skuUpdate.setSiteid(siteid);
         skuUpdate.setWhere("sku", sku);
         sqlist.add(skuUpdate);
 
+        InsertSQL saItemskuChange = SQLFactory.createInsertSQL(this, "sa_itemsku_change");
+        saItemskuChange.setSiteid(siteid);
+        saItemskuChange.setValue("sa_agentsid", skuRows.get(0).getLong("sa_agentsid"));
+        saItemskuChange.setValue("sa_agentsidnew", sa_agentsidnew);
+        saItemskuChange.setValue("changenotes", "CRM调拨 单号：" + row.getString("billno"));
+        saItemskuChange.setValue("sa_itemskuid", sa_itemskuid);
+        sqlist.add(saItemskuChange);
+
         UpdateSQL updateSQL = SQLFactory.createUpdateSQL(this, "sys_enterprise_sku_dbapply");
         updateSQL.setValue("status", "审核");
         updateSQL.setValue("checkby", username);