From fdb6c647f4b9bf1a9dae9349cfd64a5e533433d2 Mon Sep 17 00:00:00 2001 From: Administrator <56479841@QQ.COM> Date: 星期四, 21 九月 2023 09:38:59 +0800 Subject: [PATCH] #补丁 --- src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 5 +++-- src/main/java/com/zy/common/service/CommonService.java | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java index ca96989..5bd34d0 100644 --- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java @@ -113,7 +113,7 @@ // 鐢熸垚鍏ュ簱閫氱煡妗� List<DetlDto> detlDtos = new ArrayList<>(); param.getCombMats().forEach(elem -> { - elem.setBatch(""); +// elem.setBatch(""); DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(), elem.getMemo(), elem.getCstmr()); if (Cools.isEmpty(detlDto.getBatch())){ @@ -138,7 +138,8 @@ } WaitPakin waitPakin = new WaitPakin(); waitPakin.sync(mat); - waitPakin.setBatch(""); +// waitPakin.setBatch(""); + waitPakin.setBatch(detlDto.getBatch()); waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮� waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵�� waitPakin.setAnfme(detlDto.getAnfme()); // 鏁伴噺 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