nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsIssueTicketController.java

@@ -62,11 +62,12 @@ public class QmsIssueTicketController extends BaseController {
     }
 
     /**
-     * 来料检测工单审核
+     * 审核质量问题工单
+     * 更新审批状态、审批意见、审批人信息，并根据审批结果更新工单状态
      */
-    @PostMapping("audit/incoming-inspection")
+    @PostMapping("audit")
-    public ApiResult<Void> IncomingInspectionAudit(@Valid @RequestBody QmsIncomingInspectionIssueTicketAuditQO request) {
+    public ApiResult<Void> audit(@Valid @RequestBody QmsIssueTicketAuditQO request) {
-        issueTicketControllerService.incomingInspectionAudit(request);
+        issueTicketControllerService.audit(request);
         return ApiResult.success();
     }
 

nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java

@@ -188,7 +188,6 @@ public class IncomingInspectionTaskControllerService {
                 .setTaskNo(taskNo)
                 .setMaterialId(material.getId())
                 .setInspectionStandardId(standard.getId())
-                .setTestingMethodDictItemId(standard.getTestingMethodDictItemId())
                 .setSupplierCode(request.getSupplierCode())
                 .setSupplierName(request.getSupplierName())
                 .setDeliveryOrderNo(request.getDeliveryOrderNo())
@@ -302,7 +301,7 @@ public class IncomingInspectionTaskControllerService {
         }
 
         // 5. 生成检测单号
-        String taskNo = basdeSerialNumberControllerService.generateSerialNumber(34);
+        String taskNo = basdeSerialNumberControllerService.generateSerialNumber(35);
 
         // 6. 计算要求完成时间：当前时间 + 检验周期（天）
         LocalDateTime now = LocalDateTime.now();
@@ -314,7 +313,6 @@ public class IncomingInspectionTaskControllerService {
                 .setTaskNo(taskNo)
                 .setMaterialId(material.getId())
                 .setInspectionStandardId(standard.getId())
-                .setTestingMethodDictItemId(standard.getTestingMethodDictItemId())
                 .setFactory(request.getFactory())
                 .setInspectionType(1)
                 .setInspectionQty(request.getInspectionQty())
@@ -358,43 +356,6 @@ public class IncomingInspectionTaskControllerService {
                 .update();
     }
 
-    public String addNewIncomingInspectionTask(Long taskId) {
-        QmsIncomingInspectionTask task = incomingInspectionTaskService.getById(taskId);
-        String taskNo = basdeSerialNumberControllerService.generateSerialNumber(34);
-        Long testingMethodDictItemId = dictionaryItemService.getIdByCode("InspectionStandardTestingMethod","Full");
-        QmsInspectionStandard standard = inspectionStandardService.getById(task.getInspectionStandardId());
-        LocalDateTime now = LocalDateTime.now();
-        LocalDateTime requiredFinishTime = now.plusDays(standard.getInspectionCycle());
-        QmsIncomingInspectionTask newTask = new QmsIncomingInspectionTask()
-                .setRequestNo(task.getRequestNo())
-                .setTaskNo(taskNo)
-                .setMaterialId(task.getId())
-                .setInspectionStandardId(task.getId())
-                .setTestingMethodDictItemId(testingMethodDictItemId)
-                .setSupplierCode(task.getSupplierCode())
-                .setSupplierName(task.getSupplierName())
-                .setDeliveryOrderNo(task.getDeliveryOrderNo())
-                .setDeliveryOrderLine(task.getDeliveryOrderLine())
-                .setPurchaseOrderNo(task.getPurchaseOrderNo())
-                .setPurchaseOrderLine(task.getPurchaseOrderLine())
-                .setPurchaseGroup(task.getPurchaseGroup())
-                .setFactory(task.getFactory())
-                .setWarehouse(task.getWarehouse())
-                .setStorageLocation(task.getStorageLocation())
-                .setStorageDays(task.getStorageDays())
-                .setInspectionType(task.getInspectionType())
-                .setDataType(task.getDataType())
-                .setInspectionQty(task.getInspectionQty())
-                .setInspectionStatus((short) 0)
-                .setInspectorId(task.getInspectorId())
-                .setInspectorName(task.getInspectorName())
-                .setSubmitTime(LocalDateTime.now())
-                .setRequiredFinishTime(requiredFinishTime)
-                .setDetectionQty(task.getInspectionQty());
-        incomingInspectionTaskService.save(newTask);
-        return taskNo;
-    }
-
     private DictionaryItem getAql(Long id, List<DictionaryItem> aqls) {
         return aqls.stream().filter(aql -> Objects.equals(aql.getId(), id)).findFirst().get();
     }

nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java

@@ -6,7 +6,7 @@ import cn.hutool.core.util.StrUtil;
 import com.nflg.wms.common.constant.STATE;
 import com.nflg.wms.common.exception.NflgException;
 import com.nflg.wms.common.pojo.qo.QmsIssueTicketAddQO;
-import com.nflg.wms.common.pojo.qo.QmsIncomingInspectionIssueTicketAuditQO;
+import com.nflg.wms.common.pojo.qo.QmsIssueTicketAuditQO;
 import com.nflg.wms.common.pojo.qo.QmsIssueTicketPdiAddQO;
 import com.nflg.wms.common.pojo.qo.QmsPdiCreateAndQueryTicketQO;
 import com.nflg.wms.common.pojo.vo.*;
@@ -15,7 +15,6 @@ import com.nflg.wms.common.util.VUtil;
 import com.nflg.wms.repository.entity.*;
 import com.nflg.wms.repository.service.*;
 import jakarta.annotation.Resource;
-import org.apache.commons.lang3.tuple.Pair;
 import org.springframework.stereotype.Service;
 import jakarta.validation.Valid;
 import org.springframework.stereotype.Component;
@@ -98,7 +97,7 @@ public class QmsIssueTicketControllerService {
         QmsIssueTicketPdiAddQO addQO = new QmsIssueTicketPdiAddQO();
         addQO.setTaskRecordId(request.getTaskRecordId());
         addQO.setIncidentType(request.getIncidentType());
-
+        
         List<QmsIssueTicketPdiAddQO.HandlerItem> handlerItems = request.getHandlers().stream()
                 .map(h -> {
                     QmsIssueTicketPdiAddQO.HandlerItem item = new QmsIssueTicketPdiAddQO.HandlerItem();
@@ -108,7 +107,7 @@ public class QmsIssueTicketControllerService {
                 })
                 .collect(Collectors.toList());
         addQO.setHandlers(handlerItems);
-
+        
         addPdiTicket(addQO);
 
         // 2. 查询该任务的不合格检测项
@@ -215,7 +214,7 @@ public class QmsIssueTicketControllerService {
      * 更新审批状态、审批意见、审批人信息、事故类型，并更新工单状态
      */
     @Transactional(rollbackFor = Exception.class)
-    public void incomingInspectionAudit(@Valid QmsIncomingInspectionIssueTicketAuditQO request) {
+    public void audit(@Valid QmsIssueTicketAuditQO request) {
         // 校验工单存在
         QmsIssueTicket entity = issueTicketService.getById(request.getId());
         VUtil.trueThrowBusinessError(Objects.isNull(entity))
@@ -239,14 +238,10 @@ public class QmsIssueTicketControllerService {
                 .setApprovalUserId(userId)
                 .setApprovalUserName(userName)
                 .setApprovalTime(now);
-        if (request.getApprovalStatus() == 5) {
+
-            entity.setAssociationTaskNo(incomingInspectionTaskControllerService.addNewIncomingInspectionTask(entity.getSourceId()));
-        }
         issueTicketService.updateById(entity);
 
-        if (request.getApprovalStatus() != 5) {
+        wmsIncomingInspectionTaskCallbackService.processAsync(entity.getSourceId(), request.getApprovalStatus());
-            wmsIncomingInspectionTaskCallbackService.processAsync(entity.getSourceId(), request.getApprovalStatus());
-        }
     }
 
     /**
@@ -526,7 +521,7 @@ public class QmsIssueTicketControllerService {
             records.stream()
                     .filter(record -> StrUtil.isNotBlank(record.getImageIds()))
                     .forEach(record -> {
-                        if (StrUtil.isNotBlank(record.getImageIds())) {
+                        if(StrUtil.isNotBlank(record.getImageIds())) {
                             record.setImages(fileUploadRecordService.lambdaQuery()
                                     .in(FileUploadRecord::getId, Arrays.stream(StrUtil.splitToLong(record.getImageIds(), ",")).boxed().toList())
                                     .list()

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIssueTicketAuditQO.java

@@ -1,6 +1,7 @@
 package com.nflg.wms.common.pojo.qo;
 
 import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -10,7 +11,7 @@ import lombok.experimental.Accessors;
  */
 @Data
 @Accessors(chain = true)
-public class QmsIncomingInspectionIssueTicketAuditQO {
+public class QmsIssueTicketAuditQO {
 
     /**
      * 工单ID

nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsIncomingInspectionTask.java

@@ -52,11 +52,6 @@ public class QmsIncomingInspectionTask implements Serializable {
      */
     private Long inspectionStandardId;
 
-    /**
-     * 检测方式，关联字典项id（字典编码：InspectionStandardTestingMethod）
-     */
-    private Long testingMethodDictItemId;
-
     /**
      * 供应商编号
      */