From bdecacdc2d57c2e4f75c977e3fdb3980fdbdccd4 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 21 八月 2024 09:07:34 +0800
Subject: [PATCH] #优化
---
src/main/java/com/zy/common/service/CommonService.java | 88 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 79 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 62637a9..d9a1a2b 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -16,10 +16,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Random;
+import java.util.*;
/**
* 璐ф灦鏍稿績鍔熻兘
@@ -36,6 +33,18 @@
public static final List<Integer> SECOND_GROUP_ROW_LIST = new ArrayList<Integer>() {{
add(18);add(19);add(20);
add(21);add(22);add(23);add(24);add(25);add(26);add(27);add(28);add(29);add(30);
+ }};
+
+ public static final List<String> HARD_LOC_NO = new ArrayList<String>() {{
+ add("0200104");add("0200704");add("0201404");add("0202004");
+ add("0600201");add("0600202");add("0600203");add("0600204");
+ add("0600301");add("0600302");add("0600303");add("0600304");
+ add("0600701");add("0600702");
+ add("0601401");add("0601402");
+ add("0602001");add("0602002");
+ add("2000704");add("2001404");add("2002004");
+ add("1600701");add("1601401");add("1602001");
+ add("1600702");add("1601402");add("1602002");
}};
@Autowired
@@ -109,7 +118,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;//鐗╂枡绫诲瀷
@@ -120,6 +129,7 @@
ArrayList<Integer> rows = new ArrayList<>();
switch (sourceStaNo) {
case 103://103鍏ュ簱绔�
+ case 113://103鍏ュ簱绔�
whsType = 1;
start = 1;
end = 14;
@@ -136,6 +146,7 @@
crnNo = 1;
break;
case 203://203鍏ュ簱绔�
+ case 213://203鍏ュ簱绔�
whsType = 2;
start = 8;
end = 21;
@@ -179,6 +190,11 @@
}
if (!matType.equals(mat.getMatType())) {
throw new CoolException("娣锋斁鐗╂枡绫诲瀷涓嶄竴鑷�");
+ }
+ }
+ if (!Cools.isEmpty(matTypeIn)) {
+ if (!matTypeIn.equals(0)) {
+ matType = matTypeIn;
}
}
@@ -288,11 +304,13 @@
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());
+ Collections.shuffle(crnNos);
for (Integer crnNo : crnNos) {
List<LocMast> locMasts = locMastService.findEmptyLocMastByLocNos(locTypeDto.getLocType1(), groupLoc, crnNo);
for (LocMast locMast0 : locMasts) {
@@ -349,7 +367,9 @@
//鏈壘鍒板贩閬擄紝鎵句竴鏉℃柊鐨勭┖宸烽亾
if (locMast == null) {
//闅忔満鍙敤鍫嗗灈鏈哄彿
+ Boolean flag = false;
Integer randomCrnNo = Utils.getRandomCrnNo(crnNos, locTypeDto.getLocType1());
+ Collections.shuffle(crnNos);
for (Integer crnNo : crnNos) {
List<LocMast> locMasts = locMastService.findInEmptyLocMast(locTypeDto.getLocType1(), rows, crnNo);//鎵句竴鏉℃柊鐨勭┖宸烽亾
for (LocMast locMast0 : locMasts) {
@@ -366,10 +386,32 @@
// 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
if (locMastService.checkEmptyCount(locMast0, 10)) {
locMast = locMast0;
+ flag = true;
break;
}
}
}
+ }
+ if (!flag) {
+ List<LocMast> locMastsNew = locMastService.findInEmptyLocMastNew(locTypeDto.getLocType1(), HARD_LOC_NO, crnNo);//鎵句竴鏉℃柊鐨勭┖宸烽亾
+ for (LocMast locMast0 : locMastsNew) {
+ //妫�娴嬪綋鍓嶅簱浣嶅唴渚у叾浠栧簱浣嶆槸鍚︿负D銆丗銆乆
+ // 娴呭簱浣嶇鍚堝昂瀵告娴�
+ if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
+ // 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父
+ if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
+ // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
+ if (locMastService.checkEmptyCount(locMast0, 10)) {
+ locMast = locMast0;
+ flag = true;
+ break;
+ }
+ }
+ }
+ }
+ }
+ if (flag) {
+ break;
}
}
}
@@ -392,9 +434,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;
}
@@ -407,6 +449,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);
}
}
@@ -423,7 +479,7 @@
List<LocMast> locMasts = locMastService.findEmptyLowFrequencyLocMast(locTypeDto.getLocType1(), randomCrnNo);
for (LocMast locMast0 : locMasts) {
//妫�娴嬪綋鍓嶅簱浣嶅唴渚у叾浠栧簱浣嶆槸鍚︿负D銆丗銆乆
- if (Utils.checkInsideLocIsDFX2(locMast0.getLocNo())) {
+ if (Utils.checkInsideLocIsDFX(locMast0.getLocNo())) {
//鍐呬晶鍏朵粬搴撲綅涓嶆槸D銆丗銆乆銆備笉鑳介�夊彇璇ュ簱浣�
continue;
}
@@ -464,6 +520,20 @@
}
}
+ //鍓旈櫎褰撳墠闅忔満鍫嗗灈鏈哄厓绱犲皾璇曢噸鏂版煡鎵�
+ 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);
+ }
+ }
+
return locMast;
}
--
Gitblit v1.9.1