From a800325bd27accf4c6b678297581d7fc951ff9e8 Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Tue, 9 Dec 2025 17:15:07 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E9=80=80=E8=B4=A7=E6=9C=89?=
 =?UTF-8?q?=E6=95=88=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sales-return/sales-return-inbound.vue     | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/sales-return/sales-return-inbound.vue b/src/views/modules/sales-return/sales-return-inbound.vue
index 91c1ab9..24fc6ee 100644
--- a/src/views/modules/sales-return/sales-return-inbound.vue
+++ b/src/views/modules/sales-return/sales-return-inbound.vue
@@ -145,6 +145,20 @@
                   <el-input v-model="inboundItem.batchNo" placeholder="请输入批号" />
                 </el-form-item>
               </el-col>
+              <el-col :span="12">
+                <el-form-item label="WDR">
+                  <el-input v-model="inboundItem.wdr" placeholder="请输入批号" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12"><el-form-item label="有效期">
+                <el-date-picker
+                  v-model="inboundItem.ifsExpiryDate"
+                  type="date"
+                  placeholder="选择有效期"
+                  value-format="yyyy-MM-dd"
+                  style="width: 100%"
+                />
+              </el-form-item></el-col>
               <el-col :span="12">
                 <el-form-item label="高度(mm)">
                   <el-input v-model="inboundItem.height" type="number" placeholder="请输入高度" />
@@ -403,7 +417,9 @@ export default {
         invUOM: row.invUOM,
         transQty: '',
         uom: row.returnUOM,
-        locationNo: 'AS',
+        wdr:'*',
+        ifsExpiryDate:'',
+        locationNo: '',
         batchNo: `${this.scanRmaNo}-${row.rmaLineNo}-1`,
         site: this.site,
         height: this.parseHeightFromPartNo(row.invPartNo)  // 根据物料编码自动填充高度
@@ -545,8 +561,10 @@ export default {
         warehouseId: this.warehouseId,
         height: item.height || null,  // 高度(mm)
         rmaLineNo: item.rmaLineNo,
-        engChgLevel: row.engChgLevel || "1",
+        engChgLevel: item.engChgLevel || "1",
         invUOM: item.invUOM,
+        wdr:item.wdr,
+        expiryDate:item.ifsExpiryDate,
         packUnitList: this.handlingUnit.map(hu => ({
           code: hu.code,
           qty: hu.qty,