From ccfa512653d817f5a53cb1a4b74a2221d3e65c38 Mon Sep 17 00:00:00 2001 From: yxFwq <1> Date: 星期五, 29 十一月 2024 16:27:07 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/task/WrkMastCrnScheduler.java | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/task/WrkMastCrnScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastCrnScheduler.java index 1dae031..3b38656 100644 --- a/src/main/java/com/zy/asrs/task/WrkMastCrnScheduler.java +++ b/src/main/java/com/zy/asrs/task/WrkMastCrnScheduler.java @@ -134,7 +134,11 @@ } int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMast.getStaNo()).eq("wrk_sts",12L)); int wrkCountCrn = wrkMastCrnService.selectCount(new EntityWrapper<WrkMastCrn>().eq("sta_no", wrkMast.getStaNo())); - if (wrkCountCrn+wrkCount+rgvOneSign.getRgvOneSign()+trunSma.getRgvOneSign()>1){ + if (wrkCountCrn*2+wrkCount+rgvOneSign.getRgvOneSign()+trunSma.getRgvOneSign()>1){ + continue; + } + int wrkCountGt = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMast.getStaNo()).gt("wrk_sts",11L)); + if (wrkCountGt > 1){ continue; } sign = false; -- Gitblit v1.9.1