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 | 40 +++++++++++++++++++++++++---------------
1 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index b584959..5eec091 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -194,7 +194,12 @@
// if (wrkMastList.size() == 0) {
// 鍙栨柊搴撲綅缁勭殑绗竴涓簱浣�
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("crn_no", 4).eq("loc_sts", "O"));
+ Wrapper<LocMast> wrapper = new EntityWrapper<LocMast>().eq("crn_no", 4).eq("loc_sts", "O");
+ String model = findLocNoAttributeVo.getModel(); // 褰撳墠妗剁被鍨�
+ if (model.equals("IBC")) { // 鏈�涓婇潰涓�灞傚彧鑳芥斁208L
+ wrapper.ne("lev1", 11);
+ }
+ List<LocMast> locMasts = locMastService.selectList(wrapper);
List<LocMast> collect = locMasts.stream().filter(locMast1 -> locMast1.getRow1() == 9 || locMast1.getRow1() == 11).collect(Collectors.toList());
List<LocMast> collect1 = locMasts.stream().filter(locMast1 -> locMast1.getRow1() == 10 || locMast1.getRow1() == 12).collect(Collectors.toList()); // 绗竴涓厛鏀捐繖涓ゆ帓
if (collect.size() - wrkMastList.size() <= 0 && collect1.size() - wrkMastList.size() <= 0) {
@@ -387,30 +392,35 @@
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);
}
- 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;
}
+ wrapper.orderBy("lev1").orderBy("bay1").orderBy("row1");
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