From e3b9215ac5e9e2f430c3fe356549f18363d6dd6a Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 14 十一月 2023 09:05:30 +0800
Subject: [PATCH] # mat_type_in
---
src/main/java/com/zy/common/service/CommonService.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 8ad80c8..84ee80d 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -106,7 +106,7 @@
* @param matNos 鐗╂枡鍙烽泦鍚�
* @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
*/
- public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto) {
+ public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto, Integer matTypeIn) {
int start;
int end;
Integer matType = null;//鐗╂枡绫诲瀷
@@ -178,7 +178,9 @@
throw new CoolException("娣锋斁鐗╂枡绫诲瀷涓嶄竴鑷�");
}
}
-
+ if (!matTypeIn.equals(0)) {
+ matType = matTypeIn;
+ }
if (matNos.size() > 1 && matType == 1) {
//鐗╂枡涓哄崟鍝佺被鍨嬶紝涓旂墿鏂欑绫昏秴杩�1(瀹為檯涓洪珮棰戞贩鏀�)锛屽垯绂佹鍏ュ簱
throw new CoolException("鐗╂枡绫诲瀷鍜屽疄闄呯绫讳笉涓�鑷�");
@@ -291,6 +293,7 @@
List<String> groupLoc = Utils.getGroupLoc(wrkMast.getLocNo());
//闅忔満鍙敤鍫嗗灈鏈哄彿
Integer randomCrnNo = Utils.getRandomCrnNo(crnNos, locTypeDto.getLocType1());
+ Collections.shuffle(crnNos);
for (Integer crnNo : crnNos) {
List<LocMast> locMasts = locMastService.findEmptyLocMastByLocNos(locTypeDto.getLocType1(), groupLoc, crnNo);
for (LocMast locMast0 : locMasts) {
@@ -350,7 +353,6 @@
Boolean flag = false;
Integer randomCrnNo = Utils.getRandomCrnNo(crnNos, locTypeDto.getLocType1());
Collections.shuffle(crnNos);
- System.out.println(crnNos);
for (Integer crnNo : crnNos) {
List<LocMast> locMasts = locMastService.findInEmptyLocMast(locTypeDto.getLocType1(), rows, crnNo);//鎵句竴鏉℃柊鐨勭┖宸烽亾
for (LocMast locMast0 : locMasts) {
--
Gitblit v1.9.1