zyr/FT546MWS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2026.4.30 早 10:13

Browse Source 
入库回传接口/出库回传接口 参数传递仓库 stg_location 修改
This commit is contained in:
1009473166@qq.com
2026-04-30 10:14:07 +08:00
parent eba8434f68
commit 368d615674
4 changed files with 54 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,7 +15,6 @@ import java.util.List;
@Setter
public class CallBackErpItems implements Serializable {
/**
*
* | 方向 | 字段名 | 对应方向 | 字段名 |
* | ------- | ------------- | -------- | --------- |
* | ERP→WMS | lineNo | WMS→ERP | srcrowno |
@@ -58,5 +57,7 @@ public class CallBackErpItems implements Serializable {
private Integer binvbatch;
@JsonProperty("jobid")
private String jobid;
}
@JsonProperty("stg_location")
private String stg_location;
}

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

@@ -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);
}

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

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

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

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