From 6fd823a0e3ef5727a8fa879d8df344d93f1a5717 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 05 五月 2026 09:47:31 +0800
Subject: [PATCH] 1号堆垛机摆放逻辑先深后浅改为正常层列排递增

---
 src/main/java/com/zy/common/service/CommonService.java |    3 ++-
 1 files changed, 2 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 e43f03f..5eec091 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -392,7 +392,7 @@
             for(BasCrnp basCrnp:basCrnpList) {
                 Integer crnNo = basCrnp.getCrnNo();
                 Wrapper<LocMast> wrapper = new EntityWrapper<LocMast>().eq("loc_sts", 'O')
-                        .eq("crn_no", crnNo).orderBy("lev1").orderBy("bay1").orderBy("row1");
+                        .eq("crn_no", crnNo);
                 // 鍏ュ簱妗跺瀷鏄笉鏄�208L
                 if (model == null || !model.equals("208L")) {
                     wrapper.ne("lev1", 11);
@@ -404,6 +404,7 @@
                 if (crnNo == 1 && count <= 4) {
                     continue;
                 }
+                wrapper.orderBy("lev1").orderBy("bay1").orderBy("row1");
                 locMast = locMastService.selectOne(wrapper);
                 if (locMast != null) {
                     break;

--
Gitblit v1.9.1