diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java index 14f74cc..0ae1bfb 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java @@ -626,17 +626,17 @@ public class WorkOrderServiceImpl extends BaseServiceImpl caIds = Arrays.asList(10,21); + List ppsIds = Arrays.asList(Long.valueOf(10),Long.valueOf(21)); //镀后检验和镀后接收先按半小时计算 if(ability != null){ - if(caIds.contains(craft.getCaId())){ + if(ppsIds.contains(craft.getPpsId())){ totalTime = BigDecimal.valueOf(30); workPlan.setStartTime(prevProcessEnd); workPlan.setEndTime(prevProcessEnd.plusMinutes(30)); - if(craft.getCaId() == 10){ + if(craft.getPpsId() == 10){ workPlan.setMakeTeam(Long.valueOf(64)); } - if(craft.getCaId() == 21){ + if(craft.getPpsId() == 21){ workPlan.setMakeTeam(Long.valueOf(65)); } }else{