Merge branch 'refs/heads/master' into mode-min-unit

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

@@ -655,7 +655,10 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
 
 
         // 工序作业明细ID
-        List<String> apsProcessOperationIds = processes.stream().map(ProductionProcesses::getId).distinct().collect(Collectors.toList());
+        List<String> apsProcessOperationIds = processes.stream().map(ProductionProcesses::getBsProcessesId)
+                .flatMap(List::stream)
+                .distinct()
+                .collect(Collectors.toList());
         SysUserVo currentUser = CXCommonUtils.getCurrentUser();
         //删除备份
         ApsUtils.clearBackup(null);