排产相关-sjx

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

@@ -507,7 +507,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                         List<EquipResourceEntity> equipResourceList = equipResourceService.list(Wrappers.<EquipResourceEntity>lambdaQuery().eq(EquipResourceEntity::getCraftId,craft.getCaId()).eq(EquipResourceEntity::getWorkCenterId,craft.getWorkCenterId()).ge(EquipResourceEntity::getStartTime, dateTime).eq(EquipResourceEntity::getIsUsed, 0).in(EquipResourceEntity::getEquipOrder, entry.getKey()));
                         if(CollectionUtils.isEmpty(equipResourceList)){
                             order.setStatus(6);
-                            order.setErrorInfo("工序："+craft+"未匹配到对应的设备资源");
+                            order.setErrorInfo("工序："+craft.getPpsId()+"未匹配到对应的设备资源");
                             yieldOrderService.updateById(order);
                             isSchecuding = false;
                             break;
@@ -578,6 +578,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                                         //同一个设备可能有多个工艺能力，同一时间只能做一个工艺能力的零件，所以需要把当前设备所有工艺能力的剩余产能都更新调
                                         LambdaUpdateWrapper<EquipResourceEntity> equipWrapper = new LambdaUpdateWrapper<>();
                                         equipWrapper.eq(EquipResourceEntity::getEquipCode,equipResource.getEquipCode());
+                                        equipWrapper.eq(EquipResourceEntity::getDateTime,equipResource.getDateTime());
+                                        equipWrapper.eq(EquipResourceEntity::getPeriod,equipResource.getPeriod());
                                         equipResourceService.update(equipResource,equipWrapper);
                                         //该设备后续所有开始时间小于当前结束时间的时间段都变为不可用
                                         LambdaUpdateWrapper<EquipResourceEntity> updateWrapper = new LambdaUpdateWrapper();