From 5a2ec88cf71194456a371efda15f3cab5f6225ae Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 20 六月 2024 20:48:41 +0800
Subject: [PATCH] #

---
 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java |   86 ++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 84 insertions(+), 2 deletions(-)

diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java
index f6c96a9..5db9b04 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java
@@ -899,7 +899,15 @@
                     }))
             ));
 
-            // 绌挎杞︽彁鍗囨満寰呮満浣嶈嚦鎻愬崌鏈哄簱浣�
+            // 閿佸畾鎻愬崌鏈�
+            motionList.addAll(kernelService.liftLock(
+                    null
+                    , MotionDto.build((dto -> {
+                        dto.setLiftNo(transferLiftDevice.getId().intValue());
+                    }))
+            ));
+
+            // 绌挎杞︽彁鍗囨満寰呮満浣嶈嚦鎻愬崌鏈�
             motionList.addAll(kernelService.shuttleMove(
                     MotionDto.build((dto -> {
                         dto.setShuttleNo(shuttleDevice.getId().intValue());
@@ -913,6 +921,14 @@
                     MotionCtgType.SHUTTLE_MOVE_TO_LIFT
             ));
 
+            // 瑙ｉ攣鎻愬崌鏈�
+            motionList.addAll(kernelService.liftUnlock(
+                    null
+                    , MotionDto.build((dto -> {
+                        dto.setLiftNo(transferLiftDevice.getId().intValue());
+                    }))
+            ));
+
             // 鎻愬崌鏈烘惉杞� 鑷� 鍏呯數灞�
             motionList.addAll(kernelService.liftMoveShuttle(
                     MotionDto.build((dto -> {
@@ -922,6 +938,23 @@
                     MotionDto.build((dto -> {
                         dto.setLiftNo(transferLiftDevice.getId().intValue());
                         dto.setLev(Utils.getLev(chargeLocNo));
+                    }))
+            ));
+
+            // 閿佸畾鎻愬崌鏈�
+            motionList.addAll(kernelService.liftLock(
+                    null
+                    , MotionDto.build((dto -> {
+                        dto.setLiftNo(transferLiftDevice.getId().intValue());
+                    }))
+            ));
+
+            // 鏇存柊灏忚溅鍧愭爣
+            motionList.addAll(kernelService.shuttleUpdateLocation(
+                    null
+                    , MotionDto.build((dto -> {
+                        dto.setShuttleNo(shuttleDevice.getId().intValue());
+                        dto.setLocNo(liftLocNoFrom);
                     }))
             ));
 
@@ -937,6 +970,14 @@
                         dto.setLocNo(standbyLocNoFrom);
                     })),
                     MotionCtgType.SHUTTLE_MOVE_FROM_LIFT
+            ));
+
+            // 瑙ｉ攣鎻愬崌鏈�
+            motionList.addAll(kernelService.liftUnlock(
+                    null
+                    , MotionDto.build((dto -> {
+                        dto.setLiftNo(transferLiftDevice.getId().intValue());
+                    }))
             ));
 
             // 绌挎杞︽彁鍗囨満寰呮満浣嶈嚦鍏呯數浣�
@@ -1113,7 +1154,15 @@
                     }))
             ));
 
-            // 绌挎杞﹀緟鏈轰綅鑷虫彁鍗囨満搴撲綅
+            // 閿佸畾鎻愬崌鏈�
+            motionList.addAll(kernelService.liftLock(
+                    null
+                    , MotionDto.build((dto -> {
+                        dto.setLiftNo(liftDevice.getId().intValue());
+                    }))
+            ));
+
+            // 绌挎杞﹀緟鏈轰綅鑷虫彁鍗囨満
             motionList.addAll(kernelService.shuttleMove(
                     MotionDto.build((dto -> {
                         dto.setShuttleNo(shuttleDevice.getId().intValue());
@@ -1127,6 +1176,14 @@
                     MotionCtgType.SHUTTLE_MOVE_TO_LIFT
             ));
 
+            // 瑙ｉ攣鎻愬崌鏈�
+            motionList.addAll(kernelService.liftUnlock(
+                    null
+                    , MotionDto.build((dto -> {
+                        dto.setLiftNo(liftDevice.getId().intValue());
+                    }))
+            ));
+
             // 鎻愬崌鏈烘惉杞� 鑷� 鐩爣浣嶇疆灞�
             motionList.addAll(kernelService.liftMoveShuttle(
                     MotionDto.build((dto -> {
@@ -1136,6 +1193,23 @@
                     MotionDto.build((dto -> {
                         dto.setLiftNo(liftDevice.getId().intValue());
                         dto.setLev(Utils.getLev(locNo));
+                    }))
+            ));
+
+            // 閿佸畾鎻愬崌鏈�
+            motionList.addAll(kernelService.liftLock(
+                    null
+                    , MotionDto.build((dto -> {
+                        dto.setLiftNo(liftDevice.getId().intValue());
+                    }))
+            ));
+
+            // 鏇存柊灏忚溅鍧愭爣
+            motionList.addAll(kernelService.shuttleUpdateLocation(
+                    null
+                    , MotionDto.build((dto -> {
+                        dto.setShuttleNo(shuttleDevice.getId().intValue());
+                        dto.setLocNo(liftLocNoFrom);
                     }))
             ));
 
@@ -1153,6 +1227,14 @@
                     MotionCtgType.SHUTTLE_MOVE_FROM_LIFT
             ));
 
+            // 瑙ｉ攣鎻愬崌鏈�
+            motionList.addAll(kernelService.liftUnlock(
+                    null
+                    , MotionDto.build((dto -> {
+                        dto.setLiftNo(liftDevice.getId().intValue());
+                    }))
+            ));
+
             // 绌挎杞︽彁鍗囨満寰呮満浣嶈嚦鐩爣浣嶇疆
             motionList.addAll(kernelService.shuttleMove(
                     MotionDto.build((dto -> {

--
Gitblit v1.9.1