From 70adc399461a3cedb56d1f93318db3aba2bec3c4 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 14 七月 2025 16:28:06 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/action/ForkLiftAction.java |   34 ++++++++++++++++++++++++++++++++++
 1 files changed, 34 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/core/action/ForkLiftAction.java b/src/main/java/com/zy/core/action/ForkLiftAction.java
index b6e7c0f..9d7a7b3 100644
--- a/src/main/java/com/zy/core/action/ForkLiftAction.java
+++ b/src/main/java/com/zy/core/action/ForkLiftAction.java
@@ -148,8 +148,42 @@
             response = forkLiftThread.pickAndPut(command);
         } else if (command.getMode().intValue() == ForkLiftTaskModeType.SHUTTLE_SWITCH.id) {
             response = forkLiftThread.shuttleSwitch(command);
+        } else if (command.getMode().intValue() == ForkLiftTaskModeType.MOVE.id) {
+            response = forkLiftThread.move(command);
         }
         return response;
     }
 
+    //鐢宠鎻愬崌鏈鸿祫婧�
+    public synchronized boolean applyForkLift(Integer liftNo, Integer waitBindTaskNo) {
+        ForkLiftThread forkLiftThread = (ForkLiftThread) SlaveConnection.get(SlaveType.ForkLift, liftNo);
+        if (forkLiftThread == null) {
+            return false;
+        }
+        ForkLiftProtocol forkLiftProtocol = forkLiftThread.getStatus();
+        if (forkLiftProtocol == null) {
+            return false;
+        }
+        if (!forkLiftThread.isIdle()) {
+            return false;
+        }
+
+        List<WrkMast> wrkMasts = wrkMastService.selectLiftWrkMast(liftNo);
+        if (!wrkMasts.isEmpty()) {
+            return false;
+        }
+
+        if (waitBindTaskNo != null) {
+            WrkMast wrkMast = wrkMastService.selectByWorkNo(waitBindTaskNo);
+            if (wrkMast == null) {
+                return false;
+            }
+
+            wrkMast.setLiftNo(liftNo);
+            wrkMast.setModiTime(new Date());
+            wrkMastService.updateById(wrkMast);
+        }
+        return true;
+    }
+
 }

--
Gitblit v1.9.1