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
///
public long SealBoxId { get; set; }
+ ///
+ /// 仓库名称
+ ///
+ public string WareId { get; set; }
+
///
/// 仓库名称
///
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
///
public string WaybillNo { get; set; }
+ ///
+ /// 仓库id
+ ///
+ public string WareId { get; set; }
///
/// 目的城市-仓库
///
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}不符", "提示"));