From 9f83a9d589aaf22cb790515272a425216ea618b2 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期六, 27 九月 2025 16:57:23 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 47 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 42 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index fa5eb7c..faefd3f 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -175,6 +175,10 @@
for (Integer row : locRowGroupDesc) {
String deepLocNo = Utils.getLocNo(row, Utils.getBay(locNo), Utils.getLev(locNo));
LocMast deepLoc = locMastService.selectById(deepLocNo);
+ if (deepLoc == null) {
+ continue;
+ }
+
if (deepLoc.getLocSts().equals("F")) {
continue;
} else if (deepLoc.getLocSts().equals("O")) {
@@ -194,6 +198,9 @@
List<Integer> levList = basCrnpService.getLevList();
Collections.shuffle(levList);
+ List<Integer> locLevList = locMastService.getLevList();
+ levList.addAll(locLevList);
+
for (Integer lev : levList) {
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("loc_sts", "O")
@@ -208,6 +215,10 @@
for (Integer row : locRowGroupDesc) {
String deepLocNo = Utils.getLocNo(row, Utils.getBay(locNo), Utils.getLev(locNo));
LocMast deepLoc = locMastService.selectById(deepLocNo);
+ if (deepLoc == null) {
+ continue;
+ }
+
if (!deepLoc.getLocSts().equals("O")) {
flag = false;
break;
@@ -215,10 +226,16 @@
}
if (flag) {
- Integer firstRow = locRowGroupDesc.get(0);
- String deepLocNo = Utils.getLocNo(firstRow, Utils.getBay(locNo), Utils.getLev(locNo));
- LocMast deepLoc = locMastService.selectById(deepLocNo);
- targetLocMast = deepLoc;
+ for (Integer row : locRowGroupDesc) {
+ String deepLocNo = Utils.getLocNo(row, Utils.getBay(locNo), Utils.getLev(locNo));
+ LocMast deepLoc = locMastService.selectById(deepLocNo);
+ if (deepLoc == null) {
+ continue;
+ }
+
+ targetLocMast = deepLoc;
+ break;
+ }
break;
}
}
@@ -245,6 +262,10 @@
for (Integer row : locRowGroupDesc) {
String deepLocNo = Utils.getLocNo(row, Utils.getBay(locNo), Utils.getLev(locNo));
LocMast deepLoc = locMastService.selectById(deepLocNo);
+ if (deepLoc == null) {
+ continue;
+ }
+
if (deepLoc.getLocSts().equals("F")) {
continue;
} else if (deepLoc.getLocSts().equals("O")) {
@@ -263,6 +284,9 @@
List<Integer> levList = basCrnpService.getLevList();
Collections.shuffle(levList);
+ List<Integer> locLevList = locMastService.getLevList();
+ levList.addAll(locLevList);
+
for (Integer lev : levList) {
//鐩歌繎鐗╂枡鍖归厤澶辫触锛屾悳绱㈠彲鐢ㄧ┖搴撲綅缁�
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
@@ -278,6 +302,10 @@
for (Integer row : locRowGroupDesc) {
String deepLocNo = Utils.getLocNo(row, Utils.getBay(locNo), Utils.getLev(locNo));
LocMast deepLoc = locMastService.selectById(deepLocNo);
+ if (deepLoc == null) {
+ continue;
+ }
+
if (!deepLoc.getLocSts().equals("O")) {
flag = false;
break;
@@ -285,7 +313,16 @@
}
if (flag) {
- targetLocMast = locMast;
+ for (Integer row : locRowGroupDesc) {
+ String deepLocNo = Utils.getLocNo(row, Utils.getBay(locNo), Utils.getLev(locNo));
+ LocMast deepLoc = locMastService.selectById(deepLocNo);
+ if (deepLoc == null) {
+ continue;
+ }
+
+ targetLocMast = deepLoc;
+ break;
+ }
break;
}
}
--
Gitblit v1.9.1