From 4f45f8f3ec334a73ba24fc5d16017b5c044168aa Mon Sep 17 00:00:00 2001
From: Administrator <1051256694@qq.com>
Date: 星期五, 13 三月 2026 11:24:01 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index aa515c1..f031611 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -88,11 +88,30 @@
if (!Cools.isEmpty(erpReport) && !"true".equalsIgnoreCase(erpReport)) {
return false;
}
- if (wrkMast == null || Cools.isEmpty(wrkMast.getBarcode())) {
+ if (wrkMast == null) {
return false;
}
Integer ioType = wrkMast.getIoType();
- return ioType != null && (ioType == 101 || ioType == 108 || ioType == 110);
+ if (ioType == null || (ioType != 101 && ioType != 108 && ioType != 110)) {
+ return false;
+ }
+ return !Cools.isEmpty(resolveOutboundPalletId(wrkMast));
+ }
+
+ private String resolveOutboundPalletId(WrkMast wrkMast) {
+ if (!Cools.isEmpty(wrkMast.getBarcode())) {
+ return wrkMast.getBarcode();
+ }
+ List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+ if (Cools.isEmpty(wrkDetls)) {
+ return null;
+ }
+ for (WrkDetl wrkDetl : wrkDetls) {
+ if (!Cools.isEmpty(wrkDetl.getZpallet())) {
+ return wrkDetl.getZpallet();
+ }
+ }
+ return null;
}
public ReturnT<String> doIn(WrkMast wrkMast) {
@@ -595,3 +614,4 @@
return SUCCESS;
}
}
+
--
Gitblit v1.9.1