From ca2a6d455604056ce628f296911f6abac85a7598 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 15 七月 2025 09:54:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ytflWms' into ytflWms
---
src/main/java/com/zy/common/service/CommonService.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index bc3d255..87de7d8 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -231,7 +231,7 @@
//灏濊瘯鎵�1鍙峰集杞ㄥ爢鍨涙満搴撲綅
crnNo = 1;
if (basCrnpService.checkSiteError(crnNo, true)) {
- List<Integer> nearRowList = new ArrayList<Integer>(){{add(3);add(4);add(1);add(6);}};
+ List<Integer> nearRowList = new ArrayList<Integer>(){{add(4);add(6);add(3);add(1);}};
for (Integer near : nearRowList) {
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("row1", near)
@@ -298,7 +298,7 @@
.eq("crn_no", locMast1.getCrnNo())
.eq("bay1", locMast1.getBay1())
.notIn("loc_sts", "O")
- .orderBy("row1", true)
+ .orderBy("row1", false)
);
if (locMastList.isEmpty()) {
locMast = locMast1;
--
Gitblit v1.9.1