From ced2fc10af63b23402352f675f8b1e3c241c42ab Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 10 十一月 2025 11:16:27 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/task/BareBoardScheduler.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/BareBoardScheduler.java b/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
index 19bb983..8fc7d39 100644
--- a/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
+++ b/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
@@ -35,12 +35,12 @@
@Autowired
private WrkMastStaService wrkMastStaService;
- @Scheduled(cron = "0/3 * * * * ? ")
+ @Scheduled(cron = "0/10 * * * * ? ")
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")){
+ if (!Cools.isEmpty(basDevp) && basDevp.getWrkNo()==0 && basDevp.getAutoing().equals("Y") && basDevp.getLoadingSuper().equals("N") && basDevp.getLoading().equals("N") && basDevp.getReportSign()==0){
bareBoardHandler.start(213);
}
}
@@ -51,9 +51,11 @@
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>()
+ List<WrkMastSta> wrkMastStas = wrkMastStaService.selectList(new EntityWrapper<WrkMastSta>()
.eq("type", 2).eq("wrk_sts", 0).eq("wrk_type", 2));
- if (Cools.isEmpty(wrkMastSta)){
+ List<WrkMastSta> wrkMastStaList = wrkMastStaService.selectList(new EntityWrapper<WrkMastSta>()
+ .eq("type", 2).eq("wrk_sts", 0).eq("wrk_type", 1));
+ if (Cools.isEmpty(wrkMastStas) || wrkMastStas.isEmpty() || !Cools.isEmpty(wrkMastStaList) || !wrkMastStaList.isEmpty()){
sign=false;
}
RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","oneSign"));
--
Gitblit v1.9.1