From ca6062762cf95a074635626ce185d2fd14512e76 Mon Sep 17 00:00:00 2001 From: Junjie <540245094@qq.com> Date: 星期三, 20 十二月 2023 16:16:07 +0800 Subject: [PATCH] #提升机异常码 --- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java index 0abf358..a2fb473 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -2894,7 +2894,7 @@ ledCommand.setLocNo(locNo); ledCommand.setStaNo(wrkStaNo); ledCommand.setBarcode(barcode); - if (ioType != 110 && ioType != 10 && ioType != 107) { + if (ioType != 110 && ioType != 10) { List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", sourceLocNo)); locDetls.forEach(locDetl -> { Wrapper<WrkDetl> wrapper = new EntityWrapper<WrkDetl>().eq("matnr", locDetl.getMatnr()).eq("wrk_no", wrkNo); @@ -2927,6 +2927,11 @@ }); + if (ioType == 107) { + locDetls = new ArrayList<>(); + ledCommand.setMatDtos(new ArrayList<>()); + } + if (locDetls.isEmpty()) { List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkNo)); wrkDetls.forEach(wrkDetl -> { @@ -2938,7 +2943,6 @@ for (WrkDetlLog wrkDetlLog : wrkDetlLogs) { ledCommand.getMatDtos().add(new MatDto(wrkDetlLog.getMatnr(), wrkDetlLog.getMaktx(), wrkDetlLog.getAnfme(), wrkDetlLog.getAnfme(), wrkDetlLog.getSpecs(), wrkDetlLog.getSuppCode())); } - } } } -- Gitblit v1.9.1