From 6eecac9d82c970acf021669e3bb4cd782f36bbfe Mon Sep 17 00:00:00 2001 From: lsh <1> Date: 星期三, 24 一月 2024 11:34:00 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java index efe3064..df199ef 100644 --- a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java +++ b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java @@ -44,7 +44,7 @@ private void execute(){ for(Integer staNo : STA_WORK_CU){ BasDevp basDevp = basDevpService.selectById(staNo); - if (basDevp.getWrkNo()!=0){ + if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")){ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo())); if(Cools.isEmpty(wrkMast)){ continue; @@ -86,7 +86,7 @@ for(Integer staNo : STA_WORK_RU){ BasDevp basDevp = basDevpService.selectById(staNo); - if (basDevp.getWrkNo()!=0){ + if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")){ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo())); if (wrkMast.getWrkSts()!=2 || wrkMast.getIoType()==10){ continue; -- Gitblit v1.9.1