From ac02c62622bccdb06b71a792e081ed74e9d01b94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=AD=E9=A3=9E?= <guofei2922@boe.com.cn>
Date: Thu, 15 May 2025 18:07:24 +0800
Subject: [PATCH] =?UTF-8?q?add=EF=BC=9A=E9=87=87=E8=B4=AD=E9=80=80?=
 =?UTF-8?q?=E8=B4=A7=E6=9B=B4=E6=8D=A2=E6=89=B9=E6=AC=A1=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/StockOut/index.ts              |  7 +++++++
 src/views/stockOut/PurReturn/index.vue | 24 ++++++++++++++++++++----
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/src/api/StockOut/index.ts b/src/api/StockOut/index.ts
index 41a1f98..fd1ef4a 100644
--- a/src/api/StockOut/index.ts
+++ b/src/api/StockOut/index.ts
@@ -86,6 +86,13 @@ export function purReturnCommit(data: any) {
     data: data,
   });
 }
+export function getPackingList(data: any) {
+  return request({
+    url: '/api/purchase/getPackingList',
+    method: 'post',
+    data: data,
+  });
+}
 
 export function AssignShipRequestByCharge(data: any) {
   return request({
diff --git a/src/views/stockOut/PurReturn/index.vue b/src/views/stockOut/PurReturn/index.vue
index 08b2f74..74aa3cc 100644
--- a/src/views/stockOut/PurReturn/index.vue
+++ b/src/views/stockOut/PurReturn/index.vue
@@ -133,7 +133,7 @@ import { useRouter } from "vue-router";
 import { create } from "sortablejs";
 import { FirstInFirstOut, IFTRUE } from '@/utils/CommonUtil'
 import { bTableHeight } from "../../../composables/calcTableHeight";
-import { AssignAndDessign, purReturnCommit } from '@/api/StockOut'
+import { AssignAndDessign, purReturnCommit,getPackingList } from '@/api/StockOut'
 import { localStorage } from '@/utils/storage'
 
 const { tableContainer, tableHeight, updateTableHeight, handleResize } = bTableHeight(440);
@@ -378,9 +378,25 @@ function handle(row: any, event: any, column: any) {
   state.queryParams.params.PHASE = row.PHASE;
   state.queryParams.params.SHIPREQUESTNAME = row.RECEIVEREQUESTNAME;
   state.queryParams.params.SHIPREQUESTDETAILNAME = row.RECEIVEREQUESTDETAILNAME;
-  getQueryList(state.queryParams).then((res: any) => {
-    state.MaterialPackingList = res.data;
-  });
+
+  // 原直接查询出左边批次信息
+  // getQueryList(state.queryParams).then((res: any) => {
+  //   state.MaterialPackingList = res.data;
+  // });
+
+  // 改为查询表里带出的批次
+  state.queryParams.params.WMSRETURNCHARGENO = row.WMSRETURNCHARGENO;
+  getPackingList(state.queryParams.params).then((res: any) => {
+    console.log(res)
+    state.MaterialPackingList = res.resultObj;
+
+    }).catch((error: any) => {
+        ElMessageBox.alert(error, '提示框', {
+          confirmButtonText: 'OK',
+        })
+
+      });
+  
 
   state.RightqueryParams.queryId = 'GetPackingRow';
   state.RightqueryParams.version = '00002';