diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/WorkPlan.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/WorkPlan.java index 4ffc32b0c..283c4ea41 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/WorkPlan.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/WorkPlan.java @@ -127,11 +127,13 @@ public class WorkPlan extends BaseEntity { /** * 是否外协 */ + @TableField(updateStrategy = FieldStrategy.ALWAYS) @Schema(description = "是否外协") private String oem; /** * 外协商 */ + @TableField(updateStrategy = FieldStrategy.ALWAYS) @Schema(description = "外协商") private Long ocId; /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderRunServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderRunServiceImpl.java index 8bbe0f81a..65442237b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderRunServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderRunServiceImpl.java @@ -440,30 +440,10 @@ public class WorkOrderRunServiceImpl extends BaseServiceImpl allPlans = workPlanMapper.selectList( - new LambdaQueryWrapper().eq(WorkPlan::getWoId, wo.getId())); - List tailPlans = new ArrayList<>(); - for (WorkPlan plan : allPlans) { - if (plan.getOrders().compareTo(firstInternalPlan.getOrders()) > 0 - && wpList.stream().noneMatch(w -> w.getId().equals(plan.getId()))) { - plan.setMakeTeam(null); - plan.setPlanStartTime(null); - plan.setPlanEndTime(null); - tailPlans.add(plan); - } - } - if (!tailPlans.isEmpty()) { - workPlanMapper.updateById(tailPlans); - } - } - if (wpList.isEmpty()) { throw new ServiceException("未选择转回工序,请走外协交件流程!"); } @@ -510,13 +490,6 @@ public class WorkOrderRunServiceImpl extends BaseServiceImpl