diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java index 57799903..eb0f9fe6 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java @@ -468,6 +468,10 @@ public class QmsIssueTicketControllerService { .update(); } else { // 通过:按现有流程处理 + VUtil.trueThrowBusinessError(request.getIncidentType() == null) + .throwMessage("事件类型不能为空"); + VUtil.trueThrowBusinessError(StrUtil.isBlank(request.getExceptionCode())) + .throwMessage("异常代码不能为空"); VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(request.getHandlerUserIds())) .throwMessage("处理人列表不能为空"); @@ -480,6 +484,9 @@ public class QmsIssueTicketControllerService { issueTicketService.lambdaUpdate() .eq(QmsIssueTicket::getId, ticket.getId()) .set(QmsIssueTicket::getApprovalStatus, approvalStatus) + .set(QmsIssueTicket::getIncidentType, request.getIncidentType()) + .set(QmsIssueTicket::getExceptionCode, request.getExceptionCode()) + .set(QmsIssueTicket::getIncidentConsequence, request.getIncidentConsequence()) .set(request.getApprovalOpinion() != null, QmsIssueTicket::getApprovalOpinion, request.getApprovalOpinion()) .set(QmsIssueTicket::getUpdateUserId, currentUserId) diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIssueTicketDispatchMultipleQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIssueTicketDispatchMultipleQO.java index b4e9c209..f0226b74 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIssueTicketDispatchMultipleQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIssueTicketDispatchMultipleQO.java @@ -41,6 +41,21 @@ public class QmsIssueTicketDispatchMultipleQO { */ private String approvalOpinion; + /** + * 事件类型 + */ + private Short incidentType; + + /** + * 异常代码 + */ + private String exceptionCode; + + /** + * 事件后果 + */ + private String incidentConsequence; + /** * 处理人项 */ diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsQualityInspectorServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsQualityInspectorServiceImpl.java index 79ef5395..271a1c46 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsQualityInspectorServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsQualityInspectorServiceImpl.java @@ -63,6 +63,9 @@ public class QmsQualityInspectorServiceImpl extends ServiceImpl