排产相关-sjx

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/EquipResourceEntity.java

@@ -151,6 +151,12 @@ public class EquipResourceEntity extends BaseEntity {
 	@Schema(description = "设备顺序")
 	private Long workCenterId;
 
+	/**
+	 * 玻璃粉牌号
+	 */
+	@Schema(description = "玻璃粉牌号")
+	private String GlassCode;
+
 
 
 

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

@@ -124,7 +124,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         if (CollectionUtils.isNotEmpty(list)) {
             //校验已排产订单
             checkSchedulingOrder(list);
-            list = yieldOrderService.list(Wrappers.<YieldOrderEntity>lambdaQuery().in(BaseEntity::getStatus, YieldOrderEnum.STATUS_APS.getCategory()).isNotNull(YieldOrderEntity::getWorkCenterId).isNotNull(YieldOrderEntity::getReleaseDate).isNotNull(YieldOrderEntity::getDemandDate));
+            list = yieldOrderService.list(Wrappers.<YieldOrderEntity>lambdaQuery().in(BaseEntity::getStatus, YieldOrderEnum.STATUS_APS.getCategory(),YieldOrderEnum.STATUS_PROCESS_ERROR.getCategory()).isNotNull(YieldOrderEntity::getWorkCenterId).isNotNull(YieldOrderEntity::getReleaseDate).isNotNull(YieldOrderEntity::getDemandDate));
             //初始化人员能力
             List<PersonAbilityEntity> personAbilityEntityList = personAbilityService.list(Wrappers.<PersonAbilityEntity>lambdaQuery().isNotNull(PersonAbilityEntity::getWorkCenterId).isNotNull(PersonAbilityEntity::getProcessId).isNotNull(PersonAbilityEntity::getCraftId));
             Map<String, PersonAbilityEntity> personAbilityMap = new HashMap<>();
@@ -643,7 +643,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                                         totalTime = totalTime.add(ability.getStandardTime()).add(ability.getPrepareTime());
                                     }
                                 }
-                                /*List<PersonResourceEntity> personResourceList = personResourceService.list(Wrappers.<PersonResourceEntity>lambdaQuery()
+                                List<PersonResourceEntity> personResourceList = personResourceService.list(Wrappers.<PersonResourceEntity>lambdaQuery()
                                         .eq(PersonResourceEntity::getWorkCenterId, craft.getWorkCenterId())
                                         .eq(PersonResourceEntity::getProcessId, craft.getPpsId())
                                         .eq(PersonResourceEntity::getCraftId, craft.getCaId())
@@ -651,7 +651,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                                         .ge(PersonResourceEntity::getEndTime, prevProcessEnd));
                                 if(CollectionUtils.isNotEmpty(personResourceList)){
                                     workPlan.setMakeTeam(personResourceList.get(0).getTeamId());
-                                }*/
+                                }
                                 //通过加锁的方式保证每次查询到的人力资源都是最新的
                             /*Long craftId = craft.getCaId();
                             Lock craftLock = getCraftLock(craftId);