冷轧重排

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

@@ -77,6 +77,13 @@ public class ApsDispatchServiceImpl implements ApsDispatchService {
                 apsBlankOrderVo.setDeliverytime(8);
                 apsBlankOrderVos.add(apsBlankOrderVo);
             }
+            // 待排程的解锁
+            List<String> detailids = toApsPros.stream().map(ApsProcessOperationProcessEquDo::getId).distinct().collect(Collectors.toList());
+            processOperationProcessEquService.update(new LambdaUpdateWrapper<ApsProcessOperationProcessEquDo>().in(ApsProcessOperationProcessEquDo::getId,detailids)
+                    .set(ApsProcessOperationProcessEquDo::getLockmark,"n").set(ApsProcessOperationProcessEquDo::getLockmarkdetail,"n"));
+            List<String> processids = toApsPros.stream().map(ApsProcessOperationProcessEquDo::getProcessid).distinct().collect(Collectors.toList());
+            apsProcessOperationService.update(new LambdaUpdateWrapper<ApsProcessOperationDo>().in(ApsProcessOperationDo::getId,processids)
+                    .set(ApsProcessOperationDo::getLockmark,"n"));
             // 排程前数据组装
             ProductionScheduleVo apsProductionSchedule = apsService.apsBfDataAssemble(apsBlankOrderVos,blankids, allEqs, apsPlanStartDate, apsType);
             for (ProductionProcesses process : apsProductionSchedule.getProcesses()) {