From b500cbc2e1c0d921554b906c75725e576dd94237 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 15 二月 2023 16:49:59 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 196 ++++++++++++++++++++++++++-----------------------
1 files changed, 104 insertions(+), 92 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 35d495d..f92cbe4 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -188,70 +188,23 @@
}
}
}
+
+ // 濡傛灉娌℃湁鐩歌繎鐗╂枡锛屽垯鎸夎鍒欒疆璇㈣揣鏋�
if (null == locMast){
- switch (curRow){
- case 1:
- case 3:
- case 5:
- curRow=curRow+2;
- crnNo=(curRow+1)/2;
- break;
- case 7:
- crnNo=1;
- curRow=2;
- break;
- case 13:
- crnNo=6;
- curRow=14;
- break;
- case 2:
- case 4:
- case 6:
- curRow=curRow+2;
- crnNo=curRow/2;
- break;
- case 8:
- crnNo=1;
- curRow=1;
- break;
- case 14:
- crnNo=6;
- curRow=13;
- break;
- case 9:
- crnNo=5;
- curRow=12;
- break;
- case 10:
- crnNo=5;
- curRow=11;
- break;
- case 11:
- crnNo=5;
- curRow=9;
- break;
- case 12:
- crnNo=5;
- curRow=10;
- break;
- case 15:
- crnNo=7;
- curRow=18;
- break;
- case 16:
- crnNo=7;
- curRow=17;
- break;
- case 17:
- crnNo=7;
- curRow=15;
- break;
- case 18:
- crnNo=7;
- curRow=16;
- break;
- default:
- throw new CoolException("鏍规嵁鍏ュ簱绔欒幏鍙栧簱浣嶆帓鍙峰垎閰嶅け璐ワ紝鍏ュ簱绔欙細" + sourceStaNo);
+ curRow = getCurRow(curRow);
+ if (curRow == 0){
+ crnNo = 0;
+ }else if( curRow <= 8 && curRow > 0){
+ crnNo=(curRow+1)/2;
+ }else if (curRow <= 12 && curRow >= 9){
+ crnNo=5;
+ }else if (curRow <= 14 && curRow >= 13){
+ crnNo=6;
+ }else if (curRow <= 18 && curRow >= 15){
+ crnNo=7;
+ }
+ if (curRow!=0 && !basCrnpService.checkSiteError(crnNo, true)) {
+ crnNo = 0;
}
}
@@ -335,6 +288,46 @@
}
}
}
+ //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){
+ BasCrnp basCrnp1 = basCrnpService.selectById(1);
+ if (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)){
+ BasCrnp basCrnp2 = basCrnpService.selectById(2);
+ if (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)){
+ BasCrnp basCrnp3 = basCrnpService.selectById(3);
+ if (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)){
+ BasCrnp basCrnp4 = basCrnpService.selectById(4);
+ if (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)) {
@@ -383,35 +376,54 @@
/**
* 鏍规嵁鍏ュ簱绔欒幏鍙栧簱浣嶆帓鍙峰垎閰�
*/
- private Integer getWhsType(Integer sourceStaNo, int times) {
- if (times >= 16) {
- return 4;
+ private Integer getCurRow(Integer curRow) {
+ boolean sign=false;
+ int count=0;
+ while (!sign){
+ count=count+1;
+ if (count==5){
+ return 0;
+ }
+ switch (curRow){
+ case 1:
+ case 3:
+ case 5:
+ case 2:
+ case 4:
+ case 6:
+ curRow=curRow+2;
+ break;
+ case 7:
+ curRow=2;
+ break;
+ case 8:
+ curRow=1;
+ break;
+ case 13:
+ return 14;
+ case 14:
+ return 13;
+ case 9:
+ return 12;
+ case 10:
+ return 11;
+ case 11:
+ return 9;
+ case 12:
+ return 10;
+ case 15:
+ return 18;
+ case 16:
+ return 17;
+ case 17:
+ return 15;
+ case 18:
+ return 16;
+ default:
+ throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細"+curRow);
+ }
+ sign = basCrnpService.checkSiteError((curRow+1)/2, true);
}
- switch (sourceStaNo) {
- case 173:
- case 176:
- case 180:
- case 185:
- return 1;
- case 189:
- case 194:
- case 198:
- case 202:
- return 2;
- case 206:
-// case 211:
-// case 215:
-// case 219:
-// case 223:
- case 227:
- return 3;
- case 305:
- case 303:
- case 301:
- return 4;
- default:
- throw new CoolException("鏍规嵁鍏ュ簱绔欒幏鍙栧簱浣嶆帓鍙峰垎閰嶅け璐ワ紝鍏ュ簱绔欙細" + sourceStaNo);
- }
+ return curRow;
}
-
}
--
Gitblit v1.9.1