Browse Source

2025-05-23

流程节点中增加管控:Production Stage的值必须是"Mass Production"
master
fengyuan_yang 8 months ago
parent
commit
23564a6742
  1. 19
      src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java

19
src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java

@ -27,6 +27,7 @@ import com.spring.modules.quotation.entity.QuotationHeader;
import com.spring.modules.quotation.mapper.QuotationInformationMapper; import com.spring.modules.quotation.mapper.QuotationInformationMapper;
import com.spring.modules.quotation.vo.QuotationDetailVo; import com.spring.modules.quotation.vo.QuotationDetailVo;
import com.spring.modules.report.dao.ProcedureDao; import com.spring.modules.report.dao.ProcedureDao;
import com.spring.modules.request.mapper.RequestManageMapper;
import com.spring.modules.request.service.RequestManageService; import com.spring.modules.request.service.RequestManageService;
import com.spring.modules.request.vo.PlmRequestDetailVo; import com.spring.modules.request.vo.PlmRequestDetailVo;
import com.spring.modules.sampleManagement.dao.TechnicalSpecificationMapper; import com.spring.modules.sampleManagement.dao.TechnicalSpecificationMapper;
@ -74,6 +75,9 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
@Autowired @Autowired
private ChangeManagementServiceImpl changeManagementService; private ChangeManagementServiceImpl changeManagementService;
@Autowired
private RequestManageMapper requestManageMapper;
@Autowired @Autowired
private SysUserDao sysUserDao; private SysUserDao sysUserDao;
@ -1392,7 +1396,7 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
if ("Y".equals(data.getNodeConclusion())) { // 同意 if ("Y".equals(data.getNodeConclusion())) { // 同意
// 2024-11-25 RQ新增判断是否有特殊控制 // 2024-11-25 RQ新增判断是否有特殊控制
PlmProcessControllBaseData cData=new PlmProcessControllBaseData();
PlmProcessControllBaseData cData = new PlmProcessControllBaseData();
cData.setSite(data.getSite()); cData.setSite(data.getSite());
cData.setNodeId(paramData.getNodeId()); cData.setNodeId(paramData.getNodeId());
cData.setWorkflowId(paramData.getWorkflowId()); cData.setWorkflowId(paramData.getWorkflowId());
@ -1402,6 +1406,19 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
requestManageService.doProcessControl(controlList.get(i).getRoleId(),data.getSite(),data.getCodeNo()); requestManageService.doProcessControl(controlList.get(i).getRoleId(),data.getSite(),data.getCodeNo());
} }
} }
// 2025-05-23 CS Sample Closed节点提交时需校验Production Stage的值必须是"Mass Production"
cData.setRoleId(6);
controlList = requestManageMapper.getProcessSelect2(cData);
if (!controlList.isEmpty()) {
if (data.getStage() == null || data.getStage().isEmpty()) {
throw new RuntimeException("Production Stage必填!");
}
if ("Mass Production".equals(data.getStage())) {
throw new RuntimeException("Production Stage的值必须是Mass Production!");
}
}
List<MainData> mainData = getMainData(data.getSite(), baseData, changeRequest, engineers, technicians, dccs, cqcs, fais); List<MainData> mainData = getMainData(data.getSite(), baseData, changeRequest, engineers, technicians, dccs, cqcs, fais);
paramData.setMainData(mainData); paramData.setMainData(mainData);
SubmitRequestParam submitRequestParam = new SubmitRequestParam(); SubmitRequestParam submitRequestParam = new SubmitRequestParam();

Loading…
Cancel
Save