From 51e31c6ac345541f4b9cc631a0c3720c7c2b6672 Mon Sep 17 00:00:00 2001 From: yxFwq <1> Date: 星期三, 10 七月 2024 15:02:07 +0800 Subject: [PATCH] # --- src/main/java/com/zy/common/service/CommonService.java | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java index 63f49d7..9589f10 100644 --- a/src/main/java/com/zy/common/service/CommonService.java +++ b/src/main/java/com/zy/common/service/CommonService.java @@ -180,11 +180,13 @@ if (basCrnpService.checkSiteError(crnNo, true)) { rowCount = locNecessaryParameters[0]; nearRow = locNecessaryParameters[3]; - List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O")); - int crnCountO = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).le("io_type",100)); - if (locMasts.size()-crnCountO<=2){ - times++; - continue; + if (crnNo>5 || crnNo<3){ + List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O")); + int crnCountO = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).le("io_type",100)); + if (locMasts.size()-crnCountO<=2){ + times++; + continue; + } } break; } else { -- Gitblit v1.9.1