From 93cf1a27f5d4ff504d691d68c40a622a6424e782 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期三, 14 五月 2025 09:40:20 +0800
Subject: [PATCH] 123

---
 src/main/java/com/zy/asrs/task/WrkMastScheduler.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/WrkMastScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastScheduler.java
index 7c857c0..aec69ad 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastScheduler.java
@@ -216,7 +216,9 @@
                     main.setShuttleNo(wrkMast.getShuttleNo());
                     main.setWrkSts(WrkStsType.OUTBOUND_SHUTTLE_RUN_COMPLETE.sts);
                     //閭f椂鍊欐墭鐩樺湪鎻愬崌鏈洪噷锛屽垯闇�瑕侀攣浣�
-                    main.setShuttleNo(1);
+                    if (!(main.getStaNo() == 1013 || main.getStaNo() == 1024)) {
+                        main.setLiftNo(1);
+                    }
                 }
                 main.setModiTime(new Date());
                 if (!wrkMastService.updateById(main)) {
@@ -284,7 +286,7 @@
                 locMastService.updateById(locMast);
             } else if (wrkMast.getIoType() == WrkIoType.OUT.id) {
                 LocMast locMast = locMastService.queryByLoc(wrkMast.getSourceLocNo());
-                locMast.setLocSts(String.valueOf(LocStsType.O));
+                locMast.setLocSts(String.valueOf(LocStsType.F));
                 locMast.setModiTime(new Date());
                 locMastService.updateById(locMast);
             } else if (wrkMast.getIoType() == WrkIoType.LOC_MOVE.id) {

--
Gitblit v1.9.1