From 49d91d5206cc9303294ad170cbb7344373d47c59 Mon Sep 17 00:00:00 2001 From: whycq <10027870+whycq@user.noreply.gitee.com> Date: 星期二, 26 九月 2023 09:02:27 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs6' into bfasrs6 --- src/main/java/com/zy/common/service/CommonService.java | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java index 24ea988..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) { -- Gitblit v1.9.1