From 200a5b4d08215c44fd3fb2d010191e7dedb5e4c5 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 17 二月 2025 14:51:28 +0800
Subject: [PATCH] #移库任务

---
 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java |   58 +++-------------------------------------------------------
 1 files changed, 3 insertions(+), 55 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 4901619..8299eaf 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
@@ -1706,11 +1706,7 @@
             return motionList;
         }
 
-        //鍒嗘瀽鍑哄簱璺緞寰呮満搴撲綅
-        String lastPathStartLoc = shuttleDispatcher.analyzeOutPathWaitLoc(originLoc, locNo, shuttleDevice);
-        if (lastPathStartLoc == null) {
-            return motionList;//鏈垎鏋愭垚鍔�
-        }
+
 
         /**
          * 鍑哄簱
@@ -1743,43 +1739,11 @@
                     MotionCtgType.SHUTTLE_PALLET_LIFT
             ));
 
-            if (!originLoc.equals(lastPathStartLoc)) {
-                // 绌挎杞﹁浇璐у嚭搴撹嚦鏈�鍚庝竴娈佃矾寰勭瓑寰�
-                motionList.addAll(kernelService.shuttleMove(
-                        MotionDto.build((dto -> {
-                            dto.setShuttleNo(shuttleDevice.getId().intValue());
-                            dto.setLocNo(originLoc);
-                        })),
-                        MotionDto.build((dto -> {
-                            dto.setShuttleNo(shuttleDevice.getId().intValue());
-                            dto.setShuttleDevice(shuttleDevice);
-                            dto.setLocNo(lastPathStartLoc);
-                        })),
-                        MotionCtgType.SHUTTLE_TRANSPORT
-                ));
-            }
-
-//            // 绌挎杞﹁浇璐ц嚦鎻愬崌鏈哄緟鏈轰綅
-//            motionList.addAll(kernelService.shuttleMove(
-//                    MotionDto.build((dto -> {
-//                        dto.setShuttleNo(shuttleDevice.getId().intValue());
-//                        dto.setLocNo(lastPathStartLoc);
-//                    })),
-//                    MotionDto.build((dto -> {
-//                        dto.setShuttleNo(shuttleDevice.getId().intValue());
-//                        dto.setShuttleDevice(shuttleDevice);
-//                        dto.setLiftNo(transferLiftDevice.getId().intValue());
-//                        dto.setLocNo(standbyLocNoTo);
-//                        dto.setStaNo(getStaByLev(Utils.getLev(task.getOriginLoc())));//杈撻�佺珯
-//                    })),
-//                    MotionCtgType.SHUTTLE_TRANSPORT_TO_CONVEYOR
-//            ));
-
             // 绌挎杞﹁蛋琛岃嚦鐩爣搴撲綅
             motionList.addAll(kernelService.shuttleMove(
                     MotionDto.build((dto -> {
                         dto.setShuttleNo(shuttleDevice.getId().intValue());
-                        dto.setLocNo(lastPathStartLoc);
+                        dto.setLocNo(originLoc);
                     })),
                     MotionDto.build((dto -> {
                         dto.setShuttleNo(shuttleDevice.getId().intValue());
@@ -1955,27 +1919,11 @@
                     MotionCtgType.SHUTTLE_PALLET_LIFT
             ));
 
-            if (!originLoc.equals(lastPathStartLoc)) {
-                // 绌挎杞﹁浇璐у嚭搴撹嚦鏈�鍚庝竴娈佃矾寰勭瓑寰�
-                motionList.addAll(kernelService.shuttleMove(
-                        MotionDto.build((dto -> {
-                            dto.setShuttleNo(shuttleDevice.getId().intValue());
-                            dto.setLocNo(originLoc);
-                        })),
-                        MotionDto.build((dto -> {
-                            dto.setShuttleNo(shuttleDevice.getId().intValue());
-                            dto.setShuttleDevice(shuttleDevice);
-                            dto.setLocNo(lastPathStartLoc);
-                        })),
-                        MotionCtgType.SHUTTLE_TRANSPORT
-                ));
-            }
-
             // 绌挎杞﹁蛋琛岃嚦鐩爣搴撲綅
             motionList.addAll(kernelService.shuttleMove(
                     MotionDto.build((dto -> {
                         dto.setShuttleNo(shuttleDevice.getId().intValue());
-                        dto.setLocNo(lastPathStartLoc);
+                        dto.setLocNo(originLoc);
                     })),
                     MotionDto.build((dto -> {
                         dto.setShuttleNo(shuttleDevice.getId().intValue());

--
Gitblit v1.9.1