From fa2fab0a146e683cb319887239db19e699d485b7 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 24 六月 2024 10:10:02 +0800
Subject: [PATCH] #

---
 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java |   14 ++++++++++++--
 1 files changed, 12 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 e1b9bf6..164e30b 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
@@ -1155,11 +1155,12 @@
         }
 
         // 绌挎杞﹀紑濮嬪厖鐢�
-        motionList.addAll(kernelService.shuttleCharge(
+        motionList.addAll(kernelService.shuttleAction(
                 null,
                 MotionDto.build((dto -> {
                     dto.setShuttleNo(shuttleDevice.getId().intValue());
-                }))
+                })),
+                MotionCtgType.SHUTTLE_CHARGE_ON
         ));
 
         return motionList;
@@ -1197,6 +1198,15 @@
         // 鍒ゆ柇绌挎杞︽槸鍚﹀湪鐩爣灞�
         if (Utils.getLev(shuttleLocNo) == Utils.getLev(locNo)) {
 
+            // 绌挎杞﹀叧闂厖鐢�
+            motionList.addAll(kernelService.shuttleAction(
+                    null,
+                    MotionDto.build((dto -> {
+                        dto.setShuttleNo(shuttleDevice.getId().intValue());
+                    })),
+                    MotionCtgType.SHUTTLE_CHARGE_OFF
+            ));
+
             // 绌挎杞﹁蛋琛岃嚦鐩爣搴撲綅
             motionList.addAll(kernelService.shuttleMove(
                     MotionDto.build((dto -> {

--
Gitblit v1.9.1