From 7aba2103c4b3ea72e8e0fd79dc88be0e251c1c33 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期日, 12 四月 2026 16:03:02 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/AutomaticallyIssueWCSTasksHandler.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/AutomaticallyIssueWCSTasksHandler.java b/src/main/java/com/zy/asrs/task/handler/AutomaticallyIssueWCSTasksHandler.java
index b47a30e..9016d93 100644
--- a/src/main/java/com/zy/asrs/task/handler/AutomaticallyIssueWCSTasksHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AutomaticallyIssueWCSTasksHandler.java
@@ -48,6 +48,12 @@
for (WrkMast m : wrkMast) {
if (m == null) { continue; }
if (Objects.equals(m.getWrkSts(), 11L)) {
+ if ("Y".equalsIgnoreCase(m.getPauseMk())) {
+ continue;
+ }
+ if (requiresOutboundErpConfirm(m) && !"Y".equalsIgnoreCase(m.getPdcType())) {
+ continue;
+ }
if (m.getUpdMk() != null && "WCS_SENT".equalsIgnoreCase(m.getUpdMk())) {
continue;
}
@@ -85,8 +91,11 @@
if (m.getIoPri() != null) {
t.put("taskPri", m.getIoPri().intValue());
}
- t.put("batchSeq", m.getPltType());
- if (m.getUserNo() != null) {
+ // 7.11锛歴eq=0 琛ㄧず鏃犲簭锛學CS 涓嬪彂涓嶄紶 batch 鍜� batchSeq銆�
+ if (m.getPltType() != null && m.getPltType() > 0) {
+ t.put("batchSeq", m.getPltType());
+ }
+ if (m.getPltType() != null && m.getPltType() > 0 && m.getUserNo() != null) {
t.put("batch", m.getUserNo());
}
tasks.add(t);
@@ -136,4 +145,9 @@
}
return SUCCESS;
}
+
+ 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);
+ }
}
--
Gitblit v1.9.1