From 5144715ea4f275375c439cc3fe59253202425198 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 28 四月 2026 16:17:06 +0800
Subject: [PATCH] 1号堆垛机摆放逻辑先深后浅改为正常层列排递增
---
src/main/java/com/zy/common/service/CommonService.java | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index db604dc..e43f03f 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -397,25 +397,29 @@
if (model == null || !model.equals("208L")) {
wrapper.ne("lev1", 11);
}
- if (crnNo == 1) {
- wrapper.in("row1", 1, 4);
+// if (crnNo == 1) {
+// wrapper.in("row1", 1, 4);
+// }
+ int count = locMastService.selectCount(wrapper);
+ if (crnNo == 1 && count <= 4) {
+ continue;
}
locMast = locMastService.selectOne(wrapper);
if (locMast != null) {
break;
}
// 娣卞簱浣嶆病鏈変簡鍒欒幏鍙栦竴涓祬搴撲綅
- if (crnNo == 1) {
- locMast = locMastService.selectOne(wrapper.in("row1", 2, 3));
- if (locMast != null) {
- int count = locMastService.selectCount(wrapper);
- if (count <= 10) {
- locMast = null;
- } else {
- break;
- }
- }
- }
+// if (crnNo == 1) {
+// locMast = locMastService.selectOne(wrapper.in("row1", 2, 3));
+// if (locMast != null) {
+// int count = locMastService.selectCount(wrapper);
+// if (count <= 10) {
+// locMast = null;
+// } else {
+// break;
+// }
+// }
+// }
}
if (locMast == null) {
--
Gitblit v1.9.1