aps-修改产品明细后，对应组装参数修改增加null值过滤

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsBlankOrderServiceImpl.java

@@ -2603,7 +2603,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
         List<ApsProcessOutputProductDo> processOutputProductDoList = apsProcessOutputProductService.list(new QueryWrapper<ApsProcessOutputProductDo>().lambda().eq(ApsProcessOutputProductDo::getBlankid, blankId));
         if (processOutputProductDoList != null && processOutputProductDoList.size() > 0) {
             //获取所有输出成品的输出成品
-            List<String> outputFinishList = processOutputProductDoList.stream().map(ApsProcessOutputProductDo::getOutputresult).sorted(String::compareTo).collect(Collectors.toList());
+            List<String> outputFinishList = processOutputProductDoList.stream().filter(item -> ObjectUtil.isNotEmpty(item.getOutputresult())).map(ApsProcessOutputProductDo::getOutputresult).sorted(String::compareTo).collect(Collectors.toList());
             //================输出成品===============
             String outputFinishProduct = "";
 
@@ -2618,15 +2618,17 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
             //================输出订单产品=================
             String outputOrderProduct = "";
             //获取所有输出成品的输出订单产品
-            List<String> outputOrderProductList = processOutputProductDoList.stream().map(item -> {
-                String outputresult = item.getOutputresult();
-                String[] s = outputresult.split(" ");
-                String res = s[0] + " " + s[1];
-                if (ObjectUtil.isNotEmpty(item.getOutputonerollweigth()) && ObjectUtil.isNotEmpty(item.getPlanoutputrollcount())) {
-                    res = res + " " + CXCommonUtils.removeExtraZerosAndDecimal(item.getOutputonerollweigth()) + "吨 * " + item.getPlanoutputrollcount() + "卷 = " + CXCommonUtils.removeExtraZerosAndDecimal(item.getPlanoutputonerollweight());
-                }
-                return res;
-            }).sorted(String::compareTo).collect(Collectors.toList());
+            List<String> outputOrderProductList = processOutputProductDoList.stream()
+                    .filter(item -> ObjectUtil.isNotEmpty(item.getOutputresult()))
+                    .map(item -> {
+                        String outputresult = item.getOutputresult();
+                        String[] s = outputresult.split(" ");
+                        String res = s[0] + " " + s[1];
+                        if (ObjectUtil.isNotEmpty(item.getOutputonerollweigth()) && ObjectUtil.isNotEmpty(item.getPlanoutputrollcount())) {
+                            res = res + " " + CXCommonUtils.removeExtraZerosAndDecimal(item.getOutputonerollweigth()) + "吨 * " + item.getPlanoutputrollcount() + "卷 = " + CXCommonUtils.removeExtraZerosAndDecimal(item.getPlanoutputonerollweight());
+                        }
+                        return res;
+                    }).sorted(String::compareTo).collect(Collectors.toList());
 
             for (int i = 0; i < outputOrderProductList.size(); i++) {
                 outputOrderProduct += "[" + (i + 1) + "]" + outputOrderProductList.get(i);
@@ -2638,7 +2640,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
 
             //==============坯料输出物料类型===============
             String outMaterType = "";
-            List<String> outMaterTypeList = processOutputProductDoList.stream().map(ApsProcessOutputProductDo::getOutmatertype).sorted(String::compareTo).collect(Collectors.toList());
+            List<String> outMaterTypeList = processOutputProductDoList.stream().filter(item -> ObjectUtil.isNotEmpty(item.getOutmatertype())).map(ApsProcessOutputProductDo::getOutmatertype).sorted(String::compareTo).collect(Collectors.toList());
             for (int i = 0; i < outMaterTypeList.size(); i++) {
                 outMaterType += "[" + (i + 1) + "]" + outMaterTypeList.get(i);
                 if (i < outMaterTypeList.size() - 1) {
@@ -2649,7 +2651,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
 
             //==============坯料输出物料规格===============
             String outMaterSpecification = "";
-            List<String> outMaterSpecificationList = processOutputProductDoList.stream().map(ApsProcessOutputProductDo::getOutmaterspecification).sorted(String::compareTo).collect(Collectors.toList());
+            List<String> outMaterSpecificationList = processOutputProductDoList.stream().filter(item -> ObjectUtil.isNotEmpty(item.getOutmaterspecification())).map(ApsProcessOutputProductDo::getOutmaterspecification).sorted(String::compareTo).collect(Collectors.toList());
             for (int i = 0; i < outMaterSpecificationList.size(); i++) {
                 outMaterSpecification += "[" + (i + 1) + "]" + outMaterSpecificationList.get(i);
                 if (i < outMaterSpecificationList.size() - 1) {