From 324db086781e8c95797c1e966b5f0ee0da2712dc Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 17 四月 2025 13:57:10 +0800
Subject: [PATCH] 3

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |    9 +++++----
 src/main/java/com/zy/core/enums/RedisKeyType.java           |    1 +
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 8e967d5..3956c7d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -120,6 +120,7 @@
                     ));
             for (WrkMast wrkMast : wrkMasts) {
                 boolean step1 = this.shuttleInExecuteStep1(wrkMast);//灏忚溅鎼叆搴撲腑
+                Thread.sleep(100);
                 if (!step1) {
                     continue;
                 }
@@ -134,7 +135,7 @@
      * 濡傞渶涓绘柟娉曟墽琛宑ontinue锛岃杩斿洖false
      * ps:杩斿洖鍊紅rue骞朵笉浠ｈ〃璇ユ柟娉曟墽琛屾垚鍔燂紝杩斿洖鍊间粎鍋氭爣璁扮敤浜庝富鏂规硶鏄惁鎵цcontinue
      */
-    public boolean shuttleInExecuteStep1(WrkMast wrkMast) {
+    public synchronized boolean shuttleInExecuteStep1(WrkMast wrkMast) {
         if (wrkMast.getWrkSts() == WrkStsType.INBOUND_LIFT_RUN_COMPLETE.sts) {
             //鑾峰彇鐩爣绔�
             ForkLiftStaProtocol liftSta = ForkLiftUtils.getLiftStaByStaNo(wrkMast.getStaNo());
@@ -233,6 +234,7 @@
                     ));
             for (WrkMast wrkMast : wrkMasts) {
                 boolean step1 = this.shuttleOutExecuteStep1(wrkMast);//灏忚溅鎼嚭搴撲腑
+                Thread.sleep(100);
                 if (!step1) {
                     continue;
                 }
@@ -247,7 +249,7 @@
      * 濡傞渶涓绘柟娉曟墽琛宑ontinue锛岃杩斿洖false
      * ps:杩斿洖鍊紅rue骞朵笉浠ｈ〃璇ユ柟娉曟墽琛屾垚鍔燂紝杩斿洖鍊间粎鍋氭爣璁扮敤浜庝富鏂规硶鏄惁鎵цcontinue
      */
-    public boolean shuttleOutExecuteStep1(WrkMast wrkMast) {
+    public synchronized boolean shuttleOutExecuteStep1(WrkMast wrkMast) {
         //101.鐢熸垚鍑哄簱浠诲姟 => 102.灏忚溅鎼繍涓�
         if (wrkMast.getWrkSts() == WrkStsType.NEW_OUTBOUND.sts) {
             Integer liftNo = wrkMast.getLiftNo();
@@ -271,7 +273,6 @@
                 wrkMast.setLiftNo(liftNo);
                 wrkMast.setModiTime(new Date());
                 wrkMastService.updateById(wrkMast);
-                return false;
             }
 
             ForkLiftThread forkLiftThread = (ForkLiftThread) SlaveConnection.get(SlaveType.ForkLift, liftNo);
@@ -911,12 +912,12 @@
                             wrkMast.setWrkSts(WrkStsType.COMPLETE_OUTBOUND.sts);
                             wrkMast.setLiftNo(null);//閲婃斁鎻愬崌鏈�
                             forkLiftThread.setSyncTaskNo(0);
+                            redisUtil.set(RedisKeyType.FORK_LIFT_PUT_COMPLETE.key + forkLiftProtocol.getLiftNo(), wrkMast.getWmsWrkNo(), 60 * 3);
                         } else if (wrkMast.getWrkSts() == WrkStsType.MOVE_LIFT_RUN.sts) {
                             //306.鎻愬崌鏈烘惉杩愪腑 ==> 307.鎻愬崌鏈烘惉杩愬畬鎴�
                             wrkMast.setWrkSts(WrkStsType.MOVE_LIFT_RUN_COMPLETE.sts);
                             forkLiftThread.setSyncTaskNo(0);
                         }
-
                         wrkMast.setModiTime(new Date());
                         if (wrkMastService.updateById(wrkMast)) {
                             forkLiftThread.reset();
diff --git a/src/main/java/com/zy/core/enums/RedisKeyType.java b/src/main/java/com/zy/core/enums/RedisKeyType.java
index 190f8d9..a0c229c 100644
--- a/src/main/java/com/zy/core/enums/RedisKeyType.java
+++ b/src/main/java/com/zy/core/enums/RedisKeyType.java
@@ -11,6 +11,7 @@
     QUEUE_SHUTTLE("queue_shuttle_"),
     QUEUE_FORK_LIFT("queue_fork_lift_"),
     QUEUE_TASK("queue_task_"),
+    FORK_LIFT_PUT_COMPLETE("fork_lift_put_complete_"),
     ;
 
     public String key;

--
Gitblit v1.9.1