From 3c9b9886fc9e9a26dac4e8b5dd4cc0db0b8fce82 Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期四, 16 十月 2025 09:53:23 +0800
Subject: [PATCH] 创建分支

---
 zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/AutoRunScheduler.java |   86 +++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 82 insertions(+), 4 deletions(-)

diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/AutoRunScheduler.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/AutoRunScheduler.java
index c6081b3..a63b102 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/AutoRunScheduler.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/AutoRunScheduler.java
@@ -85,7 +85,7 @@
                         this.autoRun(LocGroupConstant.LEFT_LOC_ROW_LIST, StaGroupConstant.LEFT_STA_ROW_LIST, AgvGroupConstant.SECOND_AGV_GROUP);
                         break;
                     case '5':
-                        this.autoRun(LocGroupConstant.FAR_LEFT_LOC_ROW_LIST, StaGroupConstant.FAR_LEFT_STA_ROW_LIST, AgvGroupConstant.FIRST_AGV_GROUP);
+                        this.autoRun2(LocGroupConstant.FAR_LEFT_LOC_ROW_LIST, StaGroupConstant.FAR_LEFT_STA_ROW_LIST, AgvGroupConstant.FIRST_AGV_GROUP);
                         break;
                     default:
                         break;
@@ -111,9 +111,9 @@
                         case '4':
                             this.autoOut(LocGroupConstant.LEFT_LOC_ROW_LIST, StaGroupConstant.LEFT_STA_ROW_LIST, AgvGroupConstant.SECOND_AGV_GROUP);
                             break;
-                        case '5':
-                            this.autoOut(LocGroupConstant.FAR_LEFT_LOC_ROW_LIST, StaGroupConstant.FAR_LEFT_STA_ROW_LIST, AgvGroupConstant.FIRST_AGV_GROUP);
-                            break;
+//                        case '5':
+//                            this.autoOut(LocGroupConstant.FAR_LEFT_LOC_ROW_LIST, StaGroupConstant.FAR_LEFT_STA_ROW_LIST, AgvGroupConstant.FIRST_AGV_GROUP);
+//                            break;
                         default:
                             break;
                     }
@@ -138,6 +138,19 @@
 
         // 绉诲簱
         this.runLocToLoc(locGroupList, agvGroupList, staTaskMemo);
+    }
+
+    private void autoRun2(List<Integer> locGroupList, List<String> staGroupList, List<String> agvGroupList) {
+        int availableAgvCount = this.getAvailableAgvCount(agvGroupList);
+        if (0 == availableAgvCount) {
+            return;
+        }
+
+        List<String> staPreNos = getStaPrefixes(staGroupList);
+        String staTaskMemo = "DEMO_STA_" + String.join("-", staPreNos);
+
+        // 绉诲簱
+        this.runLocToLoc2(locGroupList, agvGroupList, staTaskMemo);
     }
 
     private void autoOut(List<Integer> locGroupList, List<String> staGroupList, List<String> agvGroupList) {
@@ -433,6 +446,71 @@
         mainService.generateBusAndTask(param, memo);
     }
 
+    private void runLocToLoc2(List<Integer> locGroupList, List<String> agvGroupList, String staTaskMemo) {
+        Integer startRow = Collections.min(locGroupList);
+        Integer endRow = Collections.max(locGroupList);
+
+        String memo = "DEMO_LOC_" + startRow + "-" + endRow;
+
+        // -2 鏄负浜嗘湇鍔¤緭閫佺嚎
+        int availableAgvCount = this.getAvailableAgvCount(agvGroupList) - 1;
+
+        // 鏈�澶� ? 缁刡us杩愯
+        if (availableAgvCount <= busService.count(new LambdaQueryWrapper<Bus>().in(Bus::getBusSts, BusStsType.RECEIVE.val(), BusStsType.PROGRESS.val()).in(Bus::getMemo, memo, staTaskMemo))) {
+            return;
+        }
+
+        AgvModel agvModel = agvModelService.getOne(new LambdaQueryWrapper<AgvModel>().eq(AgvModel::getType, AgvModelType.CTU_BOX_TRANSPORT_AGV.toString()));
+        if (null == agvModel) {
+            return;
+        }
+        int maxCapacity = agvModel.getBackpack();
+
+        // STOCK
+        LambdaQueryWrapper<Loc> stockWrapper = new LambdaQueryWrapper<Loc>().eq(Loc::getLocSts, LocStsType.STOCK.val());
+        if (null != startRow) {
+            stockWrapper.ge(Loc::getRow, startRow);
+        }
+        if (null != endRow) {
+            stockWrapper.le(Loc::getRow, endRow);
+        }
+        List<Loc> stockList = locService.list(stockWrapper);
+        if (Cools.isEmpty(stockList) || stockList.size() < agvModel.getBackpack()) {
+            return;
+        }
+        Collections.shuffle(stockList);
+
+        // IDLE
+        LambdaQueryWrapper<Loc> idleWrapper = new LambdaQueryWrapper<Loc>().eq(Loc::getLocSts, LocStsType.IDLE.val());
+        if (null != startRow) {
+            idleWrapper.ge(Loc::getRow, startRow);
+        }
+        if (null != endRow) {
+            idleWrapper.le(Loc::getRow, endRow);
+        }
+        List<Loc> idleList = locService.list(idleWrapper);
+        if (Cools.isEmpty(idleList)) {
+            return;
+        }
+        Collections.shuffle(idleList);
+
+        OpenBusSubmitParam param = new OpenBusSubmitParam();
+        param.setBatch(String.valueOf(snowflakeIdWorker.nextId()).substring(13, 19));
+        for (int i = 0; i < Math.min(maxCapacity, Math.min(stockList.size(), idleList.size())); i++) {
+            Loc stockLoc = stockList.get(i);
+            Loc idleLoc = idleList.get(i);
+
+            TaskDto taskDto = new TaskDto();
+            taskDto.setOriLoc(stockLoc.getLocNo());
+            taskDto.setDestLoc(idleLoc.getLocNo());
+            taskDto.setSeqNum(String.valueOf(snowflakeIdWorker.nextId()).substring(11, 19));
+
+            param.getTaskList().add(taskDto);
+        }
+
+        mainService.generateBusAndTask(param, memo);
+    }
+
     public static List<String> getStaPrefixes(List<String> staGroupList) {
         Set<String> rowSet = new HashSet<>();
         for (String s : staGroupList) {

--
Gitblit v1.9.1