From ffbcb17a9ce705b443c3a450e3e3d56f13ee712f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 23 九月 2025 13:13:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/shuttle_rcs_dev' into shuttle_rcs_dev
---
src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 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..bf2033e 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
@@ -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