生产管理修改

liweidong
李涛 3 weeks ago
parent e3b1a87809
commit b2847955e2
  1. 12
      blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/WorkPlanRunVO.java
  2. 2
      blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java

@ -26,8 +26,8 @@ public class WorkPlanRunVO extends WorkPlanRun {
@Schema(description = "工艺能力") @Schema(description = "工艺能力")
private ProcessAbility processAbility; private ProcessAbility processAbility;
// @Schema(description = "工序号") @Schema(description = "工序号")
// private String orders; private String orders;
// //
// @Schema(description = "工序代码") // @Schema(description = "工序代码")
// private String ppsCode; // private String ppsCode;
@ -38,10 +38,10 @@ public class WorkPlanRunVO extends WorkPlanRun {
// @Schema(description = "工艺能力") // @Schema(description = "工艺能力")
// private String caName; // private String caName;
// //
// @Schema(description = "工序描述") @Schema(description = "工序描述")
// private String makeMemo; private String makeMemo;
// //
// @Schema(description = "不可转外协原因") @Schema(description = "不可转外协原因")
// private String reason; private String reason;
} }

@ -408,6 +408,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
wpr.setWpId(wp.getId()); wpr.setWpId(wp.getId());
wpr.setWorkPlan(wpVO); wpr.setWorkPlan(wpVO);
wpr.setWorkOrderRun(CollectionUtils.isNotEmpty(workOrderRuns) ? workOrderRuns.get(0) : null); wpr.setWorkOrderRun(CollectionUtils.isNotEmpty(workOrderRuns) ? workOrderRuns.get(0) : null);
wpr.setOrders(wp.getOrders());
wpr.setMakeMemo(wp.getMakeMemo());
wprList.add(wpr); wprList.add(wpr);
} }

Loading…
Cancel
Save