巡检工单创建创建修改

质检人员转办修改

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)

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;
+
     /**
      * 处理人项
      */

nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsQualityInspectorServiceImpl.java

@@ -63,6 +63,9 @@ public class QmsQualityInspectorServiceImpl extends ServiceImpl<QmsQualityInspec
     @Resource
     private IQmsInspectorModelItemService inspectorModelItemService;
 
+    @Resource
+    private IQmsIncomingInspectionTaskService incomingInspectionTaskService;
+
     // ========================= 工具方法 =========================
 
     /**
@@ -572,11 +575,35 @@ public class QmsQualityInspectorServiceImpl extends ServiceImpl<QmsQualityInspec
     @Transactional
     @Override
     public void transfer(QmsQualityInspectorTransferQO request) {
+        QmsQualityInspector changeInspector = getById(request.getChangeUserId());
+        if (Objects.isNull(changeInspector)) {
+            throw new NflgException(STATE.BusinessError, "转办人不存在");
+        }
+
+        User changeUser = userService.getById(changeInspector.getUserId());
+        if (Objects.isNull(changeUser)) {
+            throw new NflgException(STATE.BusinessError, "转办人用户信息不存在");
+        }
+
+        Long currentUserId = UserUtil.getUserId();
+        String currentUserName = UserUtil.getUserName();
+        LocalDateTime now = LocalDateTime.now();
+
         lambdaUpdate()
                 .eq(QmsQualityInspector::getId, request.getId())
                 .set(QmsQualityInspector::getChangeUserId, request.getChangeUserId())
-                .set(QmsQualityInspector::getUpdateBy, UserUtil.getUserName())
+                .set(QmsQualityInspector::getUpdateBy, currentUserName)
-                .set(QmsQualityInspector::getUpdateTime, LocalDateTime.now())
+                .set(QmsQualityInspector::getUpdateTime, now)
+                .update();
+
+        incomingInspectionTaskService.lambdaUpdate()
+                .eq(QmsIncomingInspectionTask::getInspectorId, request.getId())
+                .in(QmsIncomingInspectionTask::getInspectionStatus, (short) 0, (short) 1)
+                .set(QmsIncomingInspectionTask::getAgentId, changeInspector.getId())
+                .set(QmsIncomingInspectionTask::getAgentName, changeUser.getUserName())
+                .set(QmsIncomingInspectionTask::getUpdateUserId, currentUserId)
+                .set(QmsIncomingInspectionTask::getUpdateUserName, currentUserName)
+                .set(QmsIncomingInspectionTask::getUpdateTime, now)
                 .update();
     }