From 5432c0400c5140c4aaa0321d7d173ed778a32536 Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Thu, 21 Nov 2024 17:16:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E8=A3=85=E9=85=8D=E4=BB=B6?= =?UTF-8?q?=E6=9C=89=E5=B1=95=E7=A4=BA=E9=A1=BA=E5=BA=8F=EF=BC=8C=E5=9C=A8?= =?UTF-8?q?ptr=E6=9B=BF=E6=8D=A2=E6=98=AF=E9=9C=80=E8=A6=81=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2=E7=9B=AE=E8=A7=86=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../strategy/AssemblyVisualListPrintStrategy.java | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 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 8d85ef2..5169df9 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 @@ -79,13 +79,28 @@ public class AssemblyVisualListPrintStrategy implements IPrintTemplateStrategySe // 总个数 Integer totalCount = partProdGroup.getTotalCount(); + Map> collect = workOrderAssemblyList.stream().collect(Collectors.groupingBy(MesWorkOrderAssembly::getDisplaySeq)); // 为空时显示内容 String isNullViewContent = StringUtils.isEmpty(partProdGroup.getIsNullViewContent()) ? "" : partProdGroup.getIsNullViewContent(); - for (Integer index = 0; index < totalCount; index++) { - String displayValue = workOrderAssemblyList.size() -1 < index ? isNullViewContent : workOrderAssemblyList.get(index).getDisplayValue(); + for (int index = 0; index < collect.size(); index++) { + List orderAssemblyList = collect.get(index+1); + List disPlayValues = orderAssemblyList.stream().map(MesWorkOrderAssembly::getDisplayValue).distinct().collect(Collectors.toList()); + String displayValue =isNullViewContent; + if(!disPlayValues.isEmpty()){ + displayValue = String.join("\r\n", disPlayValues); + } + // String displayValue = workOrderAssemblyList.size() -1 < index ? isNullViewContent : workOrderAssemblyList.get(index).getDisplayValue(); - resultMap.put(MesExtConstWords.ASSEMBLY_PARAM + (index+1), StringUtils.isEmpty(displayValue) ? StringUtils.isEmpty(isNullViewContent) ? "" : null : displayValue); +// resultMap.put(MesPcnExtConstWords.ASSEMBLY_PARAM + (index+1), StringUtils.isEmpty(displayValue) ? StringUtils.isEmpty(isNullViewContent) ? "" : isNullViewContent : displayValue); + resultMap.put(MesExtConstWords.ASSEMBLY_PARAM + (index+1), displayValue); } + // 为空时显示内容 +// String isNullViewContent = StringUtils.isEmpty(partProdGroup.getIsNullViewContent()) ? "" : partProdGroup.getIsNullViewContent(); +// for (Integer index = 0; index < totalCount; index++) { +// String displayValue = workOrderAssemblyList.size() -1 < index ? isNullViewContent : workOrderAssemblyList.get(index).getDisplayValue(); +// +// resultMap.put(MesExtConstWords.ASSEMBLY_PARAM + (index+1), StringUtils.isEmpty(displayValue) ? StringUtils.isEmpty(isNullViewContent) ? "" : null : displayValue); +// } printDataMapList.add(resultMap);