Merge branch 'mode-min-unit' into mode-min-unit-新模型

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

@@ -4346,6 +4346,9 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
             List<ApsProcessOperationDo> unLockingProcessList = apsProcessOperationService.list(new LambdaQueryWrapper<ApsProcessOperationDo>()
                     .eq(ApsProcessOperationDo::getLockmark, "n"));
             List<String> unLockingProcessIdList = unLockingProcessList.stream().map(ApsProcessOperationDo::getId).collect(Collectors.toList());
+            List<ApsProcessOperationProcessEquDo> unLockingEquList2 = apsProcessOperationProcessEquService.list(new LambdaQueryWrapper<ApsProcessOperationProcessEquDo>()
+                    .eq(ApsProcessOperationProcessEquDo::getLockmark, "n"));
+            List<String> unLockingEquIdList2 = unLockingEquList2.stream().map(ApsProcessOperationProcessEquDo::getId).collect(Collectors.toList());
 
             //将实际完工时间大于明天的作业挪到实际完工时间
             this.baseMapper.updateFinishDateAboutProcessEqu(needScheduleDate, tenantId, chongpaiStartDate, chongpaiEndDate);
@@ -4432,6 +4435,11 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                         .set(ApsProcessOperationProcessEquDo::getLockmarkdetail, "n")
                         .in(ApsProcessOperationProcessEquDo::getId, unLockingEquIdList));
             }
+            if (!unLockingEquIdList2.isEmpty()) {
+                apsProcessOperationProcessEquService.update(new LambdaUpdateWrapper<ApsProcessOperationProcessEquDo>()
+                        .set(ApsProcessOperationProcessEquDo::getLockmark, "n")
+                        .in(ApsProcessOperationProcessEquDo::getId, unLockingEquIdList2));
+            }
             if (!unLockingProcessIdList.isEmpty()) {
                 apsProcessOperationService.update(new LambdaUpdateWrapper<ApsProcessOperationDo>()
                         .set(ApsProcessOperationDo::getLockmark, "n")