From cf074430480e44eba1e6ddce09ccce9f28067120 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期三, 17 九月 2025 08:56:24 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/BareBoardScheduler.java | 75 +++++++++++++++++++++++++++++++++----
1 files changed, 67 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 b50d02b..d901198 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,10 +93,59 @@
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(160);
+// 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){
- bareBoardHandler.startYx(devNo,count);
+ int count = 12;
+ int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", devNo).eq("wrk_sts",11L));
+ int wrkCount12 = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", devNo).eq("wrk_sts",12L));
+ if (loadIngCount+wrkCount+wrkCount12<count){
+ RgvOneSign smallEmpty = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","smallEmpty"));
+ if (smallEmpty.getRgvOneSign()+wrkCount+wrkCount12<13){
+ bareBoardHandler.startYx(devNo,count);
+ }
+ }
+ }
+ }
+ }
+
+ @Scheduled(cron = "0/3 * * * * ? ")
+ 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(265);
+// if (basDevp.getLoading().equals("Y")
+// || !basDevp.getAutoing().equals("Y")
+// || (!Cools.isEmpty(basDevp.getWrkNo()) && basDevp.getWrkNo()!=0) ){
+// return;
+// }
+// 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 = 7;
+ int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", devNo).eq("wrk_sts",11L));
+ int wrkCount12 = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", devNo).eq("wrk_sts",12L));
+ if (loadIngCount+wrkCount+wrkCount12<count){
+ RgvOneSign bigEmpty = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","bigEmpty"));
+ if (bigEmpty.getRgvOneSign()+wrkCount+wrkCount12<count+5){
+ bareBoardHandler.startYx(devNo,count+5);
+ }
}
}
}
@@ -103,12 +154,20 @@
@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(422);
+ 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){
+// RgvOneSign sign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","鏃�"));
bareBoardHandler.startYx(devNo,count);
}
}
--
Gitblit v1.9.1