From 9c0dbc95b469f9f28184afa83fedaaba7a0b8d49 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 12 三月 2026 13:51:43 +0800
Subject: [PATCH] erp出库作业完善 1.出库任务下发给wcs之前会先卡住，等erp发立即出库时再给wcs下发（补丁，后需要删掉） 2.给wcs自动下发出库任务 3.新增出库任务完成后上报erp接口（三次上报失败后直接转历史档这个地方有点问题）
---
src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
index 6ec1185..49454fa 100644
--- a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
@@ -96,8 +96,13 @@
String response;
R r = R.ok();
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", params.getTaskNo()));
- if (!Objects.isNull(wrkMast) && "out".equalsIgnoreCase(params.getType()) && "Y".equalsIgnoreCase(wrkMast.getPauseMk())) {
- return R.error("task paused");
+ if (!Objects.isNull(wrkMast) && "out".equalsIgnoreCase(params.getType())) {
+ if ("Y".equalsIgnoreCase(wrkMast.getPauseMk())) {
+ return R.error("task paused");
+ }
+ if (requiresOutboundErpConfirm(wrkMast) && !"Y".equalsIgnoreCase(wrkMast.getPdcType())) {
+ return R.error("task not confirmed by erp");
+ }
}
try {
log.info("涓嬪彂鎼繍浠诲姟缁檞cs="+JSON.toJSONString(params));
@@ -179,8 +184,8 @@
} else if (params.getMsgType().equals("task_cancel")) {
if (mast.getIoType() != null && mast.getIoType() > 100 && mast.getWrkSts() < 14) {
mast.setPauseMk("Y");
- mast.setUpdMk("WCS_CANCELLED");
- mast.setManuType("WCS_CANCELLED");
+// mast.setUpdMk("WCS_CANCELLED");
+// mast.setManuType("WCS_CANCELLED");
mast.setModiTime(new Date());
if (!wrkMastService.updateById(mast)) {
throw new CoolException("task cancel update fail");
@@ -206,6 +211,11 @@
}
return R.ok();
}
+
+ private boolean requiresOutboundErpConfirm(WrkMast wrkMast) {
+ Integer ioType = wrkMast == null ? null : wrkMast.getIoType();
+ return ioType != null && (ioType == 101 || ioType == 103 || ioType == 104 || ioType == 107 || ioType == 110);
+ }
@Override
public R pauseOutTasks(StopOutTaskParams params) {
if (params == null || params.getTasks() == null || params.getTasks().isEmpty()) {
--
Gitblit v1.9.1