From dbc2514aad6b2b70b08e81f33d45f64aae175ccf Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期二, 19 十一月 2024 16:31:34 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/BareBoardScheduler.java | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/BareBoardScheduler.java b/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
index 5f9243c..cd795e6 100644
--- a/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
+++ b/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
@@ -103,29 +103,47 @@
int count = 10;
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);
+ RgvOneSign smallEmpty = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","smallEmpty"));
+ if (smallEmpty.getRgvOneSign()+wrkCount<13){
+ bareBoardHandler.startYx(devNo,count);
+ }
}
}
}
}
@Scheduled(cron = "0/3 * * * * ? ")
- private void execute3(){//鑷姩璋冪┖鏉垮嚭搴� 鐓滄槦浜屾ゼ灏忔枡绠� 272
+ private void execute3(){//鑷姩璋冪┖鏉垮嚭搴� 鐓滄槦浜屾ゼ澶ф枡绠� 272
if (slaveWmsParameterProperties.isAutomaticFillingBoardStaNosBoolean()){
Integer devNo = 272;
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(266);
+ BasDevp basDevp = basDevpService.selectById(265);
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"));
+ BasDevp basDevp264 = basDevpService.selectById(264);
+ if (basDevp264.getLoading().equals("Y")
+ || !basDevp264.getAutoing().equals("Y")
+ || (!Cools.isEmpty(basDevp264.getWrkNo()) && basDevp264.getWrkNo()!=0) ){
+ return;
+ }
+ BasDevp basDevp266 = basDevpService.selectById(266);
+ if (basDevp266.getLoading().equals("Y")
+ || !basDevp266.getAutoing().equals("Y")
+ || (!Cools.isEmpty(basDevp266.getWrkNo()) && basDevp266.getWrkNo()!=0) ){
+ return;
+ }
+ int loadIngCount = basDevpService.selectCount(new EntityWrapper<BasDevp>().ge("dev_no", 265).le("dev_no", devNo).eq("loading", "Y"));
int count = 5;
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);
+ RgvOneSign bigEmpty = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","bigEmpty"));
+ if (bigEmpty.getRgvOneSign()+wrkCount<12){
+ bareBoardHandler.startYx(devNo,count+5);
+ }
}
}
}
@@ -147,6 +165,7 @@
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){
+// RgvOneSign sign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","鏃�"));
bareBoardHandler.startYx(devNo,count);
}
}
--
Gitblit v1.9.1