From aa710969e00e9d7e56a276066a239f74d5c49310 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 31 三月 2026 21:47:07 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/service/WrkCommandRollbackService.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/core/service/WrkCommandRollbackService.java b/src/main/java/com/zy/core/service/WrkCommandRollbackService.java
index bd6ac11..cd36992 100644
--- a/src/main/java/com/zy/core/service/WrkCommandRollbackService.java
+++ b/src/main/java/com/zy/core/service/WrkCommandRollbackService.java
@@ -168,18 +168,22 @@
private boolean isSingleCrnRunStatus(Long wrkSts) {
return Long.valueOf(WrkStsType.INBOUND_RUN.sts).equals(wrkSts)
|| Long.valueOf(WrkStsType.OUTBOUND_RUN.sts).equals(wrkSts)
- || Long.valueOf(WrkStsType.LOC_MOVE_RUN.sts).equals(wrkSts);
+ || Long.valueOf(WrkStsType.LOC_MOVE_RUN.sts).equals(wrkSts)
+ || Long.valueOf(WrkStsType.CRN_MOVE_RUN.sts).equals(wrkSts);
}
private Long getRollbackStatus(Long wrkSts) {
if (Long.valueOf(WrkStsType.INBOUND_RUN.sts).equals(wrkSts)) {
- return WrkStsType.INBOUND_DEVICE_RUN.sts;
+ return WrkStsType.INBOUND_STATION_RUN_COMPLETE.sts;
}
if (Long.valueOf(WrkStsType.OUTBOUND_RUN.sts).equals(wrkSts)) {
return WrkStsType.NEW_OUTBOUND.sts;
}
if (Long.valueOf(WrkStsType.LOC_MOVE_RUN.sts).equals(wrkSts)) {
return WrkStsType.NEW_LOC_MOVE.sts;
+ }
+ if (Long.valueOf(WrkStsType.CRN_MOVE_RUN.sts).equals(wrkSts)) {
+ return WrkStsType.NEW_CRN_MOVE.sts;
}
return null;
}
@@ -194,12 +198,15 @@
if (Long.valueOf(WrkStsType.LOC_MOVE_RUN.sts).equals(wrkSts)) {
return WrkStsType.LOC_MOVE_MANUAL.sts;
}
+ if (Long.valueOf(WrkStsType.CRN_MOVE_RUN.sts).equals(wrkSts)) {
+ return WrkStsType.CRN_MOVE_MANUAL.sts;
+ }
return null;
}
private Long getRollbackStatusFromManual(Long wrkSts) {
if (Long.valueOf(WrkStsType.INBOUND_MANUAL.sts).equals(wrkSts)) {
- return WrkStsType.INBOUND_DEVICE_RUN.sts;
+ return WrkStsType.INBOUND_STATION_RUN_COMPLETE.sts;
}
if (Long.valueOf(WrkStsType.OUTBOUND_MANUAL.sts).equals(wrkSts)) {
return WrkStsType.NEW_OUTBOUND.sts;
@@ -207,6 +214,9 @@
if (Long.valueOf(WrkStsType.LOC_MOVE_MANUAL.sts).equals(wrkSts)) {
return WrkStsType.NEW_LOC_MOVE.sts;
}
+ if (Long.valueOf(WrkStsType.CRN_MOVE_MANUAL.sts).equals(wrkSts)) {
+ return WrkStsType.NEW_CRN_MOVE.sts;
+ }
return null;
}
}
--
Gitblit v1.9.1