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 8f2b9b5f..68083fb0 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
@@ -501,9 +501,9 @@ public class QmsIssueTicketControllerService {
 
         // 查询工单类型：PDI-新机检测 或 PDI-库存检测
         if (ticket.getSourceId() != null) {
-            QmsPdiTaskRecord taskRecord = taskRecordService.getById(ticket.getSourceId());
+            QmsPdiTaskRecord taskRecord = pdiTaskRecordService.getById(ticket.getSourceId());
             if (taskRecord != null && taskRecord.getDetectionRulesId() != null) {
-                QmsPdiDetectionRules detectionRules = detectionRulesService.getById(taskRecord.getDetectionRulesId());
+                QmsPdiDetectionRules detectionRules = pdiDetectionRulesService.getById(taskRecord.getDetectionRulesId());
                 if (detectionRules != null && detectionRules.getInspectionType() != null) {
                     String inspectionTypeStr = detectionRules.getInspectionType() == 0 ? "新机检测" : "库存检测";
                     vo.setTicketType("PDI-" + inspectionTypeStr);
@@ -748,9 +748,9 @@ public class QmsIssueTicketControllerService {
 
         // 生成主题：机型编号+订单编号+出厂检测/库存检测+检测版本号
         if (ticket.getSourceId() != null) {
-            QmsPdiTaskRecord taskRecord = taskRecordService.getById(ticket.getSourceId());
+            QmsPdiTaskRecord taskRecord = pdiTaskRecordService.getById(ticket.getSourceId());
             if (taskRecord != null && taskRecord.getDetectionRulesId() != null) {
-                QmsPdiDetectionRules detectionRules = detectionRulesService.getById(taskRecord.getDetectionRulesId());
+                QmsPdiDetectionRules detectionRules = pdiDetectionRulesService.getById(taskRecord.getDetectionRulesId());
                 if (detectionRules != null) {
                     String inspectionTypeStr = detectionRules.getInspectionType() != null && detectionRules.getInspectionType() == 0 ? "新机检测" : "库存检测";
                     vo.setTicketTitle(detectionRules.getMachineNo() + "-" + detectionRules.getOrderNo() + "-" + inspectionTypeStr + "-" + detectionRules.getInspectionVersion());
@@ -783,7 +783,7 @@ public class QmsIssueTicketControllerService {
                         .map(Long::valueOf)
                         .collect(Collectors.toList());
 
-                List<QmsPdiInspectionResults> unqualifiedResults = inspectionResultsService.lambdaQuery()
+                List<QmsPdiInspectionResults> unqualifiedResults = pdiInspectionResultsService.lambdaQuery()
                         .in(QmsPdiInspectionResults::getId, resultIds)
                         .eq(QmsPdiInspectionResults::getInspectionItemResults, false)
                         .list();
@@ -791,17 +791,17 @@ public class QmsIssueTicketControllerService {
                 // 查询检测规则状态项（部件描述、检查内容等）
                 Map<Long, QmsPdiDetectionRulesStatusItem> statusItemMap = new HashMap<>();
                 if (CollectionUtil.isNotEmpty(unqualifiedResults)) {
-                    List<Long> inspectionItemIds = unqualifiedResults.stream()
+                    List<Long> statusItemIds = unqualifiedResults.stream()
                             .map(QmsPdiInspectionResults::getInspectionItemId)
                             .filter(Objects::nonNull)
                             .distinct()
-                            .toList();
-                    if (CollectionUtil.isNotEmpty(inspectionItemIds)) {
-                        List<QmsPdiDetectionRulesStatusItem> statusItems = detectionRulesStatusItemService.lambdaQuery()
-                                .in(QmsPdiDetectionRulesStatusItem::getInspectionItemId, inspectionItemIds)
+                            .collect(Collectors.toList());
+                    if (CollectionUtil.isNotEmpty(statusItemIds)) {
+                        List<QmsPdiDetectionRulesStatusItem> statusItems = pdiStatusItemService.lambdaQuery()
+                                .in(QmsPdiDetectionRulesStatusItem::getId, statusItemIds)
                                 .list();
                         statusItemMap = statusItems.stream()
-                                .collect(Collectors.toMap(QmsPdiDetectionRulesStatusItem::getInspectionItemId, item -> item, (a, b) -> a));
+                                .collect(Collectors.toMap(QmsPdiDetectionRulesStatusItem::getId, item -> item, (a, b) -> a));
                     }
                 }
 
@@ -814,7 +814,7 @@ public class QmsIssueTicketControllerService {
                         .map(String::trim)
                         .map(Long::valueOf)
                         .distinct()
-                        .toList();
+                        .collect(Collectors.toList());
                 if (CollectionUtil.isNotEmpty(allImageIds)) {
                     List<FileUploadRecord> fileRecords = fileUploadRecordService.lambdaQuery()
                             .in(FileUploadRecord::getId, allImageIds)
@@ -863,10 +863,13 @@ public class QmsIssueTicketControllerService {
                                 .map(Long::valueOf)
                                 .map(fileUploadRecordMap::get)
                                 .filter(Objects::nonNull)
-                                .map(file -> new QmsPdiTaskRecordDetailVO.FileDetailVO()
-                                        .setId(file.getId())
-                                        .setUrl(file.getUrl())
-                                        .setFileName(file.getFileName()))
+                                .map(file -> {
+                                    QmsPdiTaskRecordDetailVO.FileDetailVO fileVO = new QmsPdiTaskRecordDetailVO.FileDetailVO();
+                                    fileVO.setId(file.getId());
+                                    fileVO.setUrl(file.getUrl());
+                                    fileVO.setFileName(file.getFileName());
+                                    return fileVO;
+                                })
                                 .collect(Collectors.toList());
                         itemVO.setInspectionItemImage(imageDetails);
                     }
diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketProcessMeasureControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketProcessMeasureControllerService.java
index 2a32dfc7..65caee92 100644
--- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketProcessMeasureControllerService.java
+++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketProcessMeasureControllerService.java
@@ -1,6 +1,8 @@
 package com.nflg.qms.admin.service;
 
 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.QmsIssueTicketProcessDraftQO;
 import com.nflg.wms.common.pojo.qo.QmsIssueTicketProcessLeaderDraftQO;
 import com.nflg.wms.common.util.UserUtil;