diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductProcessMapper.xml b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductProcessMapper.xml index c9f09c7..5ecf5a9 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductProcessMapper.xml +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductProcessMapper.xml @@ -97,10 +97,11 @@ diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessVo.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessVo.java index fca3abc..acf96d1 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessVo.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessVo.java @@ -13,6 +13,10 @@ public class ProductProcessVo extends ProductProcess { private Boolean isFinish = false;//是否已完成 + private Integer countProcess;//工序总数 + + private Integer finishedProcess;//已完成工序数 + private Float schedule;//进度,计算所得 private String productProcessName;//产品Bom名称 @@ -48,4 +52,20 @@ public class ProductProcessVo extends ProductProcess { public void setProductProcessName(String productProcessName) { this.productProcessName = productProcessName; } + + public Integer getCountProcess() { + return countProcess; + } + + public void setCountProcess(Integer countProcess) { + this.countProcess = countProcess; + } + + public Integer getFinishedProcess() { + return finishedProcess; + } + + public void setFinishedProcess(Integer finishedProcess) { + this.finishedProcess = finishedProcess; + } } diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneProcessServiceImpl.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneProcessServiceImpl.java index 469244c..bca6e7b 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneProcessServiceImpl.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneProcessServiceImpl.java @@ -68,8 +68,6 @@ public class MtAloneProcessServiceImpl extends AbstractService procMatVoList = processMaterialsService.findProcMatVoListByProcess(params); ProcessHo processHo = new ProcessHo(); if (null != processVo) { - System.out.println("----------" + processVo.getId()); - System.out.println("----------" + processVo.getProcessName()); BeanUtils.copyProperties(processVo, processHo); processHo.setProcessMaterialsVoList(procMatVoList); }