打印 目视单

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<Integer, List<MesWorkOrderAssembly>> 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 (int i = 1; i <= 9; i ++) {
-            for (Integer displaySeq : collect.keySet()) {
+            List<MesWorkOrderAssembly> orderAssemblyList = CollectionUtils.isEmpty(collect) ? null : collect.get(i);
-                List<MesWorkOrderAssembly> orderAssemblyList = collect.get(displaySeq);
+            List<String> disPlayValues = CollectionUtils.isEmpty(orderAssemblyList) ? null :
-                List<String> disPlayValues = (orderAssemblyList.stream().filter(o -> (null != o && !StringUtils.isEmpty(o.getDisplayValue()))).map(MesWorkOrderAssembly::getDisplayValue).collect(Collectors.toList()))
+                    (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());
+                            .stream().filter(o -> !StringUtils.isEmpty(o)).distinct().collect(Collectors.toList());
-                String displayValue = isNullViewContent;
+            String displayValue = isNullViewContent;
-                if(!CollectionUtils.isEmpty(disPlayValues)){
+            if(!CollectionUtils.isEmpty(disPlayValues)){
-                    displayValue = String.join("\r\n", disPlayValues);
+                displayValue = String.join("\r\n", disPlayValues);
-                }
-                resultMap.put(MesExtConstWords.ASSEMBLY_PARAM + displaySeq, displayValue);
             }
+            resultMap.put(MesExtConstWords.ASSEMBLY_PARAM + i, displayValue);
         }
 
         printDataMapList.add(resultMap);