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 | 45 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 34 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 6f2f89f..c3e2a43 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -316,17 +316,40 @@
// 搴撳尯閿佸畾
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) {
+
}
}
@@ -358,7 +381,7 @@
if (Cools.isEmpty(locMast)) {
int sign = curRow;
- while (sign != 0) {
+ while (sign != 0 && Cools.isEmpty(locMast)) {
List<LocMast> locMasts = locMastService.queryFreeLocMastEnd(sign, locTypeDto.getLocType1());
for (LocMast loc : locMasts) {
// 鍚屽簱浣嶇粍瀵瑰簲鍏堕挶搴撲綅鏄惁涓� O.绌哄簱浣�
--
Gitblit v1.9.1