From 96c5a749f14c3dea75ff774e5eed2921ba0f2555 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期三, 17 十二月 2025 09:52:02 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/common/service/CommonService.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index bd943cc..f94e117 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -214,14 +214,14 @@
//鐩歌繎鐗╂枡鍖归厤澶辫触锛屾悳绱㈠彲鐢ㄧ┖搴撲綅缁�
//鑾峰彇璁惧妤煎眰
- List<Integer> levList = basCrnpService.getLevList();
- Collections.shuffle(levList);
+// List<Integer> levList = basCrnpService.getLevList();
+// Collections.shuffle(levList);
List<Integer> locLevList = locMastService.getLevList();
- levList.addAll(locLevList);
+// levList.addAll(locLevList);
- for (Integer lev : levList) {
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "O").eq("lev1", lev).orderBy("bay1", true));
+ for (Integer lev : locLevList) {
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "O").eq("lev1", lev).orderBy("bay1", true).orderBy("row1",true));
for (LocMast locMast : locMasts) {
String locNo = locMast.getLocNo();
//鑾峰彇閫氶亾缁�
@@ -291,15 +291,15 @@
if (targetLocMast == null){
//鑾峰彇璁惧妤煎眰
- List<Integer> levList = basCrnpService.getLevList();
- Collections.shuffle(levList);
+// List<Integer> levList = basCrnpService.getLevList();
+// Collections.shuffle(levList);
List<Integer> locLevList = locMastService.getLevList();
- levList.addAll(locLevList);
+// levList.addAll(locLevList);
- for (Integer lev : levList) {
+ for (Integer lev : locLevList) {
//鐩歌繎鐗╂枡鍖归厤澶辫触锛屾悳绱㈠彲鐢ㄧ┖搴撲綅缁�
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "O").eq("lev1", lev).orderBy("bay1", true));
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "O").eq("lev1", lev).orderBy("bay1", true).orderBy("row1",true));
for (LocMast locMast : locMasts) {
String locNo = locMast.getLocNo();
//鑾峰彇閫氶亾缁�
--
Gitblit v1.9.1