From d3f11759e6b32d7e9e63e0f7b0cc4b6874aea020 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 28 八月 2023 11:14:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs6' into bfasrs6
---
src/main/java/com/zy/common/service/CommonService.java | 145 +++++++++++++++++++++++++++--------------------
1 files changed, 83 insertions(+), 62 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 964c038..62637a9 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -17,6 +17,7 @@
import org.springframework.stereotype.Service;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import java.util.Random;
@@ -170,7 +171,7 @@
}
//3鍙峰彲浠ュ叆搴撳墠蹇呴』鎵撳紑鎺у埗
- if (!Cools.isEmpty(matNos) && crnNo==3) {
+ if (!Cools.isEmpty(matNos)) {
for (String matNo : matNos) {
Mat mat = matService.selectByMatnr(matNo);
if (matType == null) {
@@ -193,6 +194,13 @@
if (locMast != null) {
//鎵惧埌搴撲綅锛岃繑鍥瀌to
sign=true;
+ } else {
+ //鍗曞搧娌℃湁鎵惧埌搴撲綅锛屾壘楂橀娣锋斁鍖哄煙搴撲綅
+ locMast = getLocNoStep3(locTypeDto, crnNos);
+ if (locMast != null) {
+ //鎵惧埌搴撲綅锛岃繑鍥瀌to
+ sign=true;
+ }
}
} else if (matType == 2) {//楂橀绫诲瀷鍏ユ渶澶栦晶搴撲綅
locMast = getLocNoStep3(locTypeDto, crnNos);
@@ -215,33 +223,28 @@
- if (!sign){
- //----------------2023.06.02鍏煎浠ｇ爜锛屽悗鏈熷簱浣嶈鍒欑鍚堣姹傚悗鍙垹闄�------------------------
- //濡傛灉浠ヤ笂閮芥壘涓嶅埌搴撲綅锛屽垯寮哄埗鎼滅储1銆�2鍫嗗灈鏈虹┖搴撲綅杩涜鍏ュ簱锛屼繚闅�3鍙峰爢鍨涙満搴撲綅閮芥槸绗﹀悎瑕佹眰鐨�
- EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
- wrapper.eq("loc_type1", locTypeDto.getLocType1());
- wrapper.in("crn_no", "2");
- wrapper.eq("loc_sts", "O");
- List<LocMast> locMasts = locMastService.selectList(wrapper);
- for (LocMast mast : locMasts) {
- //妫�娴嬪綋鍓嶅簱浣嶅唴渚у叾浠栧簱浣嶆槸鍚︿负D銆丗銆乆
- if (Utils.checkInsideLocIsDFX(mast.getLocNo())) {
- //鍐呬晶鍏朵粬搴撲綅涓嶆槸D銆丗銆乆銆備笉鑳介�夊彇璇ュ簱浣�
- continue;
- }
- if(sourceStaNo==103 && mast.getRow1()>7)
- {
- continue;
- }
- if(sourceStaNo==203 && mast.getRow1()<8)
- {
- continue;
- }
- //鎵惧埌搴撲綅锛岃繑鍥瀌to
- locMast=mast;
- sign = true;
- }
- }
+// if (!sign){
+// //----------------2023.06.02鍏煎浠ｇ爜锛屽悗鏈熷簱浣嶈鍒欑鍚堣姹傚悗鍙垹闄�------------------------
+// //濡傛灉浠ヤ笂閮芥壘涓嶅埌搴撲綅锛屽垯寮哄埗鎼滅储2鍫嗗灈鏈虹┖搴撲綅杩涜鍏ュ簱锛屼繚闅�3鍙峰爢鍨涙満搴撲綅閮芥槸绗﹀悎瑕佹眰鐨�
+// EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
+// wrapper.eq("loc_type1", locTypeDto.getLocType1());
+// wrapper.in("crn_no", "2");
+// wrapper.eq("loc_sts", "O");
+// List<LocMast> locMasts = locMastService.selectList(wrapper);
+// for (LocMast mast : locMasts) {
+// //妫�娴嬪綋鍓嶅簱浣嶅唴渚у叾浠栧簱浣嶆槸鍚︿负D銆丗銆乆
+// if (Utils.checkInsideLocIsDFX(mast.getLocNo())) {
+// //鍐呬晶鍏朵粬搴撲綅涓嶆槸D銆丗銆乆銆備笉鑳介�夊彇璇ュ簱浣�
+// continue;
+// }
+// if(sourceStaNo==103 && mast.getRow1()>14) continue;
+// if(sourceStaNo==103 && mast.getRow1()<8) continue;
+// if(sourceStaNo==203 && mast.getRow1()<15) continue;
+// //鎵惧埌搴撲綅锛岃繑鍥瀌to
+// locMast=mast;
+// sign = true;
+// }
+// }
if (sign){
return getLocNoFinalStep(staDescId, sourceStaNo, locMast);//杩斿洖dto
@@ -290,26 +293,29 @@
List<String> groupLoc = Utils.getGroupLoc(wrkMast.getLocNo());
//闅忔満鍙敤鍫嗗灈鏈哄彿
Integer randomCrnNo = Utils.getRandomCrnNo(crnNos, locTypeDto.getLocType1());
- List<LocMast> locMasts = locMastService.findEmptyLocMastByLocNos(locTypeDto.getLocType1(), groupLoc, randomCrnNo);
- for (LocMast locMast0 : locMasts) {
- //妫�娴嬪綋鍓嶅簱浣嶅唴渚у叾浠栧簱浣嶆槸鍚︿负D銆丗銆乆銆丼
- if (Utils.checkInsideLocIsDFXS(locMast0.getLocNo())) {
- //鍐呬晶鍏朵粬搴撲綅涓嶆槸D銆丗銆乆銆丼銆備笉鑳介�夊彇璇ュ簱浣�
- continue;
- }
+ for (Integer crnNo : crnNos) {
+ List<LocMast> locMasts = locMastService.findEmptyLocMastByLocNos(locTypeDto.getLocType1(), groupLoc, crnNo);
+ for (LocMast locMast0 : locMasts) {
+ //妫�娴嬪綋鍓嶅簱浣嶅唴渚у叾浠栧簱浣嶆槸鍚︿负D銆丗銆乆銆丼
+ if (Utils.checkInsideLocIsDFXS(locMast0.getLocNo())) {
+ //鍐呬晶鍏朵粬搴撲綅涓嶆槸D銆丗銆乆銆丼銆備笉鑳介�夊彇璇ュ簱浣�
+ continue;
+ }
- // 娴呭簱浣嶇鍚堝昂瀵告娴�
- if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
- // 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父
- if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
- // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
- if (locMastService.checkEmptyCount(locMast0, 10)) {
- locMast = locMast0;
- break;
+ // 娴呭簱浣嶇鍚堝昂瀵告娴�
+ if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
+ // 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父
+ if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
+ // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
+ if (locMastService.checkEmptyCount(locMast0, 10)) {
+ locMast = locMast0;
+ break;
+ }
}
}
}
}
+
}
//鎵惧唴渚х┖搴撲綅(闈炴渶澶栦晶搴撲綅)
@@ -344,22 +350,24 @@
if (locMast == null) {
//闅忔満鍙敤鍫嗗灈鏈哄彿
Integer randomCrnNo = Utils.getRandomCrnNo(crnNos, locTypeDto.getLocType1());
- List<LocMast> locMasts = locMastService.findInEmptyLocMast(locTypeDto.getLocType1(), rows, randomCrnNo);//鎵句竴鏉℃柊鐨勭┖宸烽亾
- for (LocMast locMast0 : locMasts) {
- //妫�娴嬪綋鍓嶅簱浣嶅唴渚у叾浠栧簱浣嶆槸鍚︿负D銆丗銆乆
- if (Utils.checkInsideLocIsDFX(locMast0.getLocNo())) {
- //鍐呬晶鍏朵粬搴撲綅涓嶆槸D銆丗銆乆銆備笉鑳介�夊彇璇ュ簱浣�
- continue;
- }
+ for (Integer crnNo : crnNos) {
+ List<LocMast> locMasts = locMastService.findInEmptyLocMast(locTypeDto.getLocType1(), rows, crnNo);//鎵句竴鏉℃柊鐨勭┖宸烽亾
+ for (LocMast locMast0 : locMasts) {
+ //妫�娴嬪綋鍓嶅簱浣嶅唴渚у叾浠栧簱浣嶆槸鍚︿负D銆丗銆乆
+ if (Utils.checkInsideLocIsDFX(locMast0.getLocNo())) {
+ //鍐呬晶鍏朵粬搴撲綅涓嶆槸D銆丗銆乆銆備笉鑳介�夊彇璇ュ簱浣�
+ continue;
+ }
- // 娴呭簱浣嶇鍚堝昂瀵告娴�
- if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
- // 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父
- if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
- // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
- if (locMastService.checkEmptyCount(locMast0, 10)) {
- locMast = locMast0;
- break;
+ // 娴呭簱浣嶇鍚堝昂瀵告娴�
+ if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
+ // 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父
+ if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
+ // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
+ if (locMastService.checkEmptyCount(locMast0, 10)) {
+ locMast = locMast0;
+ break;
+ }
}
}
}
@@ -415,7 +423,7 @@
List<LocMast> locMasts = locMastService.findEmptyLowFrequencyLocMast(locTypeDto.getLocType1(), randomCrnNo);
for (LocMast locMast0 : locMasts) {
//妫�娴嬪綋鍓嶅簱浣嶅唴渚у叾浠栧簱浣嶆槸鍚︿负D銆丗銆乆
- if (Utils.checkInsideLocIsDFX(locMast0.getLocNo())) {
+ if (Utils.checkInsideLocIsDFX2(locMast0.getLocNo())) {
//鍐呬晶鍏朵粬搴撲綅涓嶆槸D銆丗銆乆銆備笉鑳介�夊彇璇ュ簱浣�
continue;
}
@@ -441,10 +449,17 @@
if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
// 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父
if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
- // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
- if (locMastService.checkEmptyCount(locMast0, 10)) {
+ Integer outermostRow = Utils.getOutermostRow(locMast0.getLocNo(), true);
+ LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", outermostRow).eq("bay1", locMast0.getBay1()).eq("lev1", locMast0.getLev1()));
+ if (!locMast1.getLocSts().equals("O") && !locMast0.getRow1().equals(outermostRow)){
+ // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
+ if (locMastService.checkEmptyCount0(locMast0, 5)) {
+ locMast = locMast0;
+ }
+ }else {
locMast = locMast0;
}
+
}
}
}
@@ -462,7 +477,13 @@
StaDesc staDesc = staDescService.selectOne(wrapper);
if (Cools.isEmpty(staDesc)) {
log.error("鍏ュ簱璺緞涓嶅瓨鍦�, staDescId={}, sourceStaNo={}, crnNo={}", staDescId, sourceStaNo, locMast.getCrnNo());
- throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
+ if (sourceStaNo==103 && locMast.getCrnNo()==3){
+ throw new CoolException("璇锋斁鍒�203鍏ュ簱鍙�");
+ }else if (sourceStaNo==203 && locMast.getCrnNo()==1){
+ throw new CoolException("璇锋斁鍒�103鍏ュ簱鍙�");
+ }else {
+ throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
+ }
}
// 妫�娴嬬洰鏍囩珯
--
Gitblit v1.9.1