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