From af5081bc0d0668d526a204076557a171097ddb8d Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 05 二月 2026 14:02:59 +0800
Subject: [PATCH] Merge branch 'refs/heads/rcs_master' into ctu_conveyor
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/test/ConveyorAutoRunScheduler.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/ConveyorAutoRunScheduler.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/test/ConveyorAutoRunScheduler.java
similarity index 93%
rename from zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/ConveyorAutoRunScheduler.java
rename to zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/test/ConveyorAutoRunScheduler.java
index 7c24098..c3b795d 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/ConveyorAutoRunScheduler.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/test/ConveyorAutoRunScheduler.java
@@ -1,4 +1,4 @@
-package com.zy.acs.manager.core.scheduler;
+package com.zy.acs.manager.core.scheduler.test;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.acs.common.constant.RedisConstant;
@@ -8,7 +8,7 @@
import com.zy.acs.manager.common.domain.TaskDto;
import com.zy.acs.manager.core.service.AreaGovernService;
import com.zy.acs.manager.core.service.MainService;
-import com.zy.acs.manager.manager.controller.param.OpenBusSubmitParam;
+import com.zy.acs.manager.core.integrate.dto.OpenBusSubmitParam;
import com.zy.acs.manager.manager.entity.*;
import com.zy.acs.manager.manager.enums.AgvModelType;
import com.zy.acs.manager.manager.enums.BusStsType;
@@ -25,7 +25,7 @@
import java.util.*;
@Slf4j
-@Component
+//@Component
public class ConveyorAutoRunScheduler {
private static final AgvModelType DEFAULT_AGV_MODEL = AgvModelType.CTU_BOX_TRANSPORT_AGV;
@@ -97,7 +97,7 @@
Collections.shuffle(idleList);
OpenBusSubmitParam param = new OpenBusSubmitParam();
- param.setBatch(String.valueOf(snowflakeIdWorker.nextId()).substring(13, 19));
+ param.setBatchNo(String.valueOf(snowflakeIdWorker.nextId()).substring(13, 19));
for (int i = 0; i < agvModel.getBackpack() ; i++) {
Sta idleSta = idleList.get(i);
String staCode = codeService.getCacheById(idleSta.getCode()).getData();
@@ -135,11 +135,11 @@
taskDto.setOriLoc(stockLoc.getLocNo());
taskDto.setDestSta(idleSta.getStaNo());
taskDto.setPriority(100);
- taskDto.setSeqNum(String.valueOf(snowflakeIdWorker.nextId()).substring(15, 19));
+ taskDto.setTaskNo(String.valueOf(snowflakeIdWorker.nextId()).substring(15, 19));
- param.getTaskList().add(taskDto);
+ param.getTasks().add(taskDto);
}
- if (Cools.isEmpty(param.getTaskList())) { return; }
+ if (Cools.isEmpty(param.getTasks())) { return; }
mainService.generateBusAndTask(param, memo);
}
--
Gitblit v1.9.1