From 99573d3503e32befd853dda7cc0180e01a4c8597 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期日, 13 十月 2024 12:17:44 +0800
Subject: [PATCH] #

---
 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java |   58 ++++++++++++++++++++++++++++++----------------------------
 1 files changed, 30 insertions(+), 28 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 059562b..936f22f 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
@@ -539,6 +539,21 @@
                         MotionCtgType.SHUTTLE_PALLET_DOWN
                 ));
 
+                // 绌挎杞︽彁鍗囨満寰呮満浣� - 鍒板緟鏈轰綅
+                motionList.addAll(kernelService.shuttleMove(
+                        MotionDto.build((dto -> {
+                            dto.setShuttleNo(shuttleDevice.getId().intValue());
+                            dto.setLocNo(standbyLocNoFrom);
+                        })),
+                        MotionDto.build((dto -> {
+                            dto.setShuttleNo(shuttleDevice.getId().intValue());
+                            dto.setLocNo(shuttleFromLiftStandbyLoc);
+                            dto.setSync(0);//寮傛鎵ц
+                            dto.setReleaseShuttle(1);//鎵ц瀹屾垚鍚庨噴鏀惧皬杞�
+                        })),
+                        MotionCtgType.SHUTTLE_MOVE
+                ));
+
                 // 鎻愬崌鏈鸿浇璐хЩ鍔�
                 motionList.addAll(kernelService.liftMoveGoods(
                         MotionDto.build((dto -> {
@@ -551,22 +566,8 @@
                             dto.setLev(1);//鍏夋嘲1灞傛槸杈撻�佺嚎灞�
                             dto.setStaNo(31001);//鍑哄簱绔欑偣
                             dto.setDevpNo(basConveyorStaOrigin.getConveyorDeviceId().intValue());
-                            dto.setSync(0);//寮傛鎵ц
                             dto.setReleaseLift(1);//鎵ц瀹屾垚鍚庨噴鏀炬彁鍗囨満
                         }))
-                ));
-
-                // 绌挎杞︽彁鍗囨満寰呮満浣� - 鍒板緟鏈轰綅
-                motionList.addAll(kernelService.shuttleMove(
-                        MotionDto.build((dto -> {
-                            dto.setShuttleNo(shuttleDevice.getId().intValue());
-                            dto.setLocNo(standbyLocNoFrom);
-                        })),
-                        MotionDto.build((dto -> {
-                            dto.setShuttleNo(shuttleDevice.getId().intValue());
-                            dto.setLocNo(shuttleFromLiftStandbyLoc);
-                        })),
-                        MotionCtgType.SHUTTLE_MOVE
                 ));
 
                 // 杈撻�佺嚎杩愯緭鑷冲嚭搴撳彛
@@ -747,6 +748,21 @@
                         MotionCtgType.SHUTTLE_PALLET_DOWN
                 ));
 
+                // 绌挎杞︽彁鍗囨満寰呮満浣� - 鍒板緟鏈轰綅
+                motionList.addAll(kernelService.shuttleMove(
+                        MotionDto.build((dto -> {
+                            dto.setShuttleNo(shuttleDevice.getId().intValue());
+                            dto.setLocNo(standbyLocNoFrom);
+                        })),
+                        MotionDto.build((dto -> {
+                            dto.setShuttleNo(shuttleDevice.getId().intValue());
+                            dto.setLocNo(shuttleFromLiftStandbyLoc);
+                            dto.setSync(0);//寮傛鎵ц
+                            dto.setReleaseShuttle(1);//鎵ц瀹屾垚鍚庨噴鏀剧┛姊溅
+                        })),
+                        MotionCtgType.SHUTTLE_MOVE
+                ));
+
                 // 鎻愬崌鏈鸿浇璐хЩ鍔�
                 motionList.addAll(kernelService.liftMoveGoods(
                         MotionDto.build((dto -> {
@@ -758,23 +774,9 @@
                             dto.setLiftNo(transferLiftDevice.getId().intValue());
                             dto.setLev(1);//鍏夋嘲1灞傛槸杈撻�佺嚎灞�
                             dto.setStaNo(31001);//鍑哄簱绔欑偣
-                            dto.setSync(0);//寮傛鎵ц
                             dto.setDevpNo(basConveyorStaOrigin.getConveyorDeviceId().intValue());
                             dto.setReleaseLift(1);//鎵ц瀹屾垚鍚庨噴鏀炬彁鍗囨満
                         }))
-                ));
-
-                // 绌挎杞︽彁鍗囨満寰呮満浣� - 鍒板緟鏈轰綅
-                motionList.addAll(kernelService.shuttleMove(
-                        MotionDto.build((dto -> {
-                            dto.setShuttleNo(shuttleDevice.getId().intValue());
-                            dto.setLocNo(standbyLocNoFrom);
-                        })),
-                        MotionDto.build((dto -> {
-                            dto.setShuttleNo(shuttleDevice.getId().intValue());
-                            dto.setLocNo(shuttleFromLiftStandbyLoc);
-                        })),
-                        MotionCtgType.SHUTTLE_MOVE
                 ));
 
                 // 杈撻�佺嚎杩愯緭鑷冲嚭搴撳彛

--
Gitblit v1.9.1