新增调拨申请

src/custom/objectregister/sys_enterprise_sku_dbapply.java

@@ -0,0 +1,44 @@
+package objectregister;
+
+import common.annotation.Table;
+import common.annotation.TableCol;
+import common.data.db.initialization.base.YosObject;
+
+@Table(comment = "企业序列号调拨申请", uniquecolumn = "sys_enterprise_sku_dbapplyid", issystem = false)
+public class sys_enterprise_sku_dbapply {
+    @TableCol(title = "申请调入企业ID", column_type = YosObject.ColumnType.bigint)
+    public Long sys_enterpriseid_in = 0L;
+
+    @TableCol(title = "申请调入企业仓库ID", column_type = YosObject.ColumnType.bigint)
+    public Long sys_enterprise_stockid_in = 0L;
+
+    @TableCol(title = "申请调出企业ID", column_type = YosObject.ColumnType.bigint)
+    public Long sys_enterpriseid_out = 0L;
+
+    @TableCol(title = "申请调出企业仓库ID", column_type = YosObject.ColumnType.bigint)
+    public Long sys_enterprise_stockid_out = 0L;
+
+    @TableCol(title = "申请调拨序列号", column_type = YosObject.ColumnType.varchar, numeric_precision = 500, is_nullable = false)
+    public String sku;
+
+    @TableCol(title = "备注", column_type = YosObject.ColumnType.varchar, numeric_precision = 500)
+    public String remarks;
+
+    @TableCol(title = "申请状态", column_type = YosObject.ColumnType.datetime)
+    public String status;
+
+    @TableCol(title = "申请时间", column_type = YosObject.ColumnType.datetime)
+    public String createdate;
+
+    @TableCol(title = "申请人", column_type = YosObject.ColumnType.varchar)
+    public String createby;
+
+    @TableCol(title = "审核时间", column_type = YosObject.ColumnType.datetime)
+    public String checkdate;
+
+    @TableCol(title = "审核人", column_type = YosObject.ColumnType.varchar)
+    public String checkby;
+
+    @TableCol(title = "站点ID", column_type = YosObject.ColumnType.varchar)
+    public String siteid;
+}

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

@@ -0,0 +1,14 @@
+package restcontroller.crm.agent.stock;
+
+import com.alibaba.fastjson2.JSONObject;
+import common.Controller;
+import common.YosException;
+import common.annotation.API;
+
+@API(title = "美大CRM_经销商_序列号调拨申请")
+public class skudbapply extends Controller {
+    public skudbapply(JSONObject content) throws YosException {
+        super(content);
+    }
+
+}

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

@@ -280,8 +280,7 @@ public class stockbill extends Controller {
 
     @API(title = "美大CRM_经销商_出入库单商序列号查询", type = API.Type.PageQuery, apiversion = R.ID2026031812265301.v1.class, params = {
             @Param(paramname = "sys_enterprise_stockbillid", fieldtype = FieldType.BigInt, remarks = "出入库单ID", isrequired = true),
-            @Param(paramname = "sys_enterprise_stockbill_itemsid", fieldtype = FieldType.BigInt, remarks = "出入库单商品明细ID", isrequired = true)
-    })
+            @Param(paramname = "sys_enterprise_stockbill_itemsid", fieldtype = FieldType.BigInt, remarks = "出入库单商品明细ID", isrequired = true)})
     public String sys_enterprise_stockbill_skus_querylist() throws YosException {
         long sys_enterprise_stockbillid = content.getLongValue("sys_enterprise_stockbillid");
         long sys_enterprise_stockbill_itemsid = content.getLongValue("sys_enterprise_stockbill_itemsid");
@@ -294,7 +293,7 @@ public class stockbill extends Controller {
         return getSucReturnObject().setData(rows).toString();
     }
 
-    @API(title = "美大CRM_经销商_出入库单商序列号新增", apiversion = R.ID2026031812294301.v1.class, params = {
+    @API(title = "美大CRM_经销商_出入库单序列号新增", apiversion = R.ID2026031812294301.v1.class, params = {
             @Param(paramname = "sku", fieldtype = FieldType.Varchar, remarks = "序列号"),
             @Param(paramname = "sys_enterprise_stockbillid", fieldtype = FieldType.BigInt, remarks = "企业出入库单ID"),
             @Param(paramname = "sys_enterprise_stockbill_itemsid", fieldtype = FieldType.BigInt, remarks = "企业出入库单货品明细")})
@@ -307,6 +306,17 @@ public class stockbill extends Controller {
             return getErrReturnObject().setErrMsg("当前单据不是新建状态，不能添加序列号").toString();
         }
 
+        Rows skuRows = SQLFactory.createQuerySQL(this, "sa_itemsku").setSiteid(siteid).setWhere("sku", sku).query();
+        if (skuRows.isEmpty()) {
+            return getErrReturnObject().setErrCode(1).setErrMsg("序列号" + sku + "不存在").toString();
+        }
+        if (skuRows.get(0).getLong("sys_enterpriseid") == 0) {
+            return getErrReturnObject().setErrCode(3).setErrMsg("序列号" + sku + "当前归属经销商错误，不可录入，请联系美大售后部门").toString();
+        }
+        if (skuRows.get(0).getLong("sys_enterpriseid") != sys_enterpriseid) {
+            return getErrReturnObject().setErrCode(2).setErrMsg("序列号" + sku + "当前归属经销商错误，是否申请调拨？").toString();
+        }
+
         if (SQLFactory.createQuerySQL(this, "sys_enterprise_stockbill_skus").setWhere("sku", sku).setWhere("sys_enterprise_stockbillid", sys_enterprise_stockbillid).query().isEmpty()) {
             InsertSQL insertSQL = SQLFactory.createInsertSQL(this, "sys_enterprise_stockbill_skus");
             insertSQL.setValue("siteid", siteid);// 站点