From 3402ffeca172bbf2341f949e485b2d4783f053a5 Mon Sep 17 00:00:00 2001
From: qiankanghui <kanghui.qian@xujiesoft.com>
Date: Wed, 12 Aug 2026 10:58:55 +0800
Subject: [PATCH] =?UTF-8?q?feat(inspection):=20=E6=B7=BB=E5=8A=A0=E8=8D=89?=
 =?UTF-8?q?=E7=A8=BF=E7=BC=96=E8=BE=91=E4=BF=9D=E5=AD=98=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=B9=B6=E4=BC=98=E5=8C=96=E9=AA=8C=E8=B4=A7=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增 editSaveInspectionRequest 接口用于草稿编辑保存
- 在验货申请列表组件中引入新的草稿编辑保存接口
- 新增 totalQty 字段用于记录明细的未验货数量
- 重构草稿编辑保存逻辑，改为一次性提交全量数据
- 移除区分新增/修改/删除的复杂处理逻辑
- 简化为直接提交当前表格中的所有PO明细作为最终状态
- 移除相关的辅助方法 addNewPoDetails、editModifiedPoDetails、deletePoDetails
---
 src/api/inspection/inspectionRequestHeader.js |   3 +
 .../inspection/inspectionRequestList.vue      | 184 +++---------------
 2 files changed, 32 insertions(+), 155 deletions(-)

diff --git a/src/api/inspection/inspectionRequestHeader.js b/src/api/inspection/inspectionRequestHeader.js
index f77c626..e7c926f 100644
--- a/src/api/inspection/inspectionRequestHeader.js
+++ b/src/api/inspection/inspectionRequestHeader.js
@@ -96,3 +96,6 @@ export const editInspectionDetails = (data) => createAPI(`/inspection/editDetail
 
 // 删除验货申请明细
 export const deleteInspectionDetails = (data) => createAPI(`/inspection/deleteDetails`, 'post', data)
+
+// 草稿编辑保存（合并删除/修改/新增/更新基础信息）
+export const editSaveInspectionRequest = (data) => createAPI(`/inspection/editSave`, 'post', data)
diff --git a/src/views/modules/inspection/inspectionRequestList.vue b/src/views/modules/inspection/inspectionRequestList.vue
index 1ff08ab..2bf7670 100644
--- a/src/views/modules/inspection/inspectionRequestList.vue
+++ b/src/views/modules/inspection/inspectionRequestList.vue
@@ -1111,7 +1111,7 @@
 </template>
 
 <script>
-import { searchInspectionRequestHeaderList, queryPoPage, queryPoPageExclude, queryPoSupplierPage, queryPoSupplierOrderPage, saveInspectionRequest, deleteInspectionRequest, confirmInspectionRequest, applyChangeInspectionRequest, getInspectionRequestDetailSubList, updateInspectionRequest, downloadTemplate, previewUpload, batchSave, addInspectionDetails, editInspectionDetails, deleteInspectionDetails } from '@/api/inspection/inspectionRequestHeader.js'
+import { searchInspectionRequestHeaderList, queryPoPage, queryPoPageExclude, queryPoSupplierPage, queryPoSupplierOrderPage, saveInspectionRequest, deleteInspectionRequest, confirmInspectionRequest, applyChangeInspectionRequest, getInspectionRequestDetailSubList, updateInspectionRequest, downloadTemplate, previewUpload, batchSave, addInspectionDetails, editInspectionDetails, deleteInspectionDetails, editSaveInspectionRequest } from '@/api/inspection/inspectionRequestHeader.js'
 import { searchSrmSupplierAddressList, createSrmSupplierAddress, updateSrmSupplierAddress, searchSrmSupplierList } from '@/api/srm/srmSupplier.js'
 import { getPermissionValue } from '@/api/sys/specialSecurity.js'
 import Chooselist from '@/views/modules/common/Chooselist_eam'
@@ -2442,7 +2442,8 @@ export default {
         shipMethod: row.shipMethod || row.shipMothod || '',
         shipMothod: row.shipMethod || row.shipMothod || '', // 保持字段一致性
         crd: row.crd || '',
-        waitInspectQty: row.waitInspectQty || 0
+        waitInspectQty: row.waitInspectQty || 0,
+        totalQty: row.waitInspectQty || 0  // 新增明细的未验货数量取PO的可用待验数量
       }))
 
       // 将新PO明细添加到编辑列表中
@@ -3419,7 +3420,7 @@ export default {
       })
     },
 
-    // 草稿编辑保存：先新增PO，再修改PO，最后更新基础信息
+    // 草稿编辑保存：将当前表格中所有PO明细（排除已删除的）作为最终状态一次性提交
     handleSaveEdit () {
       this.$refs.addFormData.validate((valid) => {
         if (!valid) {
@@ -3427,25 +3428,17 @@ export default {
           return
         }
 
-        // 区分新增和修改的PO明细
-        const originalPoKeys = new Set()
-        this.originalEditPoDetailList.forEach(item => {
-          const key = `${item.orderRef1 || ''}_${item.orderRef2 || ''}`
-          originalPoKeys.add(key)
-        })
-
-        const newPoItems = []  // 新增的PO明细
-        const modifiedPoItems = []  // 修改的PO明细
-
+        // 收集当前表格中所有PO明细（排除已删除的），作为最终状态
+        const allItems = []
         this.editPoDetailList.forEach(row => {
           const key = `${row.orderRef1 || ''}_${row.orderRef2 || ''}`
-          
-          // 如果这个key在被删除列表中，跳过（不新增也不修改）
+
+          // 跳过已删除的
           if (this.deletedPoKeys.has(key)) {
             return
           }
-          
-          const itemData = {
+
+          allItems.push({
             orderNo: row.poNo || row.orderNo || row.order_ref1 || row.orderRef1 || '',
             orderRef1: row.orderRef1 || row.order_ref1 || '',
             orderRef2: row.orderRef2 || row.order_ref2 || '',
@@ -3454,156 +3447,37 @@ export default {
             qty: row.qty || 0,
             shipMethod: row.shipMethod || row.shipMothod || '',
             crd: row.crd || ''
-          }
-
-          if (originalPoKeys.has(key)) {
-            // 原有PO，属于修改
-            modifiedPoItems.push(itemData)
-          } else {
-            // 新添加的PO
-            newPoItems.push(itemData)
-          }
-        })
-
-        console.log('=== 区分新增和修改 ===', {
-          '新增PO数量': newPoItems.length,
-          '修改PO数量': modifiedPoItems.length,
-          '新增PO': newPoItems,
-          '修改PO': modifiedPoItems
-        })
-
-        // 执行顺序：1.删除 -> 2.修改 -> 3.新增 -> 4.更新基础信息
-        let promiseChain = Promise.resolve()
-
-        // 0. 如果有删除的PO，先调用 deleteInspectionDetails
-        if (this.deletedPoKeys.size > 0) {
-          const deletedItemNos = []
-          this.deletedPoKeys.forEach(itemStr => {
-            try {
-              const item = JSON.parse(itemStr)
-              if (item.itemNo) {
-                deletedItemNos.push(item.itemNo)
-              }
-            } catch (e) {
-              console.error('解析删除项失败:', itemStr, e)
-            }
-          })
-
-          if (deletedItemNos.length > 0) {
-            promiseChain = promiseChain.then(() => {
-              return this.deletePoDetails(deletedItemNos)
-            })
-          }
-        }
-
-        // 1. 如果有修改的PO，再调用 editInspectionDetails
-        if (modifiedPoItems.length > 0) {
-          promiseChain = promiseChain.then(() => {
-            return this.editModifiedPoDetails(modifiedPoItems)
           })
-        }
-
-        // 2. 如果有新增的PO，再调用 addInspectionDetails
-        if (newPoItems.length > 0) {
-          promiseChain = promiseChain.then(() => {
-            return this.addNewPoDetails(newPoItems)
-          })
-        }
-
-        // 3. 最后更新基础信息
-        promiseChain = promiseChain.then(() => {
-          const baseSubmitData = {
-            requestNo: this.addFormData.requestNo,
-            needInspectDate: this.addFormData.needInspectDate,
-            inspectAddress: this.addFormData.inspectAddressId || this.addFormData.inspectAddress,
-            inspectAddressId: this.addFormData.inspectAddressId || '',
-            inspectContract: this.addFormData.contact
-          }
-
-          return updateInspectionRequest(baseSubmitData).then(({ data }) => {
-            if (data.code === 0) {
-              this.$message.success('修改成功')
-              this.handleCloseAddDialog()
-              this.getMainData()
-            } else {
-              this.$message.error(data.msg || '基础信息保存失败')
-            }
-          })
-        }).catch((error) => {
-          console.error('保存失败:', error)
-          this.$message.error(error.message || '保存失败，请稍后重试')
         })
-      })
-    },
 
-    // 新增PO明细
-    addNewPoDetails (items) {
-      return new Promise((resolve, reject) => {
-        const params = {
+        console.log('=== 草稿编辑保存提交数据 ===', {
           requestNo: this.addFormData.requestNo,
-          site: this.$store.state.user.site,
-          items: items
-        }
-
-        console.log('=== 调用 addInspectionDetails ===', params)
-
-        addInspectionDetails(params).then(({ data }) => {
-          if (data && data.code === 0) {
-            console.log('新增PO明细成功')
-            resolve()
-          } else {
-            reject(new Error(data.msg || '新增PO明细失败'))
-          }
-        }).catch(error => {
-          reject(error)
+          明细数量: allItems.length,
+          明细: allItems
         })
-      })
-    },
 
-    // 修改PO明细
-    editModifiedPoDetails (items) {
-      return new Promise((resolve, reject) => {
-        const params = {
+        // 一次性提交后端：全量替换明细 + 更新基础信息（事务保证原子性）
+        const submitData = {
           requestNo: this.addFormData.requestNo,
           site: this.$store.state.user.site,
-          items: items
+          items: allItems,
+          needInspectDate: this.addFormData.needInspectDate,
+          inspectAddress: this.addFormData.inspectAddressId || this.addFormData.inspectAddress,
+          inspectAddressId: this.addFormData.inspectAddressId || '',
+          inspectContract: this.addFormData.contact
         }
 
-        console.log('=== 调用 editInspectionDetails ===', params)
-
-        editInspectionDetails(params).then(({ data }) => {
-          if (data && data.code === 0) {
-            console.log('修改PO明细成功')
-            resolve()
-          } else {
-            reject(new Error(data.msg || '修改PO明细失败'))
-          }
-        }).catch(error => {
-          reject(error)
-        })
-      })
-    },
-
-    // 删除PO明细
-    deletePoDetails (itemNos) {
-      return new Promise((resolve, reject) => {
-        const params = {
-          requestNo: this.addFormData.requestNo,
-          site: this.$store.state.user.site,
-          itemNos: itemNos
-        }
-
-        console.log('=== 调用 deleteInspectionDetails ===', params)
-
-        deleteInspectionDetails(params).then(({ data }) => {
-          if (data && data.code === 0) {
-            console.log('删除PO明细成功')
-            resolve()
+        editSaveInspectionRequest(submitData).then(({ data }) => {
+          if (data.code === 0) {
+            this.$message.success('修改成功')
+            this.handleCloseAddDialog()
+            this.getMainData()
           } else {
-            reject(new Error(data.msg || '删除PO明细失败'))
+            this.$message.error(data.msg || '修改失败')
           }
-        }).catch(error => {
-          reject(error)
+        }).catch((error) => {
+          console.error('保存失败:', error)
+          this.$message.error(error.message || '保存失败，请稍后重试')
         })
       })
     },