From 2bfde4ab2e10df0b7ba7b2da8cefe3df21f00c2f Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期六, 27 七月 2024 21:37:56 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/BareBoardScheduler.java | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/BareBoardScheduler.java b/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
index 35c9ce7..03b9a2a 100644
--- a/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
+++ b/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
@@ -93,6 +93,12 @@
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(devNo);
+ 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;
int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 110).eq("sta_no", devNo).eq("wrk_sts",11L));
@@ -109,6 +115,12 @@
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(devNo);
+ 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"));
int count = 5;
int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 110).eq("sta_no", devNo).eq("wrk_sts",11L));
@@ -125,6 +137,12 @@
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")){
+ BasDevp basDevp = basDevpService.selectById(devNo);
+ 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));
--
Gitblit v1.9.1