排产相关-sjx

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java

@@ -626,17 +626,17 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                         BigDecimal totalTime = new BigDecimal(0);
                         PersonAbilityEntity ability =  personAbilityMap.get(craft.getWorkCenterId() + "-" + craft.getPpsId() + "-" + craft.getCaId());
                         //由于客户提供的数据不全，先判断有没有对应的能力，如果没有先不计算时间
-                        List<Integer> caIds = Arrays.asList(10,21);
+                        List<Long> 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{