From 397943031498ba22be22431d925b4603ac9514fb Mon Sep 17 00:00:00 2001
From: "506583276@qq.com" <506583276@qq.com>
Date: Mon, 23 Oct 2023 14:14:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8A=E4=BC=A0=E4=BA=AC?=
 =?UTF-8?q?=E4=B8=9C=E9=87=87=E8=B4=AD=E5=8D=95=E4=BB=93=E5=BA=93=E5=90=8D?=
 =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E5=87=BA=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWY.Client/Models/FallWare/FallWareConfiguredModel.cs | 5 +++++
 BBWY.Client/Models/FallWare/JDWareBoxModel.cs          | 4 ++++
 BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs   | 3 ++-
 BBWY.Client/Views/FallWare/SetJDWareBoxWindow2.xaml.cs | 2 +-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/BBWY.Client/Models/FallWare/FallWareConfiguredModel.cs b/BBWY.Client/Models/FallWare/FallWareConfiguredModel.cs
index 0a641742..7e156ea9 100644
--- a/BBWY.Client/Models/FallWare/FallWareConfiguredModel.cs
+++ b/BBWY.Client/Models/FallWare/FallWareConfiguredModel.cs
@@ -36,6 +36,11 @@ namespace BBWY.Client.Models.FallWare
         /// </summary>
         public long SealBoxId { get; set; }
 
+        /// <summary>
+        /// 仓库名称
+        /// </summary>
+        public string WareId { get; set; }
+
         /// <summary>
         /// 仓库名称
         /// </summary>
diff --git a/BBWY.Client/Models/FallWare/JDWareBoxModel.cs b/BBWY.Client/Models/FallWare/JDWareBoxModel.cs
index 2f51f68d..0a65b4e9 100644
--- a/BBWY.Client/Models/FallWare/JDWareBoxModel.cs
+++ b/BBWY.Client/Models/FallWare/JDWareBoxModel.cs
@@ -24,6 +24,10 @@ namespace BBWY.Client.Models.FallWare
         /// </summary>
         public string WaybillNo { get; set; }
 
+        /// <summary>
+        /// 仓库id
+        /// </summary>
+        public string WareId { get; set; }
         /// <summary>
         /// 目的城市-仓库
         /// </summary>
diff --git a/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs b/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs
index 05111bb7..d993bb05 100644
--- a/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs
+++ b/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs
@@ -497,7 +497,8 @@ namespace BBWY.Client.ViewModels.PackTask
                 PrewOrder = fallware.PrewOrder,
                 ProductTitle = fallware.ProductTitle,
                 PurchaseOrder = fallware.PurchaseOrder,
-                WaybillNo = fallware.WaybillNo
+                WaybillNo = fallware.WaybillNo,
+                WareId = fallware.WareId
 
             };
             var w = new SetJDWareBoxWindow2(model, sealBoxService, fallware.WareType.Value, ReflashTask, fallware.TransportOverTime);
diff --git a/BBWY.Client/Views/FallWare/SetJDWareBoxWindow2.xaml.cs b/BBWY.Client/Views/FallWare/SetJDWareBoxWindow2.xaml.cs
index c6bf04ed..42613400 100644
--- a/BBWY.Client/Views/FallWare/SetJDWareBoxWindow2.xaml.cs
+++ b/BBWY.Client/Views/FallWare/SetJDWareBoxWindow2.xaml.cs
@@ -138,7 +138,7 @@ namespace BBWY.Client.Views.FallWare
                         return;
                     }
 
-                    if (getDetailResponse.Data.StoreName!= JDWareBoxModel.WareName)
+                    if (getDetailResponse.Data.StoreId != JDWareBoxModel.WareId)//使用仓库id判断 并实时更新仓库名
                     {
                         IsLoading = false;
                         this.Dispatcher.Invoke(() => MessageBox.Show($"采购单对应的仓库名:{getDetailResponse.Data.StoreName}与当前仓库:{JDWareBoxModel.WareName}不符", "提示"));