From d9505e143cdf452c3a33752b380ee1b3a410601d Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期四, 16 十月 2025 14:48:52 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
index 0422e92..a6a0ff2 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
@@ -62,7 +62,7 @@
             } else if (wrkMast.getIoType() == WrkIoType.LOC_MOVE.id) {
                 wrkLev = Utils.getLev(wrkMast.getLocNo());
             } else if (wrkMast.getIoType() == WrkIoType.SHUTTLE_CHARGE.id) {
-                wrkLev = Utils.getLev(wrkMast.getLocNo());
+                continue;
             } else {
                 throw new CoolException("鏈煡浠诲姟绫诲瀷");
             }
@@ -123,8 +123,9 @@
 
                 , WrkStsType.NEW_CHARGE.sts
                 , WrkStsType.CHARGE_SHUTTLE_RUN.sts
-                , WrkStsType.CHARGE_SHUTTLE_WORKING.sts
-                , WrkStsType.CHARGE_SHUTTLE_COMPLETE.sts
+                , WrkStsType.CHARGE_SHUTTLE_RUN_COMPLETE.sts
+                , WrkStsType.CHARGE_SHUTTLE_CHARGING.sts
+                , WrkStsType.CHARGE_SHUTTLE_CHARGING_COMPLETE.sts
         ).eq("shuttle_no", shuttleNo));
         if (Cools.isEmpty(wrkMasts)) {
             return false;

--
Gitblit v1.9.1