From 230615d093a235e2e481355edb47f37e380b3069 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期六, 07 六月 2025 08:09:04 +0800 Subject: [PATCH] #app --- src/main/java/com/zy/asrs/task/handler/AutoLocMoveHandler.java | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zy/asrs/task/handler/AutoLocMoveHandler.java b/src/main/java/com/zy/asrs/task/handler/AutoLocMoveHandler.java index d8bc282..d1f7212 100644 --- a/src/main/java/com/zy/asrs/task/handler/AutoLocMoveHandler.java +++ b/src/main/java/com/zy/asrs/task/handler/AutoLocMoveHandler.java @@ -4,6 +4,7 @@ import com.core.common.Cools; import com.zy.asrs.entity.LocDetl; import com.zy.asrs.entity.LocMast; +import com.zy.asrs.entity.result.FindLocNoAttributeVo; import com.zy.asrs.service.LocDetlService; import com.zy.asrs.service.LocMastService; import com.zy.asrs.service.WorkService; @@ -47,7 +48,10 @@ if (!Cools.isEmpty(locMasts) && locMasts.size()<4){ for (LocMast locMast:locMasts){ LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo())); - StartupDto startupDto = commonService.getLocNo(crnNo == 1 ? 6 : 5, ioType, crnNo == 1 ? 917 : 918, locDetl.getMatnr(), locDetl.getBatch(),locDetl.getBrand(),0, null, 0); +// StartupDto startupDto = commonService.getLocNo(crnNo == 1 ? 6 : 5, ioType, crnNo == 1 ? 917 : 918, locDetl.getMatnr(), locDetl.getBatch(),locDetl.getBrand(), null); + FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo(locDetl); + + StartupDto startupDto = commonService.getLocNo( ioType, crnNo == 1 ? 917 : 918, findLocNoAttributeVo, null); workService.locMove(locMast.getLocNo(), startupDto.getLocNo(),9527L); } return SUCCESS; @@ -67,7 +71,10 @@ List<LocDetl> locDetlList = locDetlService.selectLocDetlUnilateralMoveShuttle(matnr, batch, grade, crnNo); for (LocDetl locDetl : locDetlList) { - StartupDto startupDto = commonService.getLocNo(crnNo == 1 ? 4 : 3, ioType, crnNo == 1 ? 901 : 932, locDetl.getMatnr(), locDetl.getBatch(), locDetl.getBrand(),0, null, 0); +// StartupDto startupDto = commonService.getLocNo(crnNo == 1 ? 4 : 3, ioType, crnNo == 1 ? 901 : 932, locDetl.getMatnr(), locDetl.getBatch(), locDetl.getBrand(), null); + FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo(locDetl); + + StartupDto startupDto = commonService.getLocNo( ioType, crnNo == 1 ? 901 : 932, findLocNoAttributeVo, null); workService.locMove(locDetl.getLocNo(), startupDto.getLocNo(), 9527L); } } -- Gitblit v1.9.1