From 94eb8aa5fc89c199b7e05d25acd64f65d6053f32 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sun, 24 Nov 2024 17:37:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=20=E7=9B=AE=E8=A7=86?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../strategy/AssemblyVisualListPrintStrategy.java | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/print/strategy/AssemblyVisualListPrintStrategy.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/print/strategy/AssemblyVisualListPrintStrategy.java index 8a2132d..6eb3583 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/print/strategy/AssemblyVisualListPrintStrategy.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/print/strategy/AssemblyVisualListPrintStrategy.java @@ -85,17 +85,16 @@ public class AssemblyVisualListPrintStrategy implements IPrintTemplateStrategySe Map> collect = CollectionUtils.isEmpty(workOrderAssemblyList) ? null : workOrderAssemblyList.stream().filter(o -> null != o).collect(Collectors.groupingBy(MesWorkOrderAssembly::getDisplaySeq)); // 为空时显示内容 String isNullViewContent = StringUtils.isEmpty(partProdGroup.getIsNullViewContent()) ? "" : partProdGroup.getIsNullViewContent(); - if (!CollectionUtils.isEmpty(collect)) { - for (Integer displaySeq : collect.keySet()) { - List orderAssemblyList = collect.get(displaySeq); - List disPlayValues = (orderAssemblyList.stream().filter(o -> (null != o && !StringUtils.isEmpty(o.getDisplayValue()))).map(MesWorkOrderAssembly::getDisplayValue).collect(Collectors.toList())) - .stream().filter(o -> !StringUtils.isEmpty(o)).distinct().collect(Collectors.toList()); - String displayValue = isNullViewContent; - if(!CollectionUtils.isEmpty(disPlayValues)){ - displayValue = String.join("\r\n", disPlayValues); - } - resultMap.put(MesExtConstWords.ASSEMBLY_PARAM + displaySeq, displayValue); + for (int i = 1; i <= 9; i ++) { + List orderAssemblyList = CollectionUtils.isEmpty(collect) ? null : collect.get(i); + List disPlayValues = CollectionUtils.isEmpty(orderAssemblyList) ? null : + (orderAssemblyList.stream().filter(o -> (null != o && !StringUtils.isEmpty(o.getDisplayValue()))).map(MesWorkOrderAssembly::getDisplayValue).collect(Collectors.toList())) + .stream().filter(o -> !StringUtils.isEmpty(o)).distinct().collect(Collectors.toList()); + String displayValue = isNullViewContent; + if(!CollectionUtils.isEmpty(disPlayValues)){ + displayValue = String.join("\r\n", disPlayValues); } + resultMap.put(MesExtConstWords.ASSEMBLY_PARAM + i, displayValue); } printDataMapList.add(resultMap);