From 89a94a91bd97e1e47fba93c762b4e53a5830b760 Mon Sep 17 00:00:00 2001
From: gtsxc <3272660260@qq.com>
Date: 星期一, 19 五月 2025 19:44:51 +0800
Subject: [PATCH] #

---
 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java |    8 ++++++--
 1 files changed, 6 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 a9c96b6..e263be0 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
@@ -984,6 +984,9 @@
         //绌挎杞﹀嚭鎻愬崌鏈哄簱浣嶅彿
         String liftLocNoFrom = shuttleStandbyFrom.getDeviceLoc();
 
+        //绌挎杞︽崲灞傛椂寰呮満浣嶇疆 浣跨敤琛ㄥ垪 memo鏁版嵁
+        String standbyLocNoMemo = shuttleStandbyTo.getMemo();
+
         //绌挎杞﹁繘鎻愬崌鏈哄緟鏈轰綅搴撲綅鍙�
         String standbyLocNoTo = shuttleStandbyTo.getDeviceStandbyLoc();
 
@@ -1018,7 +1021,7 @@
                     MotionDto.build((dto -> {
                         dto.setShuttleNo(shuttleDevice.getId().intValue());
                         dto.setShuttleDevice(shuttleDevice);
-                        dto.setLocNo(standbyLocNoTo);
+                        dto.setLocNo(standbyLocNoMemo);
                     })),
                     MotionCtgType.SHUTTLE_MOVE
             ));
@@ -1044,7 +1047,7 @@
             motionList.addAll(kernelService.shuttleMove(
                     MotionDto.build((dto -> {
                         dto.setShuttleNo(shuttleDevice.getId().intValue());
-                        dto.setLocNo(standbyLocNoTo);
+                        dto.setLocNo(standbyLocNoMemo);
                     })),
                     MotionDto.build((dto -> {
                         dto.setShuttleNo(shuttleDevice.getId().intValue());
@@ -1396,6 +1399,7 @@
                     null
                     , MotionDto.build((dto -> {
                         dto.setLiftNo(liftDevice.getId().intValue());
+                        dto.setReleaseLift(1);//鎵ц瀹屾垚鍚庨噴鏀炬彁鍗囨満
                     }))
             ));
 

--
Gitblit v1.9.1