From 0ee7bd812c0493ef82fa2cb8bdaf2da08aec88d0 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期六, 14 九月 2024 14:11:47 +0800
Subject: [PATCH] #logo
---
src/main/java/com/zy/asrs/task/BareBoardScheduler.java | 4 ++--
src/main/java/com/zy/asrs/task/WorkLogScheduler.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/BareBoardScheduler.java b/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
index 5f9243c..f501133 100644
--- a/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
+++ b/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
@@ -115,13 +115,13 @@
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(266);
+ BasDevp basDevp = basDevpService.selectById(265);
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 loadIngCount = basDevpService.selectCount(new EntityWrapper<BasDevp>().ge("dev_no", 265).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));
if (loadIngCount+wrkCount<count){
diff --git a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
index e25cfb8..62eb93e 100644
--- a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
@@ -44,7 +44,7 @@
return;
}
for (WrkMast wrkMast : wrkMasts) {
- if (wrkMast.getIoType()==101 && (Cools.isEmpty(wrkMast.getSheetNo()) || !wrkMast.getSheetNo().equals("2")) && wrkMast.getStaNo()!=148 && wrkMast.getStaNo()!=153){
+ if (wrkMast.getIoType()==101 && (Cools.isEmpty(wrkMast.getSheetNo()) || !wrkMast.getSheetNo().equals("2")) && wrkMast.getStaNo()!=145 && wrkMast.getStaNo()!=153){
continue;
}
try{
--
Gitblit v1.9.1