From 0dac6f94a16200c8bfd7c75449082ca529dcb97e Mon Sep 17 00:00:00 2001
From: shenzhouyu <zhouyu.shen@xujiesoft.com>
Date: Sat, 4 Oct 2025 20:45:58 +0800
Subject: [PATCH] =?UTF-8?q?MR=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/mr-issue/mrPicking.vue             | 1 +
 src/views/modules/mr-issue/mrPickingDetail.vue       | 6 +++++-
 src/views/modules/mr-issue/mrReturnPickingDetail.vue | 4 ++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/mr-issue/mrPicking.vue b/src/views/modules/mr-issue/mrPicking.vue
index 4fa60f8..0837697 100644
--- a/src/views/modules/mr-issue/mrPicking.vue
+++ b/src/views/modules/mr-issue/mrPicking.vue
@@ -259,6 +259,7 @@ export default {
             statusCode: material.statusCode,
             releaseNo: material.releaseNo,
             dueDate: material.dueDate,
+            lineItemNo: material.lineItemNo,
           },
         },
       })
diff --git a/src/views/modules/mr-issue/mrPickingDetail.vue b/src/views/modules/mr-issue/mrPickingDetail.vue
index b78c8b4..49adcf8 100644
--- a/src/views/modules/mr-issue/mrPickingDetail.vue
+++ b/src/views/modules/mr-issue/mrPickingDetail.vue
@@ -27,7 +27,7 @@
     <div class="work-order-list" v-if="mrInfo.orderNo">
       <div class="material-card">
         <div class="card-title">
-          <span class="title-label">MR号：{{ mrInfo.orderNo }} &nbsp;&nbsp; 行号：{{ mrInfo.lineNo }}</span>
+          <span class="title-label">MR号：{{ mrInfo.orderNo }} &nbsp;&nbsp; 行号：{{ mrInfo.lineNo }} &nbsp;&nbsp; lineItemNo:{{ mrInfo.lineItemNo }}</span>
         </div>
 
         <!-- 物料描述单独一行 -->
@@ -259,6 +259,7 @@ export default {
               batchNo: data.labelInfo.batchNo,
               locationId: data.labelInfo.locationId,
               warehouseId: data.labelInfo.warehouseId,
+              wdrNo: data.labelInfo.wdrNo,
             })
 
             this.$message.success('扫描成功')
@@ -307,6 +308,7 @@ export default {
         partNo: this.partNo,
         issueQty: this.totalIssueQty,
         releaseNo: this.material.releaseNo,
+        lineItemNo: this.material.lineItemNo,
         selectedMaterials: this.labelList.map((label) => ({
           labelCode: label.labelCode,
           issueQty: label.quantity,
@@ -314,6 +316,7 @@ export default {
           partNo: label.partNo,
           locationId: label.locationId,
           warehouseId: label.warehouseId,
+          wdrNo: label.wdrNo,
         })),
       }
 
@@ -379,6 +382,7 @@ export default {
         statusCode: this.material.statusCode,
         releaseNo: this.material.releaseNo,
         dueDate: this.material.dueDate,
+        lineItemNo: this.material.lineItemNo,
       }
     },
 
diff --git a/src/views/modules/mr-issue/mrReturnPickingDetail.vue b/src/views/modules/mr-issue/mrReturnPickingDetail.vue
index 99964f2..37a428b 100644
--- a/src/views/modules/mr-issue/mrReturnPickingDetail.vue
+++ b/src/views/modules/mr-issue/mrReturnPickingDetail.vue
@@ -335,6 +335,7 @@ export default {
               quantity: data.labelInfo.availableQty,
               batchNo: data.labelInfo.batchNo,
               returnReason: data.labelInfo.returnReason,
+              wdrNo: data.labelInfo.wdrNo
             })
 
             this.$message.success('操作成功')
@@ -378,6 +379,9 @@ export default {
           quantity: label.quantity,
           batchNo: label.batchNo,
           partNo: label.partNo,
+          locationId: label.locationId,
+          warehouseId: label.warehouseId,
+          wdrNo: label.wdrNo,
         })),
       }