排产相关-sjx

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

@@ -428,6 +428,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                                         }
                                         if(maxMatchList != null){
                                             glassCodeStr = maxMatchList.stream().collect(Collectors.joining(","));
+                                            log.info("订单："+order.getYoCode()+"，温度曲线是："+glassCodeStr);
                                             //if(sameFurnaceMap.containsKey(glassCodeStr))
                                         }
                                     }
@@ -571,10 +572,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                                                 if(order.getYieldType() == 2 || order.getYieldType() == 3){
                                                     equipResource.setGlassCode(glassCodeStr);
                                                 }
-                                                //如果剩余产能占总产能不足20%，则修改为已占用
-                                                //                                        if(equipResource.getRestCapacity().divide(equipResource.getTotalCapacity(),2,RoundingMode.HALF_UP).compareTo(BigDecimal.valueOf(0.2)) < 0){
-                                                //
-                                                //                                        }
+
                                                 //同一个设备可能有多个工艺能力，同一时间只能做一个工艺能力的零件，所以需要把当前设备所有工艺能力的剩余产能都更新调
                                                 LambdaUpdateWrapper<EquipResourceEntity> equipWrapper = new LambdaUpdateWrapper<>();
                                                 equipWrapper.eq(EquipResourceEntity::getEquipCode, equipResource.getEquipCode());
@@ -612,19 +610,10 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
 
                         } else if ("人".equals(mainProducerMap.get(craft.getPpsId()))) {
                             //匹配人资源
-                       /* String personAbility = craft.getWorkCenterId() + "-" + craft.getPpsId() + "-" + craft.getCaId();
-                        if (personAbilityMap.containsKey(craft.getWorkCenterId() + "-" + craft.getPpsId() + "-" + craft.getCaId())) {
-
-                        } else {
-                            order.setStatus(6);
-                            order.setErrorInfo("工序："+personAbility+"未匹配到对应的人员能力");
-                            yieldOrderService.updateById(order);
-                            isSchecuding = false;
-                            break;
-                        }*/
                             WorkPlanEntity workPlan = new WorkPlanEntity();
                             BigDecimal totalTime = new BigDecimal(0);
                             PersonAbilityEntity ability = personAbilityMap.get(craft.getWorkCenterId() + "-" + craft.getPpsId() + "-" + craft.getCaId());
+                            log.info("人员能力是："+ craft.getWorkCenterId() + "-" + craft.getPpsId() + "-" + craft.getCaId());
                             //镀后检验和镀后接收先按半小时计算
                             if (ability != null) {
                                 if ("镀后检验".equals(ability.getProcessName()) || "镀后接收".equals(ability.getProcessName())) {
@@ -745,6 +734,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                             //未匹配到设备和人力资源，将工序状态改为6，标识为未排产
                             craft.setStatus(YieldOrderEnum.STATUS_PROCESS_ERROR.getCode());
                             yieldOrderCraftService.updateById(craft);
+                            log.info("未匹配到设备和人力资源的工序是："+craft.getPpsId());
                         }
                     }