Browse Source

aps-调度排程记录解锁作业,增加工厂过滤

sucheng 3 months ago
parent
commit
11686ed87d

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

@@ -4341,13 +4341,16 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
             String tenantId = CXCommonUtils.getCurrentUserFactoryId(currentUser);
             //查询所有已解锁的作业和作业明细
             List<ApsProcessOperationProcessEquDo> unLockingEquList = apsProcessOperationProcessEquService.list(new LambdaQueryWrapper<ApsProcessOperationProcessEquDo>()
-                    .eq(ApsProcessOperationProcessEquDo::getLockmarkdetail, "n"));
+                    .eq(ApsProcessOperationProcessEquDo::getLockmarkdetail, "n")
+                    .eq(ApsProcessOperationProcessEquDo::getTenantid, tenantId));
             List<String> unLockingEquIdList = unLockingEquList.stream().map(ApsProcessOperationProcessEquDo::getId).collect(Collectors.toList());
             List<ApsProcessOperationDo> unLockingProcessList = apsProcessOperationService.list(new LambdaQueryWrapper<ApsProcessOperationDo>()
-                    .eq(ApsProcessOperationDo::getLockmark, "n"));
+                    .eq(ApsProcessOperationDo::getLockmark, "n")
+                    .eq(ApsProcessOperationDo::getTenantid, tenantId));
             List<String> unLockingProcessIdList = unLockingProcessList.stream().map(ApsProcessOperationDo::getId).collect(Collectors.toList());
             List<ApsProcessOperationProcessEquDo> unLockingEquList2 = apsProcessOperationProcessEquService.list(new LambdaQueryWrapper<ApsProcessOperationProcessEquDo>()
-                    .eq(ApsProcessOperationProcessEquDo::getLockmark, "n"));
+                    .eq(ApsProcessOperationProcessEquDo::getLockmark, "n")
+                    .eq(ApsProcessOperationProcessEquDo::getTenantid, tenantId));
             List<String> unLockingEquIdList2 = unLockingEquList2.stream().map(ApsProcessOperationProcessEquDo::getId).collect(Collectors.toList());
 
             //将实际完工时间大于明天的作业挪到实际完工时间