From d349ff6ee5666be67fcb360028c8526de3316443 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Fri, 31 Oct 2025 17:50:54 +0800
Subject: [PATCH] =?UTF-8?q?2025-10-31=20pda=E8=B0=83=E6=95=B4=E6=89=AB?=
 =?UTF-8?q?=E6=8F=8F=E3=80=81=E6=9F=A5=E8=AF=A2=E3=80=81=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=88=E9=94=80=E5=94=AE=E9=80=80=E8=B4=A7?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/salesReturn.js                        |  8 +-
 .../sales-return/salesReturnStorage.vue       | 94 +++++++++++--------
 2 files changed, 64 insertions(+), 38 deletions(-)

diff --git a/src/api/salesReturn.js b/src/api/salesReturn.js
index b47880c..f93c96c 100644
--- a/src/api/salesReturn.js
+++ b/src/api/salesReturn.js
@@ -28,4 +28,10 @@ export const confirmSalesReturnStorage = data => createAPI(`salesReturn/confirmS
  * 获取销售退货物料清单
  * @param {Object} data - 查询参数 {site, buNo, returnNo}
  */
-export const getSalesReturnMaterialList = data => createAPI(`salesReturn/getSalesReturnMaterialList`, 'post', data)
\ No newline at end of file
+export const getSalesReturnMaterialList = data => createAPI(`salesReturn/getSalesReturnMaterialList`, 'post', data)
+
+/**
+ * 获取已扫描标签列表（从缓存表）
+ * @param {Object} data - 查询参数 {site, buNo, returnNo}
+ */
+export const getScannedLabelList = data => createAPI(`salesReturn/getScannedLabelList`, 'post', data)
\ No newline at end of file
diff --git a/src/views/modules/sales-return/salesReturnStorage.vue b/src/views/modules/sales-return/salesReturnStorage.vue
index 992ffbe..3cb6c6e 100644
--- a/src/views/modules/sales-return/salesReturnStorage.vue
+++ b/src/views/modules/sales-return/salesReturnStorage.vue
@@ -198,7 +198,7 @@
 </template>
 
 <script>
-import { getSalesReturnDetails, validateLabelWithSalesReturn, confirmSalesReturnStorage, getSalesReturnMaterialList } from "@/api/salesReturn.js";
+import { getSalesReturnDetails, validateLabelWithSalesReturn, confirmSalesReturnStorage, getSalesReturnMaterialList, getScannedLabelList } from "@/api/salesReturn.js";
 import { getCurrentWarehouse } from '@/utils'
 import moment from 'moment';
 export default {
@@ -235,33 +235,20 @@ export default {
       this.scanCode = '';
     },
 
-    // 验证标签并添加到列表
+    // 验证标签并添加到列表（调用存储过程）
     validateAndAddLabel(labelCode) {
       const params = {
         labelCode: labelCode,
+        returnNo: this.returnNo,
         site: localStorage.getItem('site'),
-        buNo: this.materialInfo.buNo
+        buNo: this.materialInfo.buNo,
+        operationType: 'I' // 添加标签
       };
       validateLabelWithSalesReturn(params).then(({ data }) => {
         if (data && data.code === 0) {
-          const resultList = data.data;
-          // 检查是否已经扫描过
-          const exists = this.labelList.find(item => item.labelCode === labelCode);
-          if (exists) {
-            this.$message.warning('该标签已扫描，请勿重复扫描');
-            return;
-          }
-          // 将所有结果添加到列表
-          resultList.forEach(result => {
-            this.labelList.push({
-              id: Date.now() + Math.random(), // 确保ID唯一
-              labelCode: result.labelCode,
-              partNo: result.partNo,
-              quantity: result.quantity,
-              batchNo: result.batchNo
-            });
-          });
-          this.$message.success(`标签验证成功，共添加 ${resultList.length} 条记录`);
+          this.$message.success('标签添加成功');
+          // 重新加载已扫描标签列表
+          this.loadScannedLabelList();
         } else {
           this.$message.error(data.msg || '该标签不符合退货条件，请检查');
         }
@@ -271,15 +258,27 @@ export default {
       });
     },
 
-    // 通过条码移除标签
+    // 通过条码移除标签（调用存储过程）
     removeLabelByCode(labelCode) {
-      const index = this.labelList.findIndex(item => item.labelCode === labelCode);
-      if (index !== -1) {
-        this.labelList.splice(index, 1);
-        this.$message.success('标签移除成功');
-      } else {
-        this.$message.warning('未找到该标签');
-      }
+      const params = {
+        labelCode: labelCode,
+        returnNo: this.returnNo,
+        site: localStorage.getItem('site'),
+        buNo: this.materialInfo.buNo,
+        operationType: 'D' // 移除标签
+      };
+      validateLabelWithSalesReturn(params).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.$message.success('标签移除成功');
+          // 重新加载已扫描标签列表
+          this.loadScannedLabelList();
+        } else {
+          this.$message.error(data.msg || '移除失败');
+        }
+      }).catch(error => {
+        console.error('标签移除失败:', error);
+        this.$message.error('移除失败');
+      });
     },
 
     // 确认退货
@@ -307,7 +306,7 @@ export default {
       this.locationCode = '';
     },
 
-    // 提交退货
+    // 提交退货（调用存储过程）
     submitReturn() {
       if (!this.locationCode.trim()) {
         this.$message.warning('请输入库位号');
@@ -317,13 +316,7 @@ export default {
         site:this.materialInfo.site,
         buNo: this.materialInfo.buNo,
         returnNo: this.returnNo,
-        locationCode: this.locationCode.trim(),
-        labels: this.labelList.map(label => ({
-          labelCode: label.labelCode,
-          quantity: label.quantity,
-          batchNo: label.batchNo,
-          partNo: label.partNo,
-        }))
+        locationCode: this.locationCode.trim()
       };
       confirmSalesReturnStorage(params).then(({ data }) => {
         if (data && data.code === 0) {
@@ -339,6 +332,31 @@ export default {
       });
     },
 
+    // 加载已扫描标签列表（从缓存表）
+    loadScannedLabelList() {
+      const params = {
+        site: localStorage.getItem('site'),
+        buNo: this.materialInfo.buNo,
+        returnNo: this.returnNo
+      };
+      getScannedLabelList(params).then(({ data }) => {
+        if (data && data.code === 0) {
+          const labelData = data.data || [];
+          this.labelList = labelData.map((item, index) => ({
+            id: Date.now() + index,
+            labelCode: item.labelCode,
+            partNo: item.partNo,
+            quantity: item.quantity,
+            batchNo: item.batchNo || ''
+          }));
+        } else {
+          console.error('加载已扫描标签列表失败:', data.msg);
+        }
+      }).catch(error => {
+        console.error('加载已扫描标签列表失败:', error);
+      });
+    },
+
     // 打印标签
     printLabels() {
       if (this.labelList.length === 0) {
@@ -418,6 +436,8 @@ export default {
       getSalesReturnDetails(params).then(({ data }) => {
         if (data && data.code === 0) {
           this.materialInfo = data.data;
+          // 加载已扫描标签列表
+          this.loadScannedLabelList();
         } else {
           this.$message.error(data.msg || '获取退货单详情失败');
         }