From dbafce561c3fdf1d7cf1f8967a7fb1cbe85f4892 Mon Sep 17 00:00:00 2001
From: qiankanghui <kanghui.qian@xujiesoft.com>
Date: Thu, 2 Jul 2026 17:46:47 +0800
Subject: [PATCH] =?UTF-8?q?feat(inspection):=20=E4=BC=98=E5=8C=96IQC?=
 =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=B5=81=E7=A8=8B=E5=A2=9E=E5=8A=A0=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=A3=80=E6=9F=A5=E5=92=8C=E5=BC=82=E5=B8=B8=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 引入qc模块的actionIQCInspection和qcIQCInspectionSearch接口
- 在创建检验单后增加检验单状态查询逻辑
- 添加开始检验状态更新功能，确保检验单状态正确流转
- 增强错误处理机制，当状态更新失败时仍能继续执行后续流程
- 实现双重保障机制，查询失败时直接执行原有验货流程
- 优化用户体验，添加更详细的进度提示和警告信息
---
 .../modules/inspection/myInspectionList.vue   | 136 +++++++++++++++---
 1 file changed, 119 insertions(+), 17 deletions(-)

diff --git a/src/views/modules/inspection/myInspectionList.vue b/src/views/modules/inspection/myInspectionList.vue
index 24ae59c..b4a3876 100644
--- a/src/views/modules/inspection/myInspectionList.vue
+++ b/src/views/modules/inspection/myInspectionList.vue
@@ -55,6 +55,7 @@
 
 <script>
 import { getMyInspectionList, createIqc, startInspection } from '@/api/inspection/inspectionRequestHeader.js'
+import { actionIQCInspection, qcIQCInspectionSearch } from '@/api/qc/qc.js'
 
 
 export default {
@@ -183,29 +184,130 @@ export default {
             const inspectionNo = data.inspectionNo
             this.$message.success('IQC检验单创建成功：' + inspectionNo)
 
-            // 第二步：调用 startInspection 接口，传入 requestNo 和 itemNo
-            const startInspectionData = {
-              requestNo: row.requestNo,
-              itemNo: row.itemNo
+            // 第二步：createIqc 成功后，立即查询检验单并执行开始检验逻辑
+            const searchParams = {
+              site: row.site,
+              userName: this.$store.state.user.name,
+              inspectionNo: inspectionNo,
+              inspectionTypeNo: '105',
+              states: ['未开始', '待检验'],
+              page: 1,
+              limit: 1
             }
-            startInspection(startInspectionData).then(({ data }) => {
-              if (data.code === 0) {
-                this.$message.success('开始验货成功')
-                // 刷新列表
-                this.getList()
-
-                // 跳转到 IQCResultEntry 页面，并传入检验单号作为查询条件
-                this.$router.push({
-                  name: 'qc-IQCResultEntry',
-                  query: {
-                    inspectionNo: inspectionNo
+            
+            qcIQCInspectionSearch(searchParams).then(({ data }) => {
+              if (data.code === 0 && data.page.list && data.page.list.length > 0) {
+                const iqcRecord = data.page.list[0]
+                
+                // 调用开始检验接口，更新状态为"待检验"
+                const actionIQCData = {
+                  site: iqcRecord.site,
+                  buNo: iqcRecord.buNo,
+                  inspectionNo: inspectionNo,
+                  actionBy: this.$store.state.user.name,
+                  state: '待检验',
+                  equipmentList: []
+                }
+                
+                actionIQCInspection(actionIQCData).then(({ data }) => {
+                  if (data.code === 0) {
+                    this.$message.success('开始检验成功')
+                  } else {
+                    this.$message.warning((data && data.msg) || '开始检验失败，但不影响后续操作')
                   }
+                  
+                  // 第三步：执行原有的 startInspection 逻辑
+                  const startInspectionData = {
+                    requestNo: row.requestNo,
+                    itemNo: row.itemNo
+                  }
+                  startInspection(startInspectionData).then(({ data }) => {
+                    if (data.code === 0) {
+                      this.$message.success('开始验货成功')
+                      this.getList()
+                      this.$router.push({
+                        name: 'qc-IQCResultEntry',
+                        query: {
+                          inspectionNo: inspectionNo
+                        }
+                      })
+                    } else {
+                      this.$message.error((data && data.msg) || '开始验货失败')
+                    }
+                  }).catch((error) => {
+                    this.$message.error('开始验货失败：' + error.message)
+                  })
+                }).catch((error) => {
+                  this.$message.warning('开始检验异常：' + error.message + '，继续执行后续操作')
+                  // 即使开始检验失败，也继续执行 startInspection
+                  const startInspectionData = {
+                    requestNo: row.requestNo,
+                    itemNo: row.itemNo
+                  }
+                  startInspection(startInspectionData).then(({ data }) => {
+                    if (data.code === 0) {
+                      this.$message.success('开始验货成功')
+                      this.getList()
+                      this.$router.push({
+                        name: 'qc-IQCResultEntry',
+                        query: {
+                          inspectionNo: inspectionNo
+                        }
+                      })
+                    } else {
+                      this.$message.error((data && data.msg) || '开始验货失败')
+                    }
+                  }).catch((error) => {
+                    this.$message.error('开始验货失败：' + error.message)
+                  })
                 })
               } else {
-                this.$message.error((data && data.msg) || '开始验货失败')
+                this.$message.warning('未找到检验单信息，将直接执行开始验货')
+                // 如果查询不到检验单，直接执行原有的 startInspection 逻辑
+                const startInspectionData = {
+                  requestNo: row.requestNo,
+                  itemNo: row.itemNo
+                }
+                startInspection(startInspectionData).then(({ data }) => {
+                  if (data.code === 0) {
+                    this.$message.success('开始验货成功')
+                    this.getList()
+                    this.$router.push({
+                      name: 'qc-IQCResultEntry',
+                      query: {
+                        inspectionNo: inspectionNo
+                      }
+                    })
+                  } else {
+                    this.$message.error((data && data.msg) || '开始验货失败')
+                  }
+                }).catch((error) => {
+                  this.$message.error('开始验货失败：' + error.message)
+                })
               }
             }).catch((error) => {
-              this.$message.error('开始验货失败：' + error.message)
+              this.$message.warning('查询检验单失败：' + error.message + '，将直接执行开始验货')
+              // 查询失败，直接执行原有的 startInspection 逻辑
+              const startInspectionData = {
+                requestNo: row.requestNo,
+                itemNo: row.itemNo
+              }
+              startInspection(startInspectionData).then(({ data }) => {
+                if (data.code === 0) {
+                  this.$message.success('开始验货成功')
+                  this.getList()
+                  this.$router.push({
+                    name: 'qc-IQCResultEntry',
+                    query: {
+                      inspectionNo: inspectionNo
+                    }
+                  })
+                } else {
+                  this.$message.error((data && data.msg) || '开始验货失败')
+                }
+              }).catch((error) => {
+                this.$message.error('开始验货失败：' + error.message)
+              })
             })
           } else {
             this.$message.error((data && data.msg) || '创建IQC检验单失败')