Merge branch 'mode-min-unit' into mode-min-unit-交期偏差

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

@@ -1263,7 +1263,7 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
                     if (StringUtils.isNotBlank(apsProductDetailVo.getCustomorderno())) {
                         needUpdateOutProduct.setCustomorderno(apsProductDetailVo.getCustomorderno());
                         //查询对应合并订单的详情
-                        ApsProductionMergeOrderDo apsProductionMergeOrderDo = apsProductionMergeOrderDoList.stream().filter(item -> item.getCustomorderno().equals(apsProductDetailVo.getCustomorderno()) && item.getDeleted().equals("0")).findFirst().orElse(null);
+                        ApsProductionMergeOrderDo apsProductionMergeOrderDo = apsProductionMergeOrderDoList.stream().filter(item -> item.getDeleted().equals("0") && StringUtils.isNotBlank(item.getCustomorderno()) && item.getCustomorderno().equals(apsProductDetailVo.getCustomorderno())).findFirst().orElse(null);
                         if (apsProductionMergeOrderDo == null) {
                             needUpdateOutProduct.setOrderno(orderno);
                             needUpdateOutProduct.setCustomname(customname);