aps-产品明细修改后，对应坯料计划拼接字段重新拼接，考虑部分有可能为空的字段

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

@@ -2141,7 +2141,11 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                     if (ObjectUtil.isNotEmpty(prolength)) {
                         outputResult += ("*长" + prolength);
                     }
-                    outputResult += ("mm " + apsProcessOutputProductDo.getOutputonerollweigth() + "吨 * " + apsProcessOutputProductDo.getPlanoutputorderroll() + "卷");
+                    outputResult += "mm";
+                    if (ObjectUtil.isNotEmpty(apsProcessOutputProductDo.getOutputonerollweigth()) && ObjectUtil.isNotEmpty(apsProcessOutputProductDo.getPlanoutputorderroll())) {
+                        outputResult += (" " + apsProcessOutputProductDo.getOutputonerollweigth() + "吨 * " + apsProcessOutputProductDo.getPlanoutputorderroll() + "卷");
+                    }
+
 
                     endUpdateOutput.setOutputresult(outputResult);
                     isNeedUpdateBlank = true;
@@ -2200,7 +2204,11 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
             List<String> outputOrderProductList = processOutputProductDoList.stream().map(item -> {
                 String outputresult = item.getOutputresult();
                 String[] s = outputresult.split(" ");
-                return s[0] + " " + s[1] + " " + removeExtraZerosAndDecimal(item.getOutputonerollweigth()) + "吨 * " + item.getPlanoutputrollcount() + "卷 = " + removeExtraZerosAndDecimal(item.getPlanoutputonerollweight());
+                String res = s[0] + " " + s[1];
+                if (ObjectUtil.isNotEmpty(item.getOutputonerollweigth()) && ObjectUtil.isNotEmpty(item.getPlanoutputrollcount())) {
+                    res = res + " " + removeExtraZerosAndDecimal(item.getOutputonerollweigth()) + "吨 * " + item.getPlanoutputrollcount() + "卷 = " + removeExtraZerosAndDecimal(item.getPlanoutputonerollweight());
+                }
+                return res;
             }).sorted(String::compareTo).collect(Collectors.toList());
 
             for (int i = 0; i < outputOrderProductList.size(); i++) {