From fcb71b8fc63f74cd00d3faa76c73f4c5566ee352 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期三, 07 五月 2025 23:23:09 +0800
Subject: [PATCH] 解决提升机在本层,而没有锁提升机的问题

---
 src/main/java/com/zy/asrs/task/WrkMastScheduler.java |    4 ++--
 1 files changed, 2 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 bf8ee09..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,7 @@
                     main.setShuttleNo(wrkMast.getShuttleNo());
                     main.setWrkSts(WrkStsType.OUTBOUND_SHUTTLE_RUN_COMPLETE.sts);
                     //閭f椂鍊欐墭鐩樺湪鎻愬崌鏈洪噷锛屽垯闇�瑕侀攣浣�
-                    if (!(main.getStaNo() != 1013 && main.getStaNo() != 1024)) {
+                    if (!(main.getStaNo() == 1013 || main.getStaNo() == 1024)) {
                         main.setLiftNo(1);
                     }
                 }
@@ -286,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