工单暂存和提交接口修改
This commit is contained in:
parent
fa73c7d21a
commit
af0d99c9e7
|
|
@ -1475,8 +1475,8 @@ public class QmsIssueTicketControllerService {
|
||||||
List<QmsPdiTicketMyDetailVO.MeasureVO> permanentMeasures = new ArrayList<>();
|
List<QmsPdiTicketMyDetailVO.MeasureVO> permanentMeasures = new ArrayList<>();
|
||||||
|
|
||||||
// 查询字典项:临时措施和永久措施的类型ID
|
// 查询字典项:临时措施和永久措施的类型ID
|
||||||
Long temporaryTypeId = dictionaryItemService.getIdByCode("MeasureType", "TemporaryCorrectiveMeasures");
|
Long temporaryTypeId = dictionaryItemService.getId("工单解决措施", "临时纠正措施");
|
||||||
Long permanentTypeId = dictionaryItemService.getIdByCode("MeasureType", "PermanentCorrectiveMeasures");
|
Long permanentTypeId = dictionaryItemService.getId("工单解决措施", "永久纠正措施");
|
||||||
|
|
||||||
for (QmsIssueTicketProcess process : processes) {
|
for (QmsIssueTicketProcess process : processes) {
|
||||||
// 提取根本原因
|
// 提取根本原因
|
||||||
|
|
|
||||||
|
|
@ -192,7 +192,10 @@ public class QmsIssueTicketProcessMeasureControllerService {
|
||||||
|
|
||||||
// 保存临时措施
|
// 保存临时措施
|
||||||
if (CollectionUtil.isNotEmpty(temporaryMeasures)) {
|
if (CollectionUtil.isNotEmpty(temporaryMeasures)) {
|
||||||
Long tempTypeId = dictionaryItemService.getIdByCode("MeasureType", "TemporaryCorrectiveMeasures");
|
Long tempTypeId = dictionaryItemService.getId("工单解决措施", "临时纠正措施");
|
||||||
|
if (tempTypeId == null) {
|
||||||
|
throw new NflgException(STATE.BusinessError, "字典【工单解决措施-临时纠正措施】不存在");
|
||||||
|
}
|
||||||
for (QmsIssueTicketProcessDraftQO.MeasureItem item : temporaryMeasures) {
|
for (QmsIssueTicketProcessDraftQO.MeasureItem item : temporaryMeasures) {
|
||||||
if (StrUtil.isBlank(item.getMeasureContent())) continue;
|
if (StrUtil.isBlank(item.getMeasureContent())) continue;
|
||||||
QmsIssueTicketProcessMeasure measure = new QmsIssueTicketProcessMeasure()
|
QmsIssueTicketProcessMeasure measure = new QmsIssueTicketProcessMeasure()
|
||||||
|
|
@ -209,7 +212,10 @@ public class QmsIssueTicketProcessMeasureControllerService {
|
||||||
|
|
||||||
// 保存永久措施
|
// 保存永久措施
|
||||||
if (CollectionUtil.isNotEmpty(permanentMeasures)) {
|
if (CollectionUtil.isNotEmpty(permanentMeasures)) {
|
||||||
Long permTypeId = dictionaryItemService.getIdByCode("MeasureType", "PermanentCorrectiveMeasures");
|
Long permTypeId = dictionaryItemService.getId("工单解决措施", "永久纠正措施");
|
||||||
|
if (permTypeId == null) {
|
||||||
|
throw new NflgException(STATE.BusinessError, "字典【工单解决措施-永久纠正措施】不存在");
|
||||||
|
}
|
||||||
for (QmsIssueTicketProcessDraftQO.MeasureItem item : permanentMeasures) {
|
for (QmsIssueTicketProcessDraftQO.MeasureItem item : permanentMeasures) {
|
||||||
if (StrUtil.isBlank(item.getMeasureContent())) continue;
|
if (StrUtil.isBlank(item.getMeasureContent())) continue;
|
||||||
QmsIssueTicketProcessMeasure measure = new QmsIssueTicketProcessMeasure()
|
QmsIssueTicketProcessMeasure measure = new QmsIssueTicketProcessMeasure()
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue