From e77de9f405ea5cf8f50126d64a58fbf47c4a3350 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 06 二月 2023 10:08:59 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 122 ++++++++++++++++++++++++++++------------
1 files changed, 84 insertions(+), 38 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 249584e..c3e2a43 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -314,19 +314,42 @@
if (locMast == null) {
// 搴撳尯閿佸畾
- LocRule locRule = locRuleService.find(Cools.isEmpty(matNos) ? null : matNos.get(0), null);
+ LocRule locRule = locRuleService.find(Cools.isEmpty(matNos) ? null : matNos.get(0), null, start, end);
if (!Cools.isEmpty(locRule)) {
- List<Integer> rows = Utils.getGroupLoc(locRule.getRowBeg());
- List<LocMast> locMasts = locMastService.queryFreeLocMast1(rows, rows.size(), locTypeDto.getLocType1(), inoutEveryday
+ // plan first
+// List<Integer> rows = Utils.getGroupLoc(locRule.getRowBeg());
+// List<LocMast> locMasts = locMastService.queryFreeLocMast1(rows, rows.size(), locTypeDto.getLocType1(), inoutEveryday
+// , locRule.getRowBeg(), locRule.getRowEnd(), locRule.getBayBeg(), locRule.getBayEnd(), locRule.getLevBeg(), locRule.getLevEnd());
+// if (!Cools.isEmpty(locMasts)) {
+// Integer innermostRow = Utils.getInnermostRow(locMasts.get(0).getLocNo());
+// for (LocMast one : locMasts) {
+// if (one.getRow1().equals(innermostRow)) {
+// locMast = one;
+// crnNo = locMast.getCrnNo();
+// wrapper = new EntityWrapper<StaDesc>()
+// .eq("type_no", staDescId)
+// .eq("stn_no", sourceStaNo)
+// .eq("crn_no", crnNo);
+// staDesc = staDescService.selectOne(wrapper);
+// if (Cools.isEmpty(staDesc)) {
+// log.error("鍏ュ簱璺緞涓嶅瓨鍦�, staDescId={}, sourceStaNo={}, crnNo={}", staDescId, sourceStaNo, crnNo);
+// throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
+// }
+// // 妫�娴嬬洰鏍囩珯
+// staNo = basDevpService.selectById(staDesc.getCrnStn());
+// if (!staNo.getAutoing().equals("Y")) {
+// throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
+// }
+// break;
+// }
+// }
+// }
+
+ // plan second
+ List<LocMast> locMasts = locMastService.queryFreeLocMast2(locTypeDto.getLocType1()
, locRule.getRowBeg(), locRule.getRowEnd(), locRule.getBayBeg(), locRule.getBayEnd(), locRule.getLevBeg(), locRule.getLevEnd());
- if (!Cools.isEmpty(locMasts)) {
- Integer innermostRow = Utils.getInnermostRow(locMasts.get(0).getLocNo());
- for (LocMast one : locMasts) {
- if (one.getRow1().equals(innermostRow)) {
- locMast = one;
- break;
- }
- }
+ for (LocMast one : locMasts) {
+
}
}
@@ -354,40 +377,63 @@
}
// 2.鏃犲簱浣嶆椂锛屾棤瑙嗗尯鍩熼攣瀹氾紝閲嶆柊鏌ユ壘搴撲綅
- if (Cools.isEmpty(locMast)){
- List<LocMast> locMasts = locMastService.queryFreeLocMastEnd(curRow);
- int sign=curRow;
- while (true){
- if (locMasts.size()==0){
- sign = getCurRow(sign);
- if (sign != 0){
- locMasts = locMastService.queryFreeLocMastEnd(sign);
- }else {
- break;
- }
- }else {
- break;
- }
- }
- for (LocMast locMast1 : locMasts){
- List<LocMast> locMasts1 = locMastService.queryFreeLocMastEnd0(locMast1.getBay1(), locMast1.getLev1(),locMast1.getRow1());
- Integer innermostRow = Utils.getInnermostRow(locMasts1.get(0).getLocNo());
- for (LocMast locMast2:locMasts1){
- if (locMast2.getLocSts().equals("O")){
- if (locMast2.getRow1().equals(innermostRow)) {
- locMast = locMast2;
- break;
+
+
+ if (Cools.isEmpty(locMast)) {
+ int sign = curRow;
+ while (sign != 0 && Cools.isEmpty(locMast)) {
+ List<LocMast> locMasts = locMastService.queryFreeLocMastEnd(sign, locTypeDto.getLocType1());
+ for (LocMast loc : locMasts) {
+ // 鍚屽簱浣嶇粍瀵瑰簲鍏堕挶搴撲綅鏄惁涓� O.绌哄簱浣�
+ boolean success = true;
+ List<String> outerLoc = Utils.getGroupOuterLoc(loc.getLocNo());
+ for (String outerLocNo : outerLoc) {
+ if (!locMastService.selectById(outerLocNo).getLocSts().equals("O")) {
+ success = false; break;
}
- }else if (!locMast2.getLocSts().equals("F")){
+ }
+ if (success) {
+ locMast = loc;
break;
}
}
- if (!Cools.isEmpty(locMast)){
- break;
- }
+ sign = getCurRow(sign);
}
}
+
+// if (Cools.isEmpty(locMast)){
+// List<LocMast> locMasts = locMastService.queryFreeLocMastEnd(curRow, locTypeDto.getLocType1());
+// int sign=curRow;
+// while (true){
+// if (locMasts.size()==0){
+// sign = getCurRow(sign);
+// if (sign != 0){
+// locMasts = locMastService.queryFreeLocMastEnd(sign, locTypeDto.getLocType1());
+// }else {
+// break;
+// }
+// }else {
+// break;
+// }
+// }
+// for (LocMast locMast1 : locMasts){
+// List<LocMast> locMasts1 = locMastService.queryFreeLocMastEnd0(locMast1.getBay1(), locMast1.getLev1(),locMast1.getRow1(), locTypeDto.getLocType1());
+// Integer innermostRow = Utils.getInnermostRow(locMasts1.get(0).getLocNo());
+// for (LocMast locMast2:locMasts1){
+// if (locMast2.getLocSts().equals("O")){
+// locMast = locMast2;
+// break;
+// }else if (!locMast2.getLocSts().equals("F")){
+// break;
+// }
+// }
+// if (!Cools.isEmpty(locMast)){
+// break;
+// }
+// }
+// }
+
// 3.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣�
if (Cools.isEmpty(locMast)) {
// 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊
--
Gitblit v1.9.1