From af11b74ea0ec26ed8765244b3f51fad5aca9142a Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 05 十一月 2024 11:19:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxgtasrs' into jxgtasrs
---
src/main/java/com/zy/common/service/CommonService.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index e9a4dfd..980c5e6 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -374,7 +374,7 @@
locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("row1", nearRow)
.eq("loc_sts", "O").eq("whs_type",rowLastnoType.getType().longValue())
- .orderBy("row1",false).orderBy("lev1",true).orderBy("bay1",true));
+ .orderBy("lev1",true).orderBy("bay1",false));
}else {
locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("row1", nearRow)
@@ -790,6 +790,9 @@
continue;
}
for (LocMast locMastGro1 : locMasts1) {
+ if (locMastGro1.getLocSts().equals("P") || locMastGro1.getLocSts().equals("Q")) {
+ break;
+ }
if (locMastGro1.getLocSts().equals("O")){
locMast = locMastGro1;
break;
--
Gitblit v1.9.1