From 3d1ed275f9d9915a69b790e05610aba6ee6287e6 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 09 五月 2025 14:23:34 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/impl/NyShuttleThread.java  |   13 +++++++++++++
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |    8 ++++++++
 src/main/java/com/zy/core/enums/RedisKeyType.java           |    1 +
 3 files changed, 22 insertions(+), 0 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 322ab3a..ca5f620 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1922,6 +1922,12 @@
                 continue;
             }
 
+            //瀛樺湪璋冨害閿�
+            Object object = redisUtil.get(RedisKeyType.OUT_TASK_PREVIEW_DISPATCH_FORKLIFT.key + forkLiftProtocol.getLiftNo());
+            if (object != null) {
+                continue;
+            }
+
             //鍒ゆ柇鎻愬崌鏈烘槸鍚︽湁鍏朵粬浠诲姟
             WrkMast liftWrkMast = wrkMastService.selectLiftWrkMast(wrkMast.getLiftNo());
             if (liftWrkMast != null) {
@@ -1953,6 +1959,8 @@
             assignCommand.setTaskMode(ForkLiftTaskModeType.MOVE.id.shortValue());
 
             forkLiftAction.assignWork(forkLiftProtocol.getLiftNo(), assignCommand);
+
+            redisUtil.set(RedisKeyType.OUT_TASK_PREVIEW_DISPATCH_FORKLIFT.key + forkLiftProtocol.getLiftNo(), "lock", 30);//30绉掍笉鍐嶈皟搴�
         }
     }
 
diff --git a/src/main/java/com/zy/core/enums/RedisKeyType.java b/src/main/java/com/zy/core/enums/RedisKeyType.java
index a0c229c..ecbf7cb 100644
--- a/src/main/java/com/zy/core/enums/RedisKeyType.java
+++ b/src/main/java/com/zy/core/enums/RedisKeyType.java
@@ -12,6 +12,7 @@
     QUEUE_FORK_LIFT("queue_fork_lift_"),
     QUEUE_TASK("queue_task_"),
     FORK_LIFT_PUT_COMPLETE("fork_lift_put_complete_"),
+    OUT_TASK_PREVIEW_DISPATCH_FORKLIFT("out_task_preview_dispatch_forklift_"),
     ;
 
     public String key;
diff --git a/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java b/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
index 32037a8..126281a 100644
--- a/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
+++ b/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
@@ -721,6 +721,19 @@
             }
         }
 
+        //***************鍒ゆ柇鏄惁婊″厖鏍″噯***************
+        Config shuttleMaxPowerVerifyConfig = configService.selectOne(new EntityWrapper<Config>()
+                .eq("code", "shuttleMaxPowerVerify")
+                .eq("status", 1));
+        if (shuttleMaxPowerVerifyConfig != null) {
+            if (shuttleMaxPowerVerifyConfig.getValue().equals("true")) {
+                if (this.shuttleProtocol.getBatteryVoltage() < 5630) {
+                    return false;//鐢靛帇涓嶅缁х画鍏呯數
+                }
+            }
+        }
+        //***************鍒ゆ柇鏄惁婊″厖鏍″噯***************
+
         if (this.shuttleProtocol.getHasCharge() == null) {
             return false;
         }

--
Gitblit v1.9.1