2026.4.30 早 10:13

入库回传接口/出库回传接口 参数传递仓库 stg_location 修改

ruoyi-admin/src/main/java/com/ruoyi/api/domain/CallBackErpItems.java

@@ -14,49 +14,50 @@ import java.util.List;
 @Getter
 @Setter
 public class CallBackErpItems implements Serializable {
-        /**
+    /**
-         *
+     * | 方向    | 字段名        | 对应方向 | 字段名    |
-         * | 方向    | 字段名        | 对应方向 | 字段名    |
+     * | ------- | ------------- | -------- | --------- |
-         * | ------- | ------------- | -------- | --------- |
+     * | ERP→WMS | lineNo        | WMS→ERP  | srcrowno  |
-         * | ERP→WMS | lineNo        | WMS→ERP  | srcrowno  |
+     * | ERP→WMS | sourceLineId  | WMS→ERP  | srcids    |
-         * | ERP→WMS | sourceLineId  | WMS→ERP  | srcids    |
+     * | ERP→WMS | oldProjectNo  | WMS→ERP  | cxmh      |
-         * | ERP→WMS | oldProjectNo  | WMS→ERP  | cxmh      |
+     * | ERP→WMS | projectNo     | WMS→ERP  | cnewxmh   |
-         * | ERP→WMS | projectNo     | WMS→ERP  | cnewxmh   |
+     * | ERP→WMS | isBatchManage | WMS→ERP  | binvbatch |
-         * | ERP→WMS | isBatchManage | WMS→ERP  | binvbatch |
+     * | ERP→WMS | lotNo         | WMS→ERP  | cbatch    |
-         * | ERP→WMS | lotNo         | WMS→ERP  | cbatch    |
+     */
-         */
 
-        @JsonProperty("cinvcode")
+    @JsonProperty("cinvcode")
-        private String cinvcode;
+    private String cinvcode;
-        @JsonProperty("cinvname")
+    @JsonProperty("cinvname")
-        private String cinvname;
+    private String cinvname;
-        @JsonProperty("cinvstd")
+    @JsonProperty("cinvstd")
-        private String cinvstd;
+    private String cinvstd;
-        @JsonProperty("cinvm_unit")
+    @JsonProperty("cinvm_unit")
-        private String cinvm_unit;
+    private String cinvm_unit;
-        @JsonProperty("cposcode")
+    @JsonProperty("cposcode")
-        private String cposcode;
+    private String cposcode;
-        @JsonProperty("cposname")
+    @JsonProperty("cposname")
-        private String cposname;
+    private String cposname;
-        @JsonProperty("ctrayname")
+    @JsonProperty("ctrayname")
-        private String ctrayname;
+    private String ctrayname;
-        @JsonProperty("cbatch")
+    @JsonProperty("cbatch")
-        private String cbatch;
+    private String cbatch;
-        @JsonProperty("iquantity")
+    @JsonProperty("iquantity")
-        private Integer iquantity;
+    private Integer iquantity;
-        @JsonProperty("cxmh")
+    @JsonProperty("cxmh")
-        private String cxmh;
+    private String cxmh;
-        @JsonProperty("cnewxmh")
+    @JsonProperty("cnewxmh")
-        private String cnewxmh;
+    private String cnewxmh;
-        @JsonProperty("srccode")
+    @JsonProperty("srccode")
-        private String srccode;
+    private String srccode;
-        @JsonProperty("srcids")
+    @JsonProperty("srcids")
-        private Integer srcids;
+    private Integer srcids;
-        @JsonProperty("srcrowno")
+    @JsonProperty("srcrowno")
-        private String srcrowno;
+    private String srcrowno;
-        @JsonProperty("binvbatch")
+    @JsonProperty("binvbatch")
-        private Integer binvbatch;
+    private Integer binvbatch;
-        @JsonProperty("jobid")
+    @JsonProperty("jobid")
-        private String jobid;
+    private String jobid;
-    }
+    @JsonProperty("stg_location")
+    private String stg_location;
+}
 

ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java

@@ -353,9 +353,6 @@ public class ToErpServiceImpl implements IToErpService {
 //        return AjaxResult.error("不支持的单据类型或操作类型");
 //
 //    }
-
-
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult receiveDeliveryNotice(DeliveryNoticeVo deliveryNoticeVo) {
@@ -546,7 +543,7 @@ public class ToErpServiceImpl implements IToErpService {
                 }
 
                 // 保存所有立库明细到主单
-                saveOutDetailList(mainOut, liKuList,"1");
+                saveOutDetailList(mainOut, liKuList, "1");
 
                 // ========== 处理平库：新建一张独立主单 + 所有平库明细 ==========
                 if (CollUtil.isNotEmpty(pingKuList)) {
@@ -557,7 +554,7 @@ public class ToErpServiceImpl implements IToErpService {
                     // 插入平库主单
                     outStockoutService.insertOutStockout(pingKuOut);
                     // 平库所有明细挂到这个新主单
-                    saveOutDetailList(pingKuOut, pingKuList,"2");
+                    saveOutDetailList(pingKuOut, pingKuList, "2");
                     log.info("平库分组生成独立出库单：{}，明细条数：{}", pingCkdId, pingKuList.size());
                 }
                 return AjaxResult.success();
@@ -639,7 +636,6 @@ public class ToErpServiceImpl implements IToErpService {
     }
 
 
-
     @Override
     public void callbackInDeliveryNotice() {
 
@@ -1014,7 +1010,8 @@ public class ToErpServiceImpl implements IToErpService {
                 item.setSrcrowno(detail.getSpare6());
                 // 是否批次管理
                 item.setBinvbatch(Integer.valueOf(detail.getIsBatchManage()));
-
+                // 仓库选择 1立库 2 平库
+                item.setStg_location(detail.getProductGuid());
 
                 detailList.add(item);
             }
@@ -1124,7 +1121,8 @@ public class ToErpServiceImpl implements IToErpService {
                 item.setSrcrowno(detail.getSpare6());
                 // 是否批次管理
                 item.setBinvbatch(Integer.valueOf(detail.getIsBatchManage()));
-
+                // 仓库选择 1立库 2平库
+                item.setStg_location(detail.getProductGuid());
 
                 detailList.add(item);
             }

ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/IInStockinService.java

@@ -73,4 +73,6 @@ public interface IInStockinService
     public int deleteInStockinByStockinGuid(String stockinGuid);
 
     public List<InStockin> selectStockinByDetail(String stockinDetailId);
+
+
 }

ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/service/IOutStockoutService.java

@@ -73,4 +73,5 @@ public interface IOutStockoutService
     List<OutStockout> selectOutStockoutListApi(OutStockout outStockoutParam);
 
     AjaxResult manualAllot(String[] stockList,String stockoutDetailId);
+
 }