From 515ddb9ef28b1403af9cd33fc6f3adb25643c14e Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期四, 10 十月 2024 10:52:38 +0800
Subject: [PATCH] #gz
---
src/main/java/com/zy/asrs/task/BareBoardScheduler.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/BareBoardScheduler.java b/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
index 12bb976..97f5101 100644
--- a/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
+++ b/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
@@ -40,7 +40,7 @@
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") && basDevp.getReportSign()==0){
+ 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);
}
}
@@ -55,7 +55,7 @@
.eq("type", 2).eq("wrk_sts", 0).eq("wrk_type", 2));
List<WrkMastSta> wrkMastStaList = wrkMastStaService.selectList(new EntityWrapper<WrkMastSta>()
.eq("type", 2).eq("wrk_sts", 0).eq("wrk_type", 1));
- if (Cools.isEmpty(wrkMastStas) || wrkMastStas.size()==0 || !Cools.isEmpty(wrkMastStaList) || wrkMastStaList.size()!=0){
+ 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