diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionItem.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionItem.java index 75540a53..55a13f22 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionItem.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionItem.java @@ -190,4 +190,15 @@ public class InspectionItem extends BaseEntity { */ @Schema(description = "特殊类型") private Integer specialType; + + /** + * 额定工时(分钟) + */ + @Schema(description = "额定工时") + private Double standardWorkMinute; + /** + * 准备工时(分钟) + */ + @Schema(description = "准备工时") + private Double prepareWorkMinute; } 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 40873567..7cf553b2 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 @@ -441,6 +441,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl workPlanList = baseMapper.selectList(Wrappers.lambdaQuery().lt(WorkPlanEntity::getOrders,workPlan.getOrders())); + if(CollectionUtil.isNotEmpty(workPlanList)){ + workPlanList.forEach(item ->{ + item.setStatus(5); + baseMapper.updateById(item); + }); + } } if (ObjectUtils.isNotEmpty(factEndTime)) { workPlanUpdate.setFactEndTime(factEndTime);