From 506a5448f2b5a2285c3ac97dfb116dc24508c569 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期六, 02 十二月 2023 09:49:52 +0800
Subject: [PATCH] #库位规则、编码规则同一批货只能放同一组库位
---
src/main/java/com/zy/common/service/CommonService.java | 26 ++++++++++++++++----------
1 files changed, 16 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 b7887ae..e322c8c 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -203,11 +203,14 @@
List<LocMast> locMasts = locMastService.queryFreeLocMast2(locTypeDto.getLocType1(), locRule.getRowBeg(), locRule.getRowEnd(), locRule.getBayBeg(), locRule.getBayEnd(), locRule.getLevBeg(), locRule.getLevEnd());
for (LocMast locMast0 : locMasts) {
- LocMast locMast1 = locMastService.findInnerLoc(locMast0.getLocNo());//妫�娴嬪悓搴撲綅缁勬繁搴撲綅鏄惁鏈夌┖闂插簱浣�
- if (locMast1 != null) {
- //棰勭暀绌哄簱浣�
- if (locMastService.checkEmptyCount(locMast1, 10)) {
- return locMast1;
+ List<String> locNos = locDetlService.getSameDetl(locMast0.getLocNo());
+ for (String locNo : locNos) {
+ LocMast locMast1 = locMastService.findInnerLoc(locNo);
+ if (null != locMast1) {
+ //棰勭暀绌哄簱浣�
+ if (locMastService.checkEmptyCount(locMast1, 10)) {
+ return locMast1;
+ }
}
}
}
@@ -253,11 +256,14 @@
List<LocMast> locMasts = locMastService.queryFreeLocMast2(locTypeDto.getLocType1(), locRule.getRowBeg(), locRule.getRowEnd(), locRule.getBayBeg(), locRule.getBayEnd(), locRule.getLevBeg(), locRule.getLevEnd());
for (LocMast locMast0 : locMasts) {
- LocMast locMast1 = locMastService.findInnerLoc(locMast0.getLocNo());//妫�娴嬪悓搴撲綅缁勬繁搴撲綅鏄惁鏈夌┖闂插簱浣�
- if (locMast1 != null) {
- //棰勭暀绌哄簱浣�
- if (locMastService.checkEmptyCount(locMast1, 10)) {
- return locMast1;
+ List<String> locNos = locDetlService.getSameDetl(locMast0.getLocNo());
+ for (String locNo : locNos) {
+ LocMast locMast1 = locMastService.findInnerLoc(locNo);
+ if (null != locMast1) {
+ //棰勭暀绌哄簱浣�
+ if (locMastService.checkEmptyCount(locMast1, 10)) {
+ return locMast1;
+ }
}
}
}
--
Gitblit v1.9.1