From d7020a8f1ec6f55167b4ad14941de0e28ce3d8c1 Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期五, 16 一月 2026 14:19:59 +0800
Subject: [PATCH] agv出库逻辑

---
 src/main/java/com/zy/asrs/task/handler/AgvHandler.java |   56 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/handler/AgvHandler.java b/src/main/java/com/zy/asrs/task/handler/AgvHandler.java
index 3529881..458f54b 100644
--- a/src/main/java/com/zy/asrs/task/handler/AgvHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AgvHandler.java
@@ -322,15 +322,65 @@
             return null;
         }
         
+        // 鎺掗櫎鏈夋鍦ㄦ惉杩愪换鍔$殑绔欑偣锛堢姸鎬�8锛氬凡鍛煎彨AGV锛屾鍦ㄦ惉杩愶級
+        List<BasDevp> availableDevList = new ArrayList<>();
+        Integer taskIoType = task.getIoType();
+        
+        if (taskIoType != null) {
+            // 鏍规嵁浠诲姟绫诲瀷纭畾瑕佹鏌ョ殑io_type鍒楄〃
+            List<Integer> checkIoTypes;
+            String taskTypeName;
+            if (taskIoType < 100) {
+                // 鍏ュ簱浠诲姟锛氬彧妫�鏌ュ叆搴撶被鍨嬶紙1, 10, 53, 57锛�
+                checkIoTypes = Arrays.asList(1, 10, 53, 57);
+                taskTypeName = "鍏ュ簱";
+            } else {
+                // 鍑哄簱浠诲姟锛氬彧妫�鏌ュ嚭搴撶被鍨嬶紙101, 110, 103, 107锛�
+                checkIoTypes = Arrays.asList(101, 110, 103, 107);
+                taskTypeName = "鍑哄簱";
+            }
+            
+            // 妫�鏌ユ瘡涓珯鐐规槸鍚︽湁姝e湪鎼繍鐨勫悓绫诲瀷浠诲姟
+            for (BasDevp dev : devList) {
+                String staNo = String.valueOf(dev.getDevNo());
+                // 鏌ヨ璇ョ珯鐐规槸鍚︽湁鐘舵��8锛堟鍦ㄦ惉杩愶級鐨勫悓绫诲瀷浠诲姟
+                List<Task> transportingTasks = taskService.selectList(
+                    new EntityWrapper<Task>()
+                        .eq("sta_no", staNo)
+                        .eq("task_type", "agv")
+                        .eq("wrk_sts", 8L) // 鍙鏌ユ鍦ㄦ惉杩愮姸鎬佺殑浠诲姟
+                        .in("io_type", checkIoTypes)
+                );
+                
+                if (transportingTasks.isEmpty()) {
+                    // 璇ョ珯鐐规病鏈夋鍦ㄦ惉杩愮殑浠诲姟锛屽彲浠ュ垎閰�
+                    availableDevList.add(dev);
+                } else {
+                    log.debug("绔欑偣{}鏈墈}涓鍦ㄦ惉杩愮殑{}AGV浠诲姟锛岃烦杩囧垎閰�", 
+                        staNo, transportingTasks.size(), taskTypeName);
+                }
+            }
+        } else {
+            // 濡傛灉ioType涓虹┖锛屼笉杩涜杩囨护锛堜繚鎸佸師鏈夐�昏緫锛�
+            availableDevList = devList;
+        }
+        
+        // 濡傛灉鎵�鏈夌珯鐐归兘鍦ㄦ惉杩愶紝鍒欎笉鍒嗛厤绔欑偣
+        if (availableDevList.isEmpty()) {
+            log.warn("浠诲姟ID锛歿}鐨勬墍鏈夊�欓�夌珯鐐归兘鏈夋鍦ㄦ惉杩愮殑{}浠诲姟锛屾殏涓嶅垎閰嶇珯鐐�", 
+                task.getId(), taskIoType != null && taskIoType < 100 ? "鍏ュ簱" : "鍑哄簱");
+            return null;
+        }
+        
         // 鍏ュ簱浠诲姟鏁版帓搴�
-        devList.sort(Comparator.comparing(BasDevp::getInQty));
+        availableDevList.sort(Comparator.comparing(BasDevp::getInQty));
         
         // 閫夋嫨绔欑偣
         BasDevp basDevp;
-        int minInQty = devList.get(0).getInQty();
+        int minInQty = availableDevList.get(0).getInQty();
         
         // 绛涢�夊嚭浠诲姟鏁版渶灏戠殑绔欑偣鍒楄〃
-        List<BasDevp> minTaskSites = devList.stream()
+        List<BasDevp> minTaskSites = availableDevList.stream()
                 .filter(dev -> dev.getInQty() == minInQty)
                 .collect(Collectors.toList());
         

--
Gitblit v1.9.1