From d1480e6c40cbcaf7e0dd6349153a461a3635bee3 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 19 八月 2024 09:04:39 +0800
Subject: [PATCH] #优化
---
src/main/java/com/zy/common/service/CommonService.java | 194 ++++++++++++++++++++++++++++++++----------------
1 files changed, 130 insertions(+), 64 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 823a720..9090ac1 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -16,9 +16,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
+import java.util.*;
/**
* 璐ф灦鏍稿績鍔熻兘
@@ -108,7 +106,7 @@
* @param matNos 鐗╂枡鍙烽泦鍚�
* @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
*/
- public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto) {
+ public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto, Integer matTypeIn) {
int start;
int end;
Integer matType = null;//鐗╂枡绫诲瀷
@@ -119,6 +117,7 @@
ArrayList<Integer> rows = new ArrayList<>();
switch (sourceStaNo) {
case 103://103鍏ュ簱绔�
+ case 113://103鍏ュ簱绔�
whsType = 1;
start = 1;
end = 14;
@@ -135,12 +134,13 @@
crnNo = 1;
break;
case 203://203鍏ュ簱绔�
+ case 213://203鍏ュ簱绔�
whsType = 2;
start = 8;
end = 21;
//203绔欏垎閰�2锛�3鍫嗗灈鏈�
-// crnNos.add(2);
+ crnNos.add(2);
crnNos.add(3);
//鍒嗛厤8锛�14锛�15锛�21鎺�
@@ -170,7 +170,7 @@
}
//3鍙峰彲浠ュ叆搴撳墠蹇呴』鎵撳紑鎺у埗
- if (!Cools.isEmpty(matNos) && crnNo==3) {
+ if (!Cools.isEmpty(matNos)) {
for (String matNo : matNos) {
Mat mat = matService.selectByMatnr(matNo);
if (matType == null) {
@@ -178,6 +178,11 @@
}
if (!matType.equals(mat.getMatType())) {
throw new CoolException("娣锋斁鐗╂枡绫诲瀷涓嶄竴鑷�");
+ }
+ }
+ if (!Cools.isEmpty(matTypeIn)) {
+ if (!matTypeIn.equals(0)) {
+ matType = matTypeIn;
}
}
@@ -193,6 +198,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,28 +227,28 @@
- 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){
+// //----------------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
@@ -280,31 +292,36 @@
private LocMast getLocNoStep2(LocTypeDto locTypeDto, List<String> matNos, List<Integer> rows, List<Integer> crnNos) {
LocMast locMast = null;
//鍏堟壘宸ヤ綔妗�
+
List<WrkMast> wrkMasts = wrkMastService.selectSameWrkMast(matNos.get(0));
for (WrkMast wrkMast : wrkMasts) {
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;
- }
+ Collections.shuffle(crnNos);
+ 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;
+ }
}
}
}
}
+
}
//鎵惧唴渚х┖搴撲綅(闈炴渶澶栦晶搴撲綅)
@@ -338,25 +355,33 @@
//鏈壘鍒板贩閬擄紝鎵句竴鏉℃柊鐨勭┖宸烽亾
if (locMast == null) {
//闅忔満鍙敤鍫嗗灈鏈哄彿
+ Boolean flag = false;
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;
- }
+ Collections.shuffle(crnNos);
+ 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;
+ flag = true;
+ break;
+ }
}
}
+ }
+ if (flag) {
+ break;
}
}
}
@@ -379,9 +404,9 @@
//鎵炬渶澶栦晶绌哄簱浣�
List<LocMast> locMasts = locMastService.findOutMast(locTypeDto.getLocType1(), randomCrnNos);
for (LocMast locMast0 : locMasts) {
- //妫�娴嬪綋鍓嶅簱浣嶅唴渚у叾浠栧簱浣嶆槸鍚︿负D銆丗銆乆
- if (Utils.checkInsideLocIsDFX(locMast0.getLocNo())) {
- //鍐呬晶鍏朵粬搴撲綅涓嶆槸D銆丗銆乆銆備笉鑳介�夊彇璇ュ簱浣�
+ //妫�娴嬪綋鍓嶅簱浣嶅唴渚у叾浠栧簱浣嶆槸鍚︿负D銆丗銆乆銆丱
+ if (Utils.checkInsideLocIsDFXO(locMast0.getLocNo())) {
+ //鍐呬晶鍏朵粬搴撲綅涓嶆槸D銆丗銆乆銆丱銆備笉鑳介�夊彇璇ュ簱浣�
continue;
}
@@ -394,6 +419,20 @@
locMast = locMast0;
}
}
+ }
+ }
+
+ //鍓旈櫎褰撳墠闅忔満鍫嗗灈鏈哄厓绱犲皾璇曢噸鏂版煡鎵�
+ if (locMast == null) {
+ ArrayList<Integer> crns = new ArrayList<>();
+ for (int crnNo : crnNos) {
+ if (randomCrnNo == crnNo) {
+ continue;
+ }
+ crns.add(crnNo);
+ }
+ if (!crns.isEmpty()) {
+ return getLocNoStep3(locTypeDto, crns);
}
}
@@ -436,11 +475,32 @@
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;
}
+
}
+ }
+ }
+
+ //鍓旈櫎褰撳墠闅忔満鍫嗗灈鏈哄厓绱犲皾璇曢噸鏂版煡鎵�
+ if (locMast == null) {
+ ArrayList<Integer> crns = new ArrayList<>();
+ for (int crnNo : crnNos) {
+ if (randomCrnNo == crnNo) {
+ continue;
+ }
+ crns.add(crnNo);
+ }
+ if (!crns.isEmpty()) {
+ return getLocNoStep4(locTypeDto, crns);
}
}
@@ -457,7 +517,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