From bbfb525c87ab208f123f8f5a4c7c6a87df4a3a23 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 26 九月 2023 15:08:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs6' into bfasrs6
---
src/main/java/com/zy/common/service/CommonService.java | 2 +-
1 files changed, 1 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 8ad80c8..f46b33e 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -291,6 +291,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 +351,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