From 33cb8b070c31a96bc514d07e3d1d9f6514a057d9 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期一, 29 七月 2024 10:50:56 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/BareBoardScheduler.java | 39 +++++++++++++++++++++++++++++++--------
1 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/BareBoardScheduler.java b/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
index a0bc890..03b9a2a 100644
--- a/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
+++ b/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
@@ -37,6 +37,8 @@
private WrkMastStaService wrkMastStaService;
@Autowired
private SlaveWmsParameterProperties slaveWmsParameterProperties;
+ @Autowired
+ private WrkMastService wrkMastService;
// @Scheduled(cron = "0/3 * * * * ? ")
// private void execute(){//鑷姩璋冪┖鏉垮嚭搴� 2妤肩爜鍨涗綅缃�
@@ -91,9 +93,16 @@
Integer devNo = 173;
Config config = configService.selectOne(new EntityWrapper<Config>().eq("code","bareBoard172"));
if (!Cools.isEmpty(config) && !Cools.isEmpty(config.getValue()) && config.getValue().equals("Y")){
+ BasDevp basDevp = basDevpService.selectById(devNo);
+ if (basDevp.getLoading().equals("Y")
+ || !basDevp.getAutoing().equals("Y")
+ || (!Cools.isEmpty(basDevp.getWrkNo()) && basDevp.getWrkNo()==0) ){
+ return;
+ }
int loadIngCount = basDevpService.selectCount(new EntityWrapper<BasDevp>().ge("dev_no", 160).le("dev_no", devNo).eq("loading", "Y"));
int count = 10;
- if (loadIngCount<count){
+ int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 110).eq("sta_no", devNo).eq("wrk_sts",11L));
+ if (loadIngCount+wrkCount<count){
bareBoardHandler.startYx(devNo,count);
}
}
@@ -104,11 +113,18 @@
private void execute3(){//鑷姩璋冪┖鏉垮嚭搴� 鐓滄槦浜屾ゼ灏忔枡绠� 172
if (slaveWmsParameterProperties.isAutomaticFillingBoardStaNosBoolean()){
Integer devNo = 272;
- Config config = configService.selectOne(new EntityWrapper<Config>().eq("code","bareBoard172"));
+ Config config = configService.selectOne(new EntityWrapper<Config>().eq("code","bareBoard272"));
if (!Cools.isEmpty(config) && !Cools.isEmpty(config.getValue()) && config.getValue().equals("Y")){
+ BasDevp basDevp = basDevpService.selectById(devNo);
+ if (basDevp.getLoading().equals("Y")
+ || !basDevp.getAutoing().equals("Y")
+ || (!Cools.isEmpty(basDevp.getWrkNo()) && basDevp.getWrkNo()==0) ){
+ return;
+ }
int loadIngCount = basDevpService.selectCount(new EntityWrapper<BasDevp>().ge("dev_no", 266).le("dev_no", devNo).eq("loading", "Y"));
int count = 5;
- if (loadIngCount<count){
+ int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 110).eq("sta_no", devNo).eq("wrk_sts",11L));
+ if (loadIngCount+wrkCount<count){
bareBoardHandler.startYx(devNo,count+5);
}
}
@@ -118,12 +134,19 @@
@Scheduled(cron = "0/3 * * * * ? ")
private void execute2(){//鑷姩璋冪┖鏉垮嚭搴� 鐓滄槦涓�妤�
if (slaveWmsParameterProperties.isAutomaticFillingBoardStaNosBoolean()){
- Integer devNo = 448;
- Config config = configService.selectOne(new EntityWrapper<Config>().eq("code","bareBoard448"));
+ Integer devNo = 445;
+ Config config = configService.selectOne(new EntityWrapper<Config>().eq("code","bareBoard445"));
if (!Cools.isEmpty(config) && !Cools.isEmpty(config.getValue()) && config.getValue().equals("Y")){
- int loadIngCount = basDevpService.selectCount(new EntityWrapper<BasDevp>().ge("dev_no", 421).le("dev_no", devNo).eq("loading", "Y"));
- int count = 25;
- if (loadIngCount<count){
+ BasDevp basDevp = basDevpService.selectById(devNo);
+ if (basDevp.getLoading().equals("Y")
+ || !basDevp.getAutoing().equals("Y")
+ || (!Cools.isEmpty(basDevp.getWrkNo()) && basDevp.getWrkNo()==0) ){
+ return;
+ }
+ int loadIngCount = basDevpService.selectCount(new EntityWrapper<BasDevp>().ge("dev_no", 422).le("dev_no", devNo).eq("loading", "Y"));
+ int count = 15;
+ int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 110).eq("sta_no", devNo).eq("wrk_sts",11L));
+ if (loadIngCount+wrkCount<count){
bareBoardHandler.startYx(devNo,count);
}
}
--
Gitblit v1.9.1