diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/domain/CallBackErpItems.java b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/CallBackErpItems.java index af292ca..26785de 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/domain/CallBackErpItems.java +++ b/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 | sourceLineId | WMS→ERP | srcids | - * | ERP→WMS | oldProjectNo | WMS→ERP | cxmh | - * | ERP→WMS | projectNo | WMS→ERP | cnewxmh | - * | ERP→WMS | isBatchManage | WMS→ERP | binvbatch | - * | ERP→WMS | lotNo | WMS→ERP | cbatch | - */ + /** + * | 方向 | 字段名 | 对应方向 | 字段名 | + * | ------- | ------------- | -------- | --------- | + * | ERP→WMS | lineNo | WMS→ERP | srcrowno | + * | ERP→WMS | sourceLineId | WMS→ERP | srcids | + * | ERP→WMS | oldProjectNo | WMS→ERP | cxmh | + * | ERP→WMS | projectNo | WMS→ERP | cnewxmh | + * | ERP→WMS | isBatchManage | WMS→ERP | binvbatch | + * | ERP→WMS | lotNo | WMS→ERP | cbatch | + */ - @JsonProperty("cinvcode") - private String cinvcode; - @JsonProperty("cinvname") - private String cinvname; - @JsonProperty("cinvstd") - private String cinvstd; - @JsonProperty("cinvm_unit") - private String cinvm_unit; - @JsonProperty("cposcode") - private String cposcode; - @JsonProperty("cposname") - private String cposname; - @JsonProperty("ctrayname") - private String ctrayname; - @JsonProperty("cbatch") - private String cbatch; - @JsonProperty("iquantity") - private Integer iquantity; - @JsonProperty("cxmh") - private String cxmh; - @JsonProperty("cnewxmh") - private String cnewxmh; - @JsonProperty("srccode") - private String srccode; - @JsonProperty("srcids") - private Integer srcids; - @JsonProperty("srcrowno") - private String srcrowno; - @JsonProperty("binvbatch") - private Integer binvbatch; - @JsonProperty("jobid") - private String jobid; - } + @JsonProperty("cinvcode") + private String cinvcode; + @JsonProperty("cinvname") + private String cinvname; + @JsonProperty("cinvstd") + private String cinvstd; + @JsonProperty("cinvm_unit") + private String cinvm_unit; + @JsonProperty("cposcode") + private String cposcode; + @JsonProperty("cposname") + private String cposname; + @JsonProperty("ctrayname") + private String ctrayname; + @JsonProperty("cbatch") + private String cbatch; + @JsonProperty("iquantity") + private Integer iquantity; + @JsonProperty("cxmh") + private String cxmh; + @JsonProperty("cnewxmh") + private String cnewxmh; + @JsonProperty("srccode") + private String srccode; + @JsonProperty("srcids") + private Integer srcids; + @JsonProperty("srcrowno") + private String srcrowno; + @JsonProperty("binvbatch") + private Integer binvbatch; + @JsonProperty("jobid") + private String jobid; + @JsonProperty("stg_location") + private String stg_location; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java index 7e69963..9364bf6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java +++ b/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); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/IInStockinService.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/IInStockinService.java index 6ceece1..c579194 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/IInStockinService.java +++ b/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 selectStockinByDetail(String stockinDetailId); + + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/service/IOutStockoutService.java b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/service/IOutStockoutService.java index 94b2787..cb1c1eb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/service/IOutStockoutService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/service/IOutStockoutService.java @@ -73,4 +73,5 @@ public interface IOutStockoutService List selectOutStockoutListApi(OutStockout outStockoutParam); AjaxResult manualAllot(String[] stockList,String stockoutDetailId); + }