Merge branch 'master' into dev-scheduling

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

@@ -387,7 +387,13 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                 }
             }
         }
-        apsPlanVo.setApsBlankOrderDos(apsBlankOrders);
+        if(apsBlankOrders.size()>0){
+            if(apsPlanVo.getApsBlankOrderDos() != null){
+                apsPlanVo.getApsBlankOrderDos().addAll(apsBlankOrders);
+            }else{
+                apsPlanVo.setApsBlankOrderDos(apsBlankOrders);
+            }
+        }
         blankOrderAps(apsBlankOrders);
         //更新生产状态为“待发布”（20）
         updateProductStatusByOrderIds(apsBlankOrders.stream().map(ApsBlankOrderVo::getProductionorderid).collect(Collectors.toSet()));