Browse Source

修复上传京东采购单仓库名更换出错问题

AddValidOverTime
506583276@qq.com 2 years ago
parent
commit
3979430314
  1. 5
      BBWY.Client/Models/FallWare/FallWareConfiguredModel.cs
  2. 4
      BBWY.Client/Models/FallWare/JDWareBoxModel.cs
  3. 3
      BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs
  4. 2
      BBWY.Client/Views/FallWare/SetJDWareBoxWindow2.xaml.cs

5
BBWY.Client/Models/FallWare/FallWareConfiguredModel.cs

@ -36,6 +36,11 @@ namespace BBWY.Client.Models.FallWare
/// </summary> /// </summary>
public long SealBoxId { get; set; } public long SealBoxId { get; set; }
/// <summary>
/// 仓库名称
/// </summary>
public string WareId { get; set; }
/// <summary> /// <summary>
/// 仓库名称 /// 仓库名称
/// </summary> /// </summary>

4
BBWY.Client/Models/FallWare/JDWareBoxModel.cs

@ -24,6 +24,10 @@ namespace BBWY.Client.Models.FallWare
/// </summary> /// </summary>
public string WaybillNo { get; set; } public string WaybillNo { get; set; }
/// <summary>
/// 仓库id
/// </summary>
public string WareId { get; set; }
/// <summary> /// <summary>
/// 目的城市-仓库 /// 目的城市-仓库
/// </summary> /// </summary>

3
BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs

@ -497,7 +497,8 @@ namespace BBWY.Client.ViewModels.PackTask
PrewOrder = fallware.PrewOrder, PrewOrder = fallware.PrewOrder,
ProductTitle = fallware.ProductTitle, ProductTitle = fallware.ProductTitle,
PurchaseOrder = fallware.PurchaseOrder, PurchaseOrder = fallware.PurchaseOrder,
WaybillNo = fallware.WaybillNo WaybillNo = fallware.WaybillNo,
WareId = fallware.WareId
}; };
var w = new SetJDWareBoxWindow2(model, sealBoxService, fallware.WareType.Value, ReflashTask, fallware.TransportOverTime); var w = new SetJDWareBoxWindow2(model, sealBoxService, fallware.WareType.Value, ReflashTask, fallware.TransportOverTime);

2
BBWY.Client/Views/FallWare/SetJDWareBoxWindow2.xaml.cs

@ -138,7 +138,7 @@ namespace BBWY.Client.Views.FallWare
return; return;
} }
if (getDetailResponse.Data.StoreName!= JDWareBoxModel.WareName) if (getDetailResponse.Data.StoreId != JDWareBoxModel.WareId)//使用仓库id判断 并实时更新仓库名
{ {
IsLoading = false; IsLoading = false;
this.Dispatcher.Invoke(() => MessageBox.Show($"采购单对应的仓库名:{getDetailResponse.Data.StoreName}与当前仓库:{JDWareBoxModel.WareName}不符", "提示")); this.Dispatcher.Invoke(() => MessageBox.Show($"采购单对应的仓库名:{getDetailResponse.Data.StoreName}与当前仓库:{JDWareBoxModel.WareName}不符", "提示"));

Loading…
Cancel
Save