From 1053f15fecff14e486b734d83426fe6f26f9b7cf Mon Sep 17 00:00:00 2001
From: lsh <lsh>
Date: 星期一, 20 五月 2024 16:21:44 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/BareBoardScheduler.java | 92 +++++++++++++++++++++++++++------------------
1 files changed, 55 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/BareBoardScheduler.java b/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
index 1ed97c3..65c7de9 100644
--- a/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
+++ b/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
@@ -6,6 +6,7 @@
import com.zy.asrs.service.*;
import com.zy.asrs.task.handler.BareBoardHandler;
import com.zy.asrs.task.handler.WorkMastHandler;
+import com.zy.common.properties.SlaveWmsParameterProperties;
import com.zy.system.entity.Config;
import com.zy.system.service.ConfigService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -34,49 +35,66 @@
private RgvOneSignService rgvOneSignService;
@Autowired
private WrkMastStaService wrkMastStaService;
+ @Autowired
+ private SlaveWmsParameterProperties slaveWmsParameterProperties;
// @Scheduled(cron = "0/3 * * * * ? ")
- private void execute(){//鑷姩璋冪┖鏉垮嚭搴� 2妤肩爜鍨涗綅缃�
- Config config = configService.selectOne(new EntityWrapper<Config>().eq("code","bareBoard"));
- if (!Cools.isEmpty(config) && !Cools.isEmpty(config.getValue()) && config.getValue().equals("Y")){
- BasDevp basDevp = basDevpService.selectById(213);
- if (!Cools.isEmpty(basDevp) && basDevp.getWrkNo()==0 && basDevp.getAutoing().equals("Y") && basDevp.getLoading().equals("N")){
- bareBoardHandler.start(213);
- }
- }
- }
+// private void execute(){//鑷姩璋冪┖鏉垮嚭搴� 2妤肩爜鍨涗綅缃�
+// if (slaveWmsParameterProperties.isAutomaticFillingBoardStaNosBoolean()){
+// Config config = configService.selectOne(new EntityWrapper<Config>().eq("code","bareBoard"));
+// if (!Cools.isEmpty(config) && !Cools.isEmpty(config.getValue()) && config.getValue().equals("Y")){
+// BasDevp basDevp = basDevpService.selectById(213);
+// if (!Cools.isEmpty(basDevp) && basDevp.getWrkNo()==0 && basDevp.getAutoing().equals("Y") && basDevp.getLoading().equals("N")){
+// bareBoardHandler.start(213);
+// }
+// }
+// }
+// }
// @Scheduled(cron = "0/3 * * * * ? ")
- private void executeOne(){//鑷姩璋冪┖鏉垮嚭搴� 1妤肩爜鍨涗綅缃�
- Config config = configService.selectOne(new EntityWrapper<Config>().eq("code","bareBoard"));
- if (!Cools.isEmpty(config) && !Cools.isEmpty(config.getValue()) && config.getValue().equals("Y")){
- boolean sign = true;
- WrkMastSta wrkMastSta = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>()
- .eq("type", 2).eq("wrk_sts", 0).eq("wrk_type", 2));
- WrkMastSta wrkMastSta2 = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>()
- .eq("type", 2).eq("wrk_sts", 0).eq("wrk_type", 1));
- if (Cools.isEmpty(wrkMastSta) || !Cools.isEmpty(wrkMastSta2)){
- sign=false;
- }
- RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","oneSign"));
- if (rgvOneSign.getRgvOneSign()!=1 || !sign){
- sign = false;
- }else {
- List<BasRgv> basRgvs = basRgvService.selectList(new EntityWrapper<BasRgv>());
- for (BasRgv basRgv : basRgvs){
- if (basRgv.getLoaded2()!=0 && basRgv.getRgvSts()==3){
- sign = false;
- break;
- }
+// private void executeOne() {//鑷姩璋冪┖鏉垮嚭搴� 1妤肩爜鍨涗綅缃�
+// if (slaveWmsParameterProperties.isAutomaticFillingBoardStaNosBoolean()){
+// Config config = configService.selectOne(new EntityWrapper<Config>().eq("code","bareBoard"));
+// if (!Cools.isEmpty(config) && !Cools.isEmpty(config.getValue()) && config.getValue().equals("Y")){
+// boolean sign = true;
+// WrkMastSta wrkMastSta = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>()
+// .eq("type", 2).eq("wrk_sts", 0).eq("wrk_type", 2));
+// WrkMastSta wrkMastSta2 = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>()
+// .eq("type", 2).eq("wrk_sts", 0).eq("wrk_type", 1));
+// if (Cools.isEmpty(wrkMastSta) || !Cools.isEmpty(wrkMastSta2)){
+// sign=false;
+// }
+// RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","oneSign"));
+// if (rgvOneSign.getRgvOneSign()!=1 || !sign){
+// sign = false;
+// }else {
+// List<BasRgv> basRgvs = basRgvService.selectList(new EntityWrapper<BasRgv>());
+// for (BasRgv basRgv : basRgvs){
+// if (basRgv.getLoaded2()!=0 && basRgv.getRgvSts()==3){
+// sign = false;
+// break;
+// }
+// }
+// }
+//
+// if (sign){
+// bareBoardHandler.start(122);
+// }
+//// }
+// }
+// }
+// }
+
+ @Scheduled(cron = "0/3 * * * * ? ")
+ private void execute(){//鑷姩璋冪┖鏉垮嚭搴� 鐓滄槦浜屾ゼ灏忔枡绠� 172
+ if (slaveWmsParameterProperties.isAutomaticFillingBoardStaNosBoolean()){
+ Config config = configService.selectOne(new EntityWrapper<Config>().eq("code","bareBoard172"));
+ if (!Cools.isEmpty(config) && !Cools.isEmpty(config.getValue()) && config.getValue().equals("Y")){
+ int loadIngCount = basDevpService.selectCount(new EntityWrapper<BasDevp>().ge("dev_no", 160).le("dev_no", 172).eq("loading", "Y"));
+ if (loadIngCount<=10){
+ bareBoardHandler.startYx(172);
}
}
-
- if (sign){
- bareBoardHandler.start(122);
- }
-// BasDevp basDevp = basDevpService.selectById(213);
-// if (!Cools.isEmpty(basDevp) && basDevp.getWrkNo()==0 && basDevp.getAutoing().equals("Y") && basDevp.getLoading().equals("N")){
-// }
}
}
--
Gitblit v1.9.1