From 508aac599c24711a3c1f7cfa76d9025c8e73b89f Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 25 二月 2023 17:04:05 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 44 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 44 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 378700e..51afada 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -288,6 +288,50 @@
}
}
}
+ //20230203娣诲姞 lfd鏂欑搴撴牴鎹緭閫佺嚎绛涢�夊叆搴�
+ if (!Cools.isEmpty(locMast) && locMast.getCrnNo()<5){
+ int wrkMastsC0 = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", locMast.getCrnNo()).eq("io_type",1));
+ if (wrkMastsC0>3 && times < rowCount){
+ int locO1 = locMastService.selectCount(new EntityWrapper<LocMast>().eq("loc_sts", "O").eq("crn_no", 1));
+ BasCrnp basCrnp1 = basCrnpService.selectById(1);
+ if (!Cools.isEmpty(locO1) && basCrnp1.getInEnable().equals("Y") && basCrnp1.getCrnSts().equals(3)){
+ int wrkMastsC1 = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", 1).eq("io_type",1));
+ if (wrkMastsC0>wrkMastsC1){
+ locMast=null;
+ }
+ }
+ if (!Cools.isEmpty(locMast)){
+ locO1=locMastService.selectCount(new EntityWrapper<LocMast>().eq("loc_sts", "O").eq("crn_no", 2));
+ BasCrnp basCrnp2 = basCrnpService.selectById(2);
+ if (!Cools.isEmpty(locO1) && basCrnp2.getInEnable().equals("Y") && basCrnp2.getCrnSts().equals(3)){
+ int wrkMastsC2 = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", 2).eq("io_type",1));
+ if (wrkMastsC0>wrkMastsC2){
+ locMast=null;
+ }
+ }
+ }
+ if (!Cools.isEmpty(locMast)){
+ locO1=locMastService.selectCount(new EntityWrapper<LocMast>().eq("loc_sts", "O").eq("crn_no", 2));
+ BasCrnp basCrnp3 = basCrnpService.selectById(3);
+ if (!Cools.isEmpty(locO1) && basCrnp3.getInEnable().equals("Y") && basCrnp3.getCrnSts().equals(3)){
+ int wrkMastsC3 = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", 3).eq("io_type",1));
+ if (wrkMastsC0>wrkMastsC3){
+ locMast=null;
+ }
+ }
+ }
+ if (!Cools.isEmpty(locMast)){
+ locO1=locMastService.selectCount(new EntityWrapper<LocMast>().eq("loc_sts", "O").eq("crn_no", 2));
+ BasCrnp basCrnp4 = basCrnpService.selectById(4);
+ if (!Cools.isEmpty(locO1) && basCrnp4.getInEnable().equals("Y") && basCrnp4.getCrnSts().equals(3)){
+ int wrkMastsC4 = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", 4).eq("io_type",1));
+ if (wrkMastsC0>wrkMastsC4){
+ locMast=null;
+ }
+ }
+ }
+ }
+ }
// 2.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣�
if (Cools.isEmpty(locMast)) {
--
Gitblit v1.9.1