|
|
|
|
@ -14,7 +14,11 @@ import lombok.Data; |
|
|
|
|
import lombok.EqualsAndHashCode; |
|
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
|
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.dashboard.pojo.entity.BsProcessSetEntity; |
|
|
|
|
import org.springblade.desk.dashboard.service.IBsProcessSetService; |
|
|
|
|
import org.springblade.desk.quality.constant.ProReTemplateConst; |
|
|
|
|
import org.springblade.desk.quality.excel.ProReTemplateExcel; |
|
|
|
|
import org.springblade.desk.quality.mapper.ProReTemplateMapper; |
|
|
|
|
@ -58,6 +62,10 @@ public class ProReTemplateServiceImpl extends EnBaseServiceImpl<ProReTemplateMap |
|
|
|
|
private IProReTemplateTankService tankService; |
|
|
|
|
@Resource |
|
|
|
|
private IProReTemplateDetailService detailService; |
|
|
|
|
@Resource |
|
|
|
|
private IWorkCenterService workCenterService; |
|
|
|
|
@Resource |
|
|
|
|
private IBsProcessSetService bsProcessSetService; |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public IPage<ProReTemplateVO> selectProReTemplatePage(IPage<ProReTemplateVO> page, ProReTemplateVO proReTemplate) { |
|
|
|
|
@ -75,6 +83,17 @@ public class ProReTemplateServiceImpl extends EnBaseServiceImpl<ProReTemplateMap |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
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)); |
|
|
|
|
//
|
|
|
|
|
List<ProReTemplateTankVO> tankVOList = tankService.getListByTemplateId(vo.getId()); |
|
|
|
|
@ -87,6 +106,7 @@ public class ProReTemplateServiceImpl extends EnBaseServiceImpl<ProReTemplateMap |
|
|
|
|
// .collect(Collectors.toList());
|
|
|
|
|
vo.setPreserveSlotList(tankVOList); |
|
|
|
|
for (ProReTemplateTankVO tankVO : vo.getPreserveSlotList()) { |
|
|
|
|
|
|
|
|
|
List<ProReTemplateDetailVO> detailVOList = detailService.getListByTemplateTankId(tankVO.getId()); |
|
|
|
|
tankVO.setChildrenList(detailVOList); |
|
|
|
|
} |
|
|
|
|
|