From 1a30303df506698d09d106060d93d196c90c5c18 Mon Sep 17 00:00:00 2001
From: 18516761980 <tqsxp@163.com>
Date: 星期三, 08 三月 2023 07:57:53 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index e209893..11f1840 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -33,6 +33,12 @@
public static final List<Integer> SECOND_GROUP_ROW_LIST = new ArrayList<Integer>() {{
add(5);add(6);add(7);add(8);add(9);add(10);add(11);
}};
+ public static final List<Integer> FIRST_GROUP_ROW_LIST2 = new ArrayList<Integer>() {{
+ add(2);add(3);add(4);
+ }};
+ public static final List<Integer> SECOND_GROUP_ROW_LIST10 = new ArrayList<Integer>() {{
+ add(5);add(6);add(7);add(8);add(9);add(10);
+ }};
@Autowired
private WrkMastService wrkMastService;
@@ -219,6 +225,28 @@
}
}
}
+ if (Cools.isEmpty(locMast)){
+ if (rows.equals(FIRST_GROUP_ROW_LIST)){
+ rows=FIRST_GROUP_ROW_LIST2;
+ }else if (rows.equals(SECOND_GROUP_ROW_LIST)){
+ rows=SECOND_GROUP_ROW_LIST10;
+ }
+ List<LocMast> locMasts1 = locMastService.queryFreeLocMast2(rows, rows.size(), locTypeDto.getLocType1());
+ if (!Cools.isEmpty(locMasts1)) {
+ Integer innermostRow = Utils.getInnermostRow(locMasts1.get(0).getLocNo());
+ if (rows.equals(FIRST_GROUP_ROW_LIST2)){
+ innermostRow=innermostRow+1;
+ }else if (rows.equals(SECOND_GROUP_ROW_LIST10)){
+ innermostRow=innermostRow-1;
+ }
+ for (LocMast one : locMasts1) {
+ if (one.getRow1().equals(innermostRow)) {
+ locMast = one;
+ break;
+ }
+ }
+ }
+ }
// 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
if (!locMastService.checkEmptyCount(locMast, 10)) {
locMast = null;
--
Gitblit v1.9.1