From ae1f165ee19a1dea91158e2766562684abbbd2aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?= Date: Mon, 20 Oct 2025 10:13:12 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4AGV=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E8=B0=83=E5=BA=A6=E7=9A=84=E6=9C=80=E5=A4=A7=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E9=85=8D=E7=BD=AE=EF=BC=8C=E6=9B=B4=E6=96=B0?= =?UTF-8?q?WCS=E6=8E=A5=E5=8F=A3=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../automatedWarehouse/task/AgvTaskScheduler.java | 5 +++-- src/main/resources/application.yml | 9 ++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/gaotao/modules/automatedWarehouse/task/AgvTaskScheduler.java b/src/main/java/com/gaotao/modules/automatedWarehouse/task/AgvTaskScheduler.java index 2f79746..5a64e0a 100644 --- a/src/main/java/com/gaotao/modules/automatedWarehouse/task/AgvTaskScheduler.java +++ b/src/main/java/com/gaotao/modules/automatedWarehouse/task/AgvTaskScheduler.java @@ -24,7 +24,8 @@ public class AgvTaskScheduler { @Value("${scheduler.agv.enabled:true}") private boolean enabled; - + @Value("${agv.max-task-num:10}") + private int maxTaskNum; /** * 定时任务：每分钟执行一次AGV任务优先级调度 * cron表达式：0 * * * * ? 表示每分钟的第0秒执行 @@ -48,7 +49,7 @@ public class AgvTaskScheduler { log.info("当前执行中的任务数量：{}", executingCount); // 2. 如果执行中任务数 >= 10，则不下发新任务 - if (executingCount >= 10) { + if (executingCount >= maxTaskNum) { log.info("执行中任务数量已达到上限(10个)，暂不下发新任务"); return; } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 0930466..ece0d82 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -106,8 +106,8 @@ custom: ifs-url: 'https://cclifswebservice.ccldesign.com/api/v1/' ifs-ifsDBName: 'IFST' ifs-domainUserID: 'CCL_WMS' - wcs-url: 'http://172.28.6.49:8002/api/wms/' - wcs-api: 'http://172.28.6.49:8002/api/' + wcs-url: 'http://172.28.1.18:7002/api/wms/' + wcs-api: 'http://172.28.1.18:7002/api/' agv-url: 'http://172.28.1.17:7777' # WMS消息队列配置 @@ -137,4 +137,7 @@ scheduler: wcs: enabled: false # WCS定时任务总开关（控制WcsTaskScheduler.java的所有定时任务） autoTask: - enabled: false # 自动任务开关（控制自动化下达任务）: \ No newline at end of file + enabled: false # 自动任务开关（控制自动化下达任务）: + +agv: + max-task-num: 10 \ No newline at end of file