过程模版修改

liweidong
pangyang 3 weeks ago
parent 8e7e348061
commit 9d8d5e30ed
  1. 3
      blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateTankVO.java
  2. 20
      blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateServiceImpl.java

@ -25,4 +25,7 @@ public class ProReTemplateTankVO extends ProReTemplateTank {
@Schema(description = "detail 具体明细") @Schema(description = "detail 具体明细")
List<ProReTemplateDetailVO> childrenList; List<ProReTemplateDetailVO> childrenList;
private String centerName;
private String processName;
} }

@ -14,7 +14,11 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springblade.core.tool.api.R; import org.springblade.core.tool.api.R;
import org.springblade.desk.basic.pojo.entity.WorkCenter;
import org.springblade.desk.basic.service.IWorkCenterService;
import org.springblade.desk.basic.service.en.impl.EnBaseServiceImpl; import org.springblade.desk.basic.service.en.impl.EnBaseServiceImpl;
import org.springblade.desk.dashboard.pojo.entity.BsProcessSetEntity;
import org.springblade.desk.dashboard.service.IBsProcessSetService;
import org.springblade.desk.quality.constant.ProReTemplateConst; import org.springblade.desk.quality.constant.ProReTemplateConst;
import org.springblade.desk.quality.excel.ProReTemplateExcel; import org.springblade.desk.quality.excel.ProReTemplateExcel;
import org.springblade.desk.quality.mapper.ProReTemplateMapper; import org.springblade.desk.quality.mapper.ProReTemplateMapper;
@ -58,6 +62,10 @@ public class ProReTemplateServiceImpl extends EnBaseServiceImpl<ProReTemplateMap
private IProReTemplateTankService tankService; private IProReTemplateTankService tankService;
@Resource @Resource
private IProReTemplateDetailService detailService; private IProReTemplateDetailService detailService;
@Resource
private IWorkCenterService workCenterService;
@Resource
private IBsProcessSetService bsProcessSetService;
@Override @Override
public IPage<ProReTemplateVO> selectProReTemplatePage(IPage<ProReTemplateVO> page, ProReTemplateVO proReTemplate) { public IPage<ProReTemplateVO> selectProReTemplatePage(IPage<ProReTemplateVO> page, ProReTemplateVO proReTemplate) {
@ -75,6 +83,17 @@ public class ProReTemplateServiceImpl extends EnBaseServiceImpl<ProReTemplateMap
@Override @Override
public void setVOValue(ProReTemplateVO vo) { public void setVOValue(ProReTemplateVO vo) {
WorkCenter center = workCenterService.getById(vo.getWcId());
if(center != null){
vo.setWcName(center.getWcName());
}
BsProcessSetEntity bsProcessSet = bsProcessSetService.getById(vo.getPpsId());
if(bsProcessSet != null){
vo.setPpsName(bsProcessSet.getName());
}
vo.setBase(setBaseVOValue(userClient, sysClient, dictClient, vo, ProReTemplateConst.DIC)); vo.setBase(setBaseVOValue(userClient, sysClient, dictClient, vo, ProReTemplateConst.DIC));
// //
List<ProReTemplateTankVO> tankVOList = tankService.getListByTemplateId(vo.getId()); List<ProReTemplateTankVO> tankVOList = tankService.getListByTemplateId(vo.getId());
@ -87,6 +106,7 @@ public class ProReTemplateServiceImpl extends EnBaseServiceImpl<ProReTemplateMap
// .collect(Collectors.toList()); // .collect(Collectors.toList());
vo.setPreserveSlotList(tankVOList); vo.setPreserveSlotList(tankVOList);
for (ProReTemplateTankVO tankVO : vo.getPreserveSlotList()) { for (ProReTemplateTankVO tankVO : vo.getPreserveSlotList()) {
List<ProReTemplateDetailVO> detailVOList = detailService.getListByTemplateTankId(tankVO.getId()); List<ProReTemplateDetailVO> detailVOList = detailService.getListByTemplateTankId(tankVO.getId());
tankVO.setChildrenList(detailVOList); tankVO.setChildrenList(detailVOList);
} }

Loading…
Cancel
Save