Browse Source

新增待转运状态

AddValidOverTime
506583276@qq.com 2 years ago
parent
commit
16e3626ece
  1. 10
      BBWY.Client/APIServices/QiKu/PackTaskService.cs
  2. 29
      BBWY.Client/APIServices/QiKu/SealBoxService.cs
  3. 2
      BBWY.Client/Converters/TaskStateToBooleanConvert.cs
  4. 8
      BBWY.Client/Models/APIModel/Response/PackTask/ProductSkuCountsResponse.cs
  5. 4
      BBWY.Client/Models/APIModel/Response/PackTask/SearchWaitFallWareResponse.cs
  6. 17
      BBWY.Client/Models/APIModel/Response/SealBox/GetWareTransportCountResponse.cs
  7. 100
      BBWY.Client/Models/APIModel/Response/SealBox/GetWareWaitTransportResponse.cs
  8. 2
      BBWY.Client/Models/APIModel/Response/ServiceOrder/ServiceOrderItemResponse.cs
  9. 8
      BBWY.Client/Models/Enums.cs
  10. 5
      BBWY.Client/Models/FallWare/JDWareBoxModel.cs
  11. 20
      BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs
  12. 198
      BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
  13. 8
      BBWY.Client/Views/BatchPurchase/BatchPurchaseOrderList.xaml
  14. 20
      BBWY.Client/Views/FallWare/SetCloudWareBoxWindow.xaml
  15. 8
      BBWY.Client/Views/FallWare/SetCloudWareBoxWindow.xaml.cs
  16. 20
      BBWY.Client/Views/FallWare/SetJDWareBoxWindow.xaml
  17. 4
      BBWY.Client/Views/FallWare/SetJDWareBoxWindow.xaml.cs
  18. 8
      BBWY.Client/Views/PackTask/TaskList.xaml
  19. 2
      BBWY.Client/Views/PackTask/TaskListControl.xaml
  20. 12
      BBWY.Client/Views/PackTask/WaitPackageControl.xaml
  21. 23
      BBWY.Client/Views/PackTask/WareHouseList.xaml
  22. 15
      BBWY.Client/Views/PackTask/WareHouseListControl.xaml
  23. 12
      BBWY.Client/Views/QualityTask/WaitQualityControl.xaml
  24. 2
      BBWY.Client/Views/SealBox/SealBoxNoConfigureControl.xaml
  25. 2
      BBWY.Client/Views/SealBox/WaitSealBoxControl.xaml
  26. 319
      BBWY.Client/Views/WaitTransport/WareWaitTransportControl.xaml
  27. 26
      BBWY.Client/Views/WaitTransport/WareWaitTransportControl.xaml.cs
  28. 94
      BBWY.Client/Views/WaitTransport/WareWaitTransportListControl.xaml
  29. 26
      BBWY.Client/Views/WaitTransport/WareWaitTransportListControl.xaml.cs

10
BBWY.Client/APIServices/QiKu/PackTaskService.cs

@ -28,8 +28,7 @@ namespace BBWY.Client.APIServices
public ApiResponse<SearchTaskListResponse> GetTaskList(string skuId = null, string taskId = null,
DateTime? startTime = null,
DateTime? endTime = null,
TaskState? TaskState = null,
int pageIndex = 1,
int pageSize = 10
@ -51,8 +50,6 @@ namespace BBWY.Client.APIServices
SkuId = skuId,
TaskId = taskId,
StartTime = startTime,
EndTime = endTime,
TaskState = TaskState,
PageIndex = pageIndex,
PageSize = pageSize,
@ -60,8 +57,7 @@ namespace BBWY.Client.APIServices
}, null, HttpMethod.Post);
}
public ApiResponse<SearchTaskListResponse> GetWareHouseList(string WayBillNo = null, string SourceExpressName = null, int? isWorry = null, string departmentName = null, string skuId = null, string taskId = null,
DateTime? startTime = null,
DateTime? endTime = null,
TaskState? TaskState = null,
string ShopName = null,
int pageIndex = 1,
@ -82,8 +78,6 @@ namespace BBWY.Client.APIServices
DepartmentName = departmentName,
SkuId = skuId,
TaskId = taskId,
StartTime = startTime,
EndTime = endTime,
TaskState = TaskState,
PageIndex = pageIndex,
PageSize = pageSize,

29
BBWY.Client/APIServices/QiKu/SealBoxService.cs

@ -234,5 +234,34 @@ namespace BBWY.Client.APIServices
null
, null, HttpMethod.Post);
}
public ApiResponse<GetWareWaitTransportResponse> GetWareWaitTransportList(WareType WareType, int? PageSize, int? PageIndex)
{
return SendRequest<GetWareWaitTransportResponse>(globalContext.QKApiHost, $"api/SealBox/GetWareWaitTransportList",
new
{
WareType,
PageSize,
PageIndex
}
, null, HttpMethod.Post);
}
public ApiResponse<bool> WareCompeteTransport(long sealBoxId)
{
return SendRequest<bool>(globalContext.QKApiHost, $"api/SealBox/WareCompeteTransport?sealBoxId={sealBoxId}",
null , null, HttpMethod.Post);
}
public ApiResponse<GetWareTransportCountResponse> GetWareTransportCounts()
{
return SendRequest<GetWareTransportCountResponse>(globalContext.QKApiHost, $"api/SealBox/GetWareTransportCounts",
null, null, HttpMethod.Post);
}
}
}

2
BBWY.Client/Converters/TaskStateToBooleanConvert.cs

@ -11,7 +11,7 @@ namespace BBWY.Client.Converters
{
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
string[] parray = parameter.ToString().ToLower().Split(':');//参数拆分
string[] parray = parameter.ToString().Split(':');//参数拆分
string valueStr = value == null ? string.Empty : value.ToString().ToLower();
string returnValue = string.Empty;
try

8
BBWY.Client/Models/APIModel/Response/PackTask/ProductSkuCountsResponse.cs

@ -45,6 +45,12 @@ namespace BBWY.Client.Models.APIModel.Response.PackTask
/// <summary>
/// 待完结
/// </summary>
public string WaitCompleted { get; set; }
public int? WaitCompleted { get; set; }
/// <summary>
/// 待转运
/// </summary>
public int? WaitTransportCount { get; set; }
}
}

4
BBWY.Client/Models/APIModel/Response/PackTask/SearchWaitFallWareResponse.cs

@ -150,6 +150,10 @@ namespace BBWY.Client.Models.APIModel
/// 商品名称
/// </summary>
public string ProductTitle { get; set; }
/// <summary>
/// 供应商
/// </summary>
public string ProviderName { get; set; }
}

17
BBWY.Client/Models/APIModel/Response/SealBox/GetWareTransportCountResponse.cs

@ -0,0 +1,17 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace BBWY.Client.Models.APIModel
{
public class GetWareTransportCountResponse
{
public string WaitTransportJDWareCount { get; set; }
public string WaitTransportCloudWareCount { get; set; }
public string WaitTransportJuShuiTanCount { get; set; }
public string WaitTransportStoreWareCount { get; set; }
}
}

100
BBWY.Client/Models/APIModel/Response/SealBox/GetWareWaitTransportResponse.cs

@ -0,0 +1,100 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace BBWY.Client.Models.APIModel
{
public class GetWareWaitTransportResponse
{
/// <summary>
/// 数量
/// </summary>
public int TotalCount { get; set; }
public List<WareWaitTransport> WareWaitTransports { get; set; }
}
public class WareWaitTransport:NotifyObject
{
private string waitTransportRemainTime;
public string WaitTransportRemainTime { get => waitTransportRemainTime; set { Set(ref waitTransportRemainTime, value); } }
private bool isWaitTransportOverTime;
public bool IsWaitTransportOverTime { get => isWaitTransportOverTime; set { Set(ref isWaitTransportOverTime, value); } }
/// <summary>
/// 过期时间
/// </summary>
public DateTime? TransportOverTime { get; set; }
public long SealBoxId { get; set; }
/// <summary>
/// 店铺Id
/// </summary>
public string ShopId { get; set; }
/// <summary>
/// 仓库Id(同一个店铺 唯一)
/// </summary>
public string WareId { get; set; }
/// <summary>
/// 店铺名称
/// </summary>
public string ShopName { get; set; }
/// <summary>
/// 仓库名
/// </summary>
public string WareName { get; set; }
/// <summary>
/// 团队名称
/// </summary>
public string DepartmentName { get; set; }
/// <summary>
/// 对接人(同团队下)
/// </summary>
public string AcceptUserNames { get; set; }
/// <summary>
/// sku列表
/// </summary>
public List<WaitTransportSku> WaitTransportSkus { get; set; }
}
public class WaitTransportSku
{
///// <summary>
///// 任务状态
///// </summary>
//public TaskState? TaskState { get; set; }
/// <summary>
/// 任务Id
/// </summary>
public long TaskId { get; set; }
/// <summary>
/// 图片链接
/// </summary>
public string Logo { get; set; }
/// <summary>
/// skuid
/// </summary>
public string SkuId { get; set; }
/// <summary>
/// sku标题
/// </summary>
public string SkuTitle { get; set; }
/// <summary>
/// 品名
/// </summary>
public string BrandName { get; set; }
///// <summary>
///// 货号
///// </summary>
//public string ProductNo { get; set; }
/// <summary>
/// (分箱的仓库的sku产品数量)
/// </summary>
public int WareHourseSkuCount { get; set; }
}
}

2
BBWY.Client/Models/APIModel/Response/ServiceOrder/ServiceOrderItemResponse.cs

@ -212,7 +212,7 @@ namespace BBWY.Client.Models
public decimal? StorageAmount { get; set; } = 0.00M;
/// <summary>
/// 服务单物流状态(0=待质检,1=已入库,2=派送中,3=运输中)
/// 服务单物流状态(0=待验收,1=已入库,2=派送中,3=运输中)
/// </summary>
public TransportState? TransportDetails { get; set; }

8
BBWY.Client/Models/Enums.cs

@ -235,7 +235,7 @@
{
= 0,
= 1,
= 2,//已到货
= 2,//已到货
= 3,
= 4,
= 5,
@ -364,11 +364,11 @@
/// <summary>
/// 运输状态 0=待质检,1=已入库,2=派送中,3=运输中
/// 运输状态 0=待验收,1=已入库,2=派送中,3=运输中
/// </summary>
public enum TransportState
{
= 0, = 1, = 2, = 3
= 0, = 1, = 2, = 3
}
/// <summary>
@ -420,7 +420,7 @@
/// </summary>
public enum PurchaseOrderState
{
/*待付款 = 0, 待发货 = 1, 待收货 = 2, 待质检 = 3, 待打包 = 4, 待结算 = 5, 已完成 = 6, 已取消 = 7*/
/*待付款 = 0, 待发货 = 1, 待收货 = 2, 待验收 = 3, 待打包 = 4, 待结算 = 5, 已完成 = 6, 已取消 = 7*/
= 0,
= 1,
= 110,

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

@ -53,5 +53,10 @@ namespace BBWY.Client.Models.FallWare
/// 商品名称
/// </summary>
public string ProductTitle { get => productTitle; set { Set(ref productTitle, value); } }
/// <summary>
/// 供应商
/// </summary>
public string ProviderName { get; set; }
}
}

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

@ -96,14 +96,14 @@ namespace BBWY.Client.ViewModels.PackTask
/// </summary>
public ObservableCollection<FallWareConfiguredModel> FallWareConfiguredList { get => fallWareConfiguredList; set { Set(ref fallWareConfiguredList, value); } }
/// <summary>
/// 查询时间段
/// </summary>
private DateTime startTime;
public DateTime StartTime { get => startTime; set { Set(ref startTime, value); } }
///// <summary>
///// 查询时间段
///// </summary>
//private DateTime startTime;
//public DateTime StartTime { get => startTime; set { Set(ref startTime, value); } }
private DateTime endTime;
public DateTime EndTime { get => endTime; set { Set(ref endTime, value); } }
//private DateTime endTime;
//public DateTime EndTime { get => endTime; set { Set(ref endTime, value); } }
/// <summary>
/// 查询任务id
@ -251,8 +251,8 @@ namespace BBWY.Client.ViewModels.PackTask
ConfiguredSealBoxCommand = new RelayCommand(ConfiguredSealBox);
UpdateSealBoxConfiguredCommand = new RelayCommand<SealBoxConfiguredModel>(UpdateSealBoxConfigured);
StartTime = DateTime.Now.Date;
EndTime = DateTime.Now.Date;
//StartTime = DateTime.Now.Date;
//EndTime = DateTime.Now.Date;
IsLoading = false;
//加载数据
SetTaskState(null);
@ -506,7 +506,7 @@ namespace BBWY.Client.ViewModels.PackTask
try
{
PackTaskList = new ObservableCollection<PackTaskModel>();//初始化数据
var datas = packTaskService.GetTaskList(SearchSkuId, SearchTaskId, StartTime, EndTime, (this.TaskState),
var datas = packTaskService.GetTaskList(SearchSkuId, SearchTaskId, this.TaskState,
PageIndex, PageSize);
if (datas != null && datas.Data != null && datas.Success)
{

198
BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs

@ -35,6 +35,20 @@ namespace BBWY.Client.ViewModels.PackTask
//public RelayCommand<string> SelectCmd => new RelayCommand<string>(str => Growl.Info(str));
#region 属性绑定
private string waitTransportJDWareCount;
public string WaitTransportJDWareCount { get => waitTransportJDWareCount; set { Set(ref waitTransportJDWareCount, value); } }
private string waitTransportCloudWareCount;
public string WaitTransportCloudWareCount { get => waitTransportCloudWareCount; set { Set(ref waitTransportCloudWareCount, value); } }
private string waitTransportJuShuiTanCount;
public string WaitTransportJuShuiTanCount { get => waitTransportJuShuiTanCount; set { Set(ref waitTransportJuShuiTanCount, value); } }
private string waitTransportStoreWareCount;
public string WaitTransportStoreWareCount { get => waitTransportStoreWareCount; set { Set(ref waitTransportStoreWareCount, value); } }
private string searchWayBillNo;
public string SearchWayBillNo
{
@ -60,6 +74,12 @@ namespace BBWY.Client.ViewModels.PackTask
private ObservableCollection<WareWaitTransport> waitTransportList;
/// <summary>
/// 待转运列表
/// </summary>
public ObservableCollection<WareWaitTransport> WaitTransportList { get => waitTransportList; set { Set(ref waitTransportList, value); } }
private ObservableCollection<WaitFallWareModel> waitFallWareList;
/// <summary>
/// 待落仓列表
@ -86,14 +106,14 @@ namespace BBWY.Client.ViewModels.PackTask
/// </summary>
public ObservableCollection<PackTaskModel> PackTaskList { get => packTaskList; set { Set(ref packTaskList, value); } }
/// <summary>
/// 查询时间段
/// </summary>
private DateTime startTime;
public DateTime StartTime { get => startTime; set { Set(ref startTime, value); } }
///// <summary>
///// 查询时间段
///// </summary>
//private DateTime startTime;
//public DateTime StartTime { get => startTime; set { Set(ref startTime, value); } }
private DateTime endTime;
public DateTime EndTime { get => endTime; set { Set(ref endTime, value); } }
//private DateTime endTime;
//public DateTime EndTime { get => endTime; set { Set(ref endTime, value); } }
private string searchShopName;
public string SearchShopName
@ -203,6 +223,13 @@ namespace BBWY.Client.ViewModels.PackTask
public string WaitCompleted { get => waitCompleted; set { Set(ref waitCompleted, value); } }
private string waitTransportCount;
/// <summary>
/// 待转运
/// </summary>
public string WaitTransportCount { get => waitTransportCount; set { Set(ref waitTransportCount, value); } }
public int PageIndex { get => pageIndex; set { Set(ref pageIndex, value); } }
@ -233,6 +260,10 @@ namespace BBWY.Client.ViewModels.PackTask
/// </summary>
public SealBoxConfigureType SealBoxConfigureType { get => sealBoxConfigureType; set { Set(ref sealBoxConfigureType, value); } }
private WareType selectWareType;
public WareType SelectWareType { get => selectWareType; set { Set(ref selectWareType, value); } }
#endregion
private readonly PackTaskService packTaskService;
@ -262,13 +293,14 @@ namespace BBWY.Client.ViewModels.PackTask
OpenSkuDetailCommand = new RelayCommand<object>(OpenSkuDetail);
StartTime = DateTime.Now.Date;
EndTime = DateTime.Now.Date;
//StartTime = DateTime.Now.Date;
//EndTime = DateTime.Now.Date;
IsLoading = false;
SetTaskStatusCommand = new RelayCommand<object>(SetTaskStatus);
TaskState = null;
//加载数据
SelectWareType = WareType.;
SetTaskState(null);
UpdateTaskStateCommand = new RelayCommand<object>(UpdateTaskState);
@ -299,9 +331,40 @@ namespace BBWY.Client.ViewModels.PackTask
CompletedPackTaskCommand = new RelayCommand<object>(CompletedPackTask);
SetWareTypeCommand = new RelayCommand<WareType>(s =>
{
PageIndex = 1;
SelectWareType = s;
Task.Factory.StartNew(() => SearchTaskList());
});
CompeteWaitTransportCommand = new RelayCommand<object>(CompeteWaitTransport);
}
private void CompeteWaitTransport(object obj)
{
var model = (WareWaitTransport)obj;
if (System.Windows.MessageBox.Show("是否完成转运?", "提示",
MessageBoxButton.YesNo,
MessageBoxImage.Warning) != MessageBoxResult.Yes)
return;
var res = sealBoxService.WareCompeteTransport(model.SealBoxId);
if (res == null)
{
return;
}
if (!res.Success)
{
System.Windows.MessageBox.Show(res.Msg);
return;
}
Task.Factory.StartNew(() => SearchTaskList());
}
private void CompletedPackTask(object obj)
{
var model = (PackTaskModel)obj;
@ -408,25 +471,22 @@ namespace BBWY.Client.ViewModels.PackTask
PrewOrder = fallware.BoxConfigureData.PrewOrder,
ProductTitle = fallware.BoxConfigureData.ProductTitle,
PurchaseOrder = fallware.BoxConfigureData.PurchaseOrder,
WaybillNo = fallware.BoxConfigureData.WaybillNo
WaybillNo = fallware.BoxConfigureData.WaybillNo,
ProviderName = fallware.BoxConfigureData.ProviderName
};
if (fallware.WareType == WareType.)
{
//SetJDWareBoxWindow window = new SetJDWareBoxWindow(model, sealBoxService, fallware.WareType, ReflashTask,false);
//window.Show();
var w = new SetJDWareBoxWindow2(model, sealBoxService, fallware.WareType, ReflashTask, false);
w.ShowDialog();
SetJDWareBoxWindow window = new SetJDWareBoxWindow(model, sealBoxService, fallware.WareType, ReflashTask, false);
window.Show();
//var w = new SetJDWareBoxWindow2(model, sealBoxService, fallware.WareType, ReflashTask, false);
//w.ShowDialog();
}
if (fallware.WareType == WareType.)
if (fallware.WareType == WareType. || fallware.WareType == WareType.)
{
SetCloudWareBoxWindow window = new SetCloudWareBoxWindow(model, sealBoxService, fallware.WareType, ReflashTask, false);
window.Show();
}
if (fallware.WareType == WareType.)
{
}
}
public PositionState PositionState { get; set; }
@ -461,7 +521,7 @@ namespace BBWY.Client.ViewModels.PackTask
{
var model = (SealBoxModel)obj;
if (model.SealBoxSkus.Any(s => s.TaskState == Models.TaskState. || s.TaskState == Models.TaskState.))
if (model.SealBoxSkus.Any(s => s.TaskState == Models.TaskState. || s.TaskState == Models.TaskState.))
{
System.Windows.MessageBox.Show("无法封箱,存在未打包完成的任务");
return;
@ -478,6 +538,8 @@ namespace BBWY.Client.ViewModels.PackTask
#region 事件绑定
public ICommand CompeteWaitTransportCommand { get; set; }
public ICommand SetWareTypeCommand { get; set; }
public ICommand LookBoxConfigureCommand { get; set; }
/// <summary>
/// 待配置 /已配置
@ -591,9 +653,9 @@ namespace BBWY.Client.ViewModels.PackTask
MessageBoxImage.Warning) != MessageBoxResult.Yes)
return;
res = packTaskService.SetPackTaskState(taskId, Models.TaskState.);
res = packTaskService.SetPackTaskState(taskId, Models.TaskState.);
break;
case Models.TaskState.:
case Models.TaskState.:
break;
case Models.TaskState.:
@ -670,7 +732,77 @@ namespace BBWY.Client.ViewModels.PackTask
}
IsLoading = true;
if (TaskState == Models.TaskState.)
if (TaskState == Models.TaskState.)
{
Task.Factory.StartNew(() =>
{
WaitTransportList = new ObservableCollection<WareWaitTransport>();
var datas = sealBoxService.GetWareWaitTransportList(SelectWareType, PageSize, PageIndex);
if (datas != null && datas.Data != null && datas.Success)
{
var dataModel = datas.Data;
OrderCount = dataModel.TotalCount;
foreach (var item in dataModel.WareWaitTransports)
{
App.Current.Dispatcher.BeginInvoke(new Action(() =>
{
WaitTransportList.Add(item);
}));
}
Thread.Sleep(500);
var sealboxTasks = WaitTransportList.Where(p => p.TransportOverTime != null).ToList();
if (sealboxTasks.Count() > 0 && TaskState == Models.TaskState.)
{
sealboxOverTimeThread = new Thread(() =>
{
IsStartThread = true;
while (IsStartThread)
{
App.Current.Dispatcher.BeginInvoke(new Action(() =>
{
foreach (var item in sealboxTasks)
{
var datetime = item.TransportOverTime.Value.Subtract(DateTime.Now);
if (datetime.TotalMilliseconds > 0)
{
item.IsWaitTransportOverTime = false;
item.WaitTransportRemainTime = $"{datetime.Hours}小时{datetime.Minutes}分";
}
else
{
item.IsWaitTransportOverTime = true;
item.WaitTransportRemainTime = datetime.Days == 0 ? $"{-datetime.Hours}小时{-datetime.Minutes}分" : $"{-datetime.Days}天{-datetime.Hours}小时{-datetime.Minutes}分";
}
}
}));
Thread.Sleep(1000);
}
});
//任务倒计时数据
sealboxOverTimeThread.IsBackground = true;
sealboxOverTimeThread.Start();
}
}
else
{
if (datas != null) System.Windows.MessageBox.Show(datas.Msg);
}
IsLoadCount();
IsLoadWaitTransportCount();
IsLoading = false;
});
}
else if (TaskState == Models.TaskState.)
Task.Factory.StartNew(() =>
{
@ -847,7 +979,7 @@ namespace BBWY.Client.ViewModels.PackTask
PackTaskList = new ObservableCollection<PackTaskModel>();//初始化数据
var datas = packTaskService.GetWareHouseList(SearchWayBillNo, SearchExpressName, IsWorry, SearchDepartment, SearchSkuId, SearchTaskId, StartTime, EndTime, (this.TaskState), SearchShopName,
var datas = packTaskService.GetWareHouseList(SearchWayBillNo, SearchExpressName, IsWorry, SearchDepartment, SearchSkuId, SearchTaskId, this.TaskState, SearchShopName,
PageIndex, PageSize);
if (datas != null && datas.Data != null && datas.Success)
{
@ -929,9 +1061,9 @@ namespace BBWY.Client.ViewModels.PackTask
}
Thread.Sleep(500);
//任务状态为待质检
var packtasks = PackTaskList.Where(p => p.TaskState == Models.TaskState. && p.QualityCompletionOverTime != null).ToList();
if (packtasks.Count() > 0&& TaskState == Models.TaskState.)
//任务状态为待验收
var packtasks = PackTaskList.Where(p => p.TaskState == Models.TaskState. && p.QualityCompletionOverTime != null).ToList();
if (packtasks.Count() > 0 && TaskState == Models.TaskState.)
{
//if (qualityOverTimeThread!=null)
//{
@ -1026,6 +1158,17 @@ namespace BBWY.Client.ViewModels.PackTask
});
}
private void IsLoadWaitTransportCount()
{
var res = sealBoxService.GetWareTransportCounts();
if (res != null && res.Success && res.Data != null)
{
WaitTransportCloudWareCount = res.Data.WaitTransportCloudWareCount;
WaitTransportJuShuiTanCount = res.Data.WaitTransportJuShuiTanCount;
WaitTransportStoreWareCount= res.Data.WaitTransportStoreWareCount;
WaitTransportJDWareCount = res.Data.WaitTransportJDWareCount;
}
}
private void IsLoadSealBoxCount()
{
@ -1062,6 +1205,7 @@ namespace BBWY.Client.ViewModels.PackTask
WaitSealBoxCount = packTaskResult.Data.WaitSealBox?.ToString();
WaitFallWareCount = packTaskResult.Data.WaitFallWareCount?.ToString();
WaitCompleted = packTaskResult.Data.WaitCompleted?.ToString();
WaitTransportCount = packTaskResult.Data.WaitTransportCount?.ToString();
}));
}
}

8
BBWY.Client/Views/BatchPurchase/BatchPurchaseOrderList.xaml

@ -128,10 +128,10 @@
Background="{Binding PurchaseOrderState,Converter={StaticResource objConverter},ConverterParameter=待收货:#8080FF:#F2F2F2}"
Foreground="{Binding PurchaseOrderState,Converter={StaticResource objConverter},ConverterParameter=待收货:White:#4A4A4A}"
Command="{Binding SetPurchaseOrderStateCommand}" CommandParameter="{x:Static cmodel:PurchaseOrderState.待收货}"/>
<!--<c:BButton Content="待质检" Width="100"
Background="{Binding PurchaseOrderState,Converter={StaticResource objConverter},ConverterParameter=待质检:#8080FF:#F2F2F2}"
Foreground="{Binding PurchaseOrderState,Converter={StaticResource objConverter},ConverterParameter=待质检:White:#4A4A4A}"
Command="{Binding SetPurchaseOrderStateCommand}" CommandParameter="{x:Static cmodel:PurchaseOrderState.待质检}"/>-->
<!--<c:BButton Content="待验收" Width="100"
Background="{Binding PurchaseOrderState,Converter={StaticResource objConverter},ConverterParameter=待验收:#8080FF:#F2F2F2}"
Foreground="{Binding PurchaseOrderState,Converter={StaticResource objConverter},ConverterParameter=待验收:White:#4A4A4A}"
Command="{Binding SetPurchaseOrderStateCommand}" CommandParameter="{x:Static cmodel:PurchaseOrderState.待验收}"/>-->
<!--<c:BButton Content="待打包" Width="100"
Background="{Binding PurchaseOrderState,Converter={StaticResource objConverter},ConverterParameter=待打包:#8080FF:#F2F2F2}"
Foreground="{Binding PurchaseOrderState,Converter={StaticResource objConverter},ConverterParameter=待打包:White:#4A4A4A}"

20
BBWY.Client/Views/FallWare/SetCloudWareBoxWindow.xaml

@ -39,11 +39,11 @@
<Grid.RowDefinitions>
<RowDefinition Height="39"/>
<RowDefinition/>
<RowDefinition Height="36"/>
<RowDefinition Height="0"/>
</Grid.RowDefinitions>
<Border BorderThickness="0,0,0,1" BorderBrush="{StaticResource MainMenu.BorderBrush}"
Background="{StaticResource Border.Background}">
<TextBlock Text="云仓箱唛" FontSize="16" HorizontalAlignment="Left" Margin="10 0 0 0" VerticalAlignment="Center"/>
<TextBlock Text="{Binding WareType,Converter={StaticResource objConverter},ConverterParameter=云仓:云仓箱唛:聚水潭箱唛}" FontSize="16" HorizontalAlignment="Left" Margin="10 0 0 0" VerticalAlignment="Center"/>
</Border>
<Grid Grid.Row="1" Margin="1 0 1 1" Name="jd_box">
<Grid.RowDefinitions>
@ -76,30 +76,30 @@
<Border Width="1" Background="{StaticResource Border.Brush}" Grid.Column="2" Grid.Row="6" HorizontalAlignment="Right" Grid.RowSpan="1"/>
<TextBlock Style="{StaticResource middleTextBlock}" Text="店铺名称"/>
<TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding ShopName}" Grid.Column="1" Grid.ColumnSpan="3"/>
<TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding JDWareBoxModel.ShopName}" Grid.Column="1" Grid.ColumnSpan="3"/>
<TextBlock Style="{StaticResource middleTextBlock}" Text="CLPS采购单号" Grid.Row="1"/>
<TextBox Style="{StaticResource middleTextBox}" Text="{Binding PurchaseOrder ,Mode=TwoWay}" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3"/>
<TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding WareType,Converter={StaticResource taskStateToBoolean},ConverterParameter=云仓:CLPS采购单号:采购单号}" Grid.Row="1"/>
<TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding JDWareBoxModel.PurchaseOrder ,Mode=TwoWay}" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3"/>
<TextBlock Style="{StaticResource middleTextBlock}" Text="目的城市-仓库" Grid.Row="2"/>
<TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding WareName}" Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="3"/>
<TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding JDWareBoxModel.WareName}" Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="3"/>
<TextBlock Style="{StaticResource middleTextBlock}" Text="箱数" Grid.Row="3"/>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Grid.Row="3" Grid.Column="1" >
<TextBlock Style="{StaticResource middleTextBlock}" Text="1/"/>
<TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding BoxCount,Mode=TwoWay}" />
<TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding JDWareBoxModel.BoxCount,Mode=TwoWay}" />
</StackPanel>
<TextBlock Style="{StaticResource middleTextBlock}" Text="商品数量" Grid.Row="3" Grid.Column="2"/>
<TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding ProductCount}" Grid.Row="3" Grid.Column="3" />
<TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding JDWareBoxModel.ProductCount}" Grid.Row="3" Grid.Column="3" />
</Grid>
<c:BButton Grid.Row="2" Content="保存" HorizontalAlignment="Right" Width="105" VerticalAlignment="Center" Height="40" Click="BButton_Click"
Name="btn_save" />
<!--<c:BButton Grid.Row="2" Content="保存" HorizontalAlignment="Right" Width="105" VerticalAlignment="Center" Height="40" Click="BButton_Click"
Name="btn_save" />-->
</Grid>
</c:BWindow>

8
BBWY.Client/Views/FallWare/SetCloudWareBoxWindow.xaml.cs

@ -30,11 +30,11 @@ namespace BBWY.Client.Views.FallWare
JDWareBoxModel = model;
InitializeComponent();
this.DataContext = JDWareBoxModel;
this.DataContext =this ;
if (!isEnabled)
{
this.jd_box.IsEnabled = isEnabled;
this.btn_save.Visibility = Visibility.Collapsed;
//this.jd_box.IsEnabled = isEnabled;
//this.btn_save.Visibility = Visibility.Collapsed;
}
}
public JDWareBoxModel JDWareBoxModel { get; set; }
@ -43,7 +43,7 @@ namespace BBWY.Client.Views.FallWare
private Action ReflashWindow { get; set; }
private WareType WareType { get; set; }
public WareType WareType { get; set; }
private void BButton_Click(object sender, RoutedEventArgs e)
{

20
BBWY.Client/Views/FallWare/SetJDWareBoxWindow.xaml

@ -39,7 +39,7 @@
<Grid.RowDefinitions>
<RowDefinition Height="39"/>
<RowDefinition/>
<RowDefinition Height="36"/>
<RowDefinition Height="0"/>
</Grid.RowDefinitions>
<Border BorderThickness="0,0,0,1" BorderBrush="{StaticResource MainMenu.BorderBrush}"
Background="{StaticResource Border.Background}">
@ -50,7 +50,7 @@
<RowDefinition/>
<RowDefinition/>
<RowDefinition/>
<RowDefinition/>
<RowDefinition Height="0"/>
<RowDefinition/>
<RowDefinition/>
<RowDefinition/>
@ -78,23 +78,23 @@
<Border Width="1" Background="{StaticResource Border.Brush}" Grid.Column="2" Grid.Row="6" HorizontalAlignment="Right" Grid.RowSpan="1"/>
<TextBlock Style="{StaticResource middleTextBlock}" Text="供应商名称"/>
<TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding ShopName}" Grid.Column="1" Grid.ColumnSpan="3"/>
<TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding ProviderName}" Grid.Column="1" Grid.ColumnSpan="3"/>
<TextBlock Style="{StaticResource middleTextBlock}" Text="采购单号" Grid.Row="1"/>
<TextBox Style="{StaticResource middleTextBox}" Text="{Binding PurchaseOrder ,Mode=TwoWay}" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3"/>
<TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding PurchaseOrder ,Mode=TwoWay}" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3"/>
<TextBlock Style="{StaticResource middleTextBlock}" Text="预约单号" Grid.Row="2"/>
<TextBox Style="{StaticResource middleTextBox}" Text="{Binding PrewOrder,Mode=TwoWay}" Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="3"/>
<TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding PrewOrder,Mode=TwoWay}" Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="3"/>
<TextBlock Style="{StaticResource middleTextBlock}" Text="运单号" Grid.Row="3"/>
<TextBox Style="{StaticResource middleTextBox}" Text="{Binding WaybillNo,Mode=TwoWay}" Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="3"/>
<!--<TextBlock Style="{StaticResource middleTextBlock}" Text="运单号" Grid.Row="3"/>
<TextBox Style="{StaticResource middleTextBox}" Text="{Binding WaybillNo,Mode=TwoWay}" Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="3"/>-->
<TextBlock Style="{StaticResource middleTextBlock}" Text="目的城市-仓库" Grid.Row="4"/>
<TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding WareName}" Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="3"/>
<TextBlock Style="{StaticResource middleTextBlock}" Text="商品名称" Grid.Row="5"/>
<TextBox Style="{StaticResource middleTextBox}" Text="{Binding ProductTitle,Mode=TwoWay}" Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="3"/>
<TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding ProductTitle,Mode=TwoWay}" Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="3"/>
<TextBlock Style="{StaticResource middleTextBlock}" Text="箱数" Grid.Row="6"/>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Grid.Row="6" Grid.Column="1" >
@ -107,7 +107,7 @@
<TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding ProductCount}" Grid.Row="6" Grid.Column="3" />
</Grid>
<c:BButton Grid.Row="2" Content="保存" HorizontalAlignment="Right" Width="105" VerticalAlignment="Center" Height="40" Click="BButton_Click"
Name="btn_save" />
<!--<c:BButton Grid.Row="2" Content="保存" HorizontalAlignment="Right" Width="105" VerticalAlignment="Center" Height="40" Click="BButton_Click"
Name="btn_save" />-->
</Grid>
</c:BWindow>

4
BBWY.Client/Views/FallWare/SetJDWareBoxWindow.xaml.cs

@ -33,8 +33,8 @@ namespace BBWY.Client.Views.FallWare
this.DataContext = JDWareBoxModel;
if (!isEnabled)
{
this.jd_box.IsEnabled = isEnabled;
this.btn_save.Visibility = Visibility.Collapsed;
//this.jd_box.IsEnabled = isEnabled;
//this.btn_save.Visibility = Visibility.Collapsed;
}

8
BBWY.Client/Views/PackTask/TaskList.xaml

@ -84,9 +84,9 @@
<Setter Property="IsReadOnly" Value="True"/>
</Style>
</StackPanel.Resources>
<TextBlock Text="提交时间:" VerticalAlignment="Center" Margin="11,0,0,0"/>
<!--<TextBlock Text="提交时间:" VerticalAlignment="Center" Margin="11,0,0,0"/>
<DatePicker SelectedDate="{Binding StartTime}" Width="133.5" Height="30" VerticalContentAlignment="Center" FocusVisualStyle="{x:Null}" Margin="10,0,0,0"/>
<DatePicker SelectedDate="{Binding EndTime}" Width="133.5" Height="30" VerticalContentAlignment="Center" FocusVisualStyle="{x:Null}" Margin="10,0,0,0"/>
<DatePicker SelectedDate="{Binding EndTime}" Width="133.5" Height="30" VerticalContentAlignment="Center" FocusVisualStyle="{x:Null}" Margin="10,0,0,0"/>-->
<TextBlock Text="任务ID:" VerticalAlignment="Center" Margin="16,0,0,0"/>
<c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchTaskId,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" WaterRemark=""/>
<TextBlock Text="SKU:" VerticalAlignment="Center" Margin="16,0,0,0"/>
@ -120,8 +120,8 @@
/>
<RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待质检}" Tag="{Binding ArrivedCount,Mode=TwoWay}" Content="待验收"
IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待质检:True:False}"
<RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待验收}" Tag="{Binding ArrivedCount,Mode=TwoWay}" Content="待验收"
IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收:True:False}"
/>
<RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待打包}" Content="待打包" Tag="{Binding WaitPackCount,Mode=TwoWay}"

2
BBWY.Client/Views/PackTask/TaskListControl.xaml

@ -125,7 +125,7 @@
<TextBlock VerticalAlignment="Center" Text="{Binding AcceptName}" Margin="5,0,0,0" />
</StackPanel>
<StackPanel Grid.Column="11" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center"
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=未到货|部分到货|待质检:Visible:Collapsed}"
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=未到货|部分到货|待验收:Visible:Collapsed}"
>
<!-- -->
<c:BButton Command="{Binding UpdateTaskCommand}" Style="{StaticResource LinkButton}" Content="修改" />

12
BBWY.Client/Views/PackTask/WaitPackageControl.xaml

@ -114,7 +114,7 @@
CommandParameter="{Binding TaskId}"
Margin=" 5,0,7,0"/>
<Label Width="70" Height="25" HorizontalAlignment="Center" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" VerticalAlignment="Center" Content="{Binding TaskState}" Foreground="White" Background="{Binding TaskState,Converter={StaticResource objConverter} , ConverterParameter=已完成:#02a7f0:#facd91 }" Margin="5,0,0,0"/>
<!--<Label Width="70" Height="25" HorizontalAlignment="Center" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" VerticalAlignment="Center" Content="{Binding TaskState}" Foreground="White" Background="{Binding TaskState,Converter={StaticResource objConverter} , ConverterParameter=已完成:#02a7f0:#facd91 }" Margin="5,0,0,0"/>-->
<TextBlock VerticalAlignment="Center" Text="部门:" Margin="14,0,0,0" />
<c:BButton Content="{Binding DepartmentName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
@ -144,12 +144,12 @@
<!--<StackPanel Grid.Column="12" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center" >
<c:BButton Command="{Binding DataContext.DeletedTaskCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}" CommandParameter="{Binding}"
Style="{StaticResource LinkButton}" Content="取消任务" Margin="0 5 0 5 "
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=未到货|部分到货|待质检:Visible:Collapsed}"
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=未到货|部分到货|待验收:Visible:Collapsed}"
/>
</StackPanel>-->
<!--<StackPanel Grid.Column="9" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center"
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=未到货|部分到货|待质检:Visible:Collapsed}"
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=未到货|部分到货|待验收:Visible:Collapsed}"
>
--><!-- --><!--
<c:BButton Command="{Binding UpdateTaskCommand}" Style="{StaticResource LinkButton}" Content="修改" />
@ -392,7 +392,7 @@
</StackPanel>
<!--<Grid Grid.Row="1" Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=未到货|部分到货|待质检|已取消|商家自取:Collapsed:Visible}">
<!--<Grid Grid.Row="1" Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=未到货|部分到货|待验收|已取消|商家自取:Collapsed:Visible}">
<Border Grid.Row="0" VerticalAlignment="Top" Height="1" Background="{StaticResource Border.Brush}"/>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center"
@ -455,7 +455,7 @@
<c:BButton HorizontalAlignment="Center" Style="{StaticResource LinkButton}" Height="20" Margin="0 5 0 5 " VerticalAlignment="Center" Grid.Row="1" Content="验收"
Command="{Binding QualityTaskCommand}"
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待质检:Visible:Collapsed}"
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收:Visible:Collapsed}"
/>
<StackPanel
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待打包:Visible:Collapsed}"
@ -503,7 +503,7 @@
<c:BButton HorizontalAlignment="Center" Style="{StaticResource LinkButton}" Height="20" Margin="0 5 0 5 " VerticalAlignment="Center" Grid.Row="1" Content="商家自取"
CommandParameter="{Binding TaskId}"
Command="{Binding DataContext.StoreGetBySelfCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待质检|待打包:Visible:Collapsed}"
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收|待打包:Visible:Collapsed}"
/>
<hc:SplitButton Content="更多操作" Foreground="{StaticResource Button.Background}" BorderThickness="0" HorizontalAlignment="Stretch">
<hc:SplitButton.Resources>

23
BBWY.Client/Views/PackTask/WareHouseList.xaml

@ -5,6 +5,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:BBWY.Client.Views.PackTask"
xmlns:fallware="clr-namespace:BBWY.Client.Views.FallWare"
xmlns:waittransport="clr-namespace:BBWY.Client.Views.WaitTransport"
xmlns:waitquality="clr-namespace:BBWY.Client.Views.QualityTask"
xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls"
xmlns:ctr="clr-namespace:BBWY.Client.Converters"
@ -66,13 +67,13 @@
</Page.Resources>
<Grid>
<StackPanel Panel.ZIndex="100" HorizontalAlignment="Left" VerticalAlignment="Top" Orientation="Vertical" Margin="810,15,0,0">
<StackPanel Panel.ZIndex="100" HorizontalAlignment="Left" VerticalAlignment="Top" Orientation="Vertical" Margin="460,15,0,0">
<c:BTextBox x:Name="tb" Width="150" Height="30" TextChanged="tb_TextChanged" Text="{Binding SearchDepartment,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></c:BTextBox>
<ListBox MaxHeight="300" x:Name="tipBox" SelectionChanged="SelectionChangeCommand" Background="{StaticResource Border.Background}">
</ListBox>
</StackPanel>
<StackPanel Panel.ZIndex="100" HorizontalAlignment="Left" VerticalAlignment="Top" Orientation="Vertical" Margin="1009,15,0,0"
<StackPanel Panel.ZIndex="100" HorizontalAlignment="Left" VerticalAlignment="Top" Orientation="Vertical" Margin="660,15,0,0"
>
<c:BTextBox x:Name="tbShop" Width="150" Height="30" TextChanged="tbShop_TextChanged" Text="{Binding SearchShopName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></c:BTextBox>
<ListBox MaxHeight="300" x:Name="tipBoxShop" SelectionChanged="tipBoxShop_SelectionChanged" Background="{StaticResource Border.Background}">
@ -105,9 +106,9 @@
<Setter Property="IsReadOnly" Value="True"/>
</Style>
</StackPanel.Resources>
<TextBlock Text="提交时间:" VerticalAlignment="Center" Margin="11,0,0,0"/>
<!--<TextBlock Text="提交时间:" VerticalAlignment="Center" Margin="11,0,0,0"/>
<DatePicker SelectedDate="{Binding StartTime}" Width="133.5" Height="30" VerticalContentAlignment="Center" FocusVisualStyle="{x:Null}" Margin="10,0,0,0"/>
<DatePicker SelectedDate="{Binding EndTime}" Width="133.5" Height="30" VerticalContentAlignment="Center" FocusVisualStyle="{x:Null}" Margin="10,0,0,0"/>
<DatePicker SelectedDate="{Binding EndTime}" Width="133.5" Height="30" VerticalContentAlignment="Center" FocusVisualStyle="{x:Null}" Margin="10,0,0,0"/>-->
<TextBlock Text="任务ID:" VerticalAlignment="Center" Margin="16,0,0,0"/>
<c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchTaskId,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" WaterRemark=""/>
<TextBlock Text="SKU:" VerticalAlignment="Center" Margin="16,0,0,0"/>
@ -118,7 +119,7 @@
<c:BTextBox Visibility="Hidden" Width="150" Height="30" TextChanged="tb_TextChanged" ></c:BTextBox>
<TextBlock x:Name="textblock_shop" Text="店铺:" VerticalAlignment="Center" Margin="16,0,0,0"/>
<c:BTextBox Name="btbShopName" Width="150" Margin="5,0,0,0" Text="{Binding SearchShopName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" WaterRemark="店铺名称"/>
<c:BTextBox Name="btbShopName" Width="150" Visibility="Hidden" Margin="5,0,0,0" Text="{Binding SearchShopName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" WaterRemark="店铺名称"/>
<TextBlock Text="物流单号:" VerticalAlignment="Center" Margin="10,0,0,0"/>
<c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchWayBillNo,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" WaterRemark="精准搜索"/>
<TextBlock Text="物流公司名称:" VerticalAlignment="Center" Margin="10,0,0,0"/>
@ -156,8 +157,8 @@
/>
<RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待质检}" Tag="{Binding ArrivedCount,Mode=TwoWay}" Content="待验收"
IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待质检:True:False}"
<RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待验收}" Tag="{Binding ArrivedCount,Mode=TwoWay}" Content="待验收"
IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收:True:False}"
/>
<RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待打包}" Content="待打包" Tag="{Binding WaitPackCount,Mode=TwoWay}"
@ -168,7 +169,7 @@
IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待封箱:True:False}"
/>
<RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待转运}" Content="待转运"
<RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待转运}" Content="待转运" Tag="{Binding WaitTransportCount,Mode=TwoWay}"
IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待转运:True:False}"
/>
@ -203,11 +204,13 @@
/>
<Grid Grid.Row="2" Margin="0,5,0,0">
<fallware:WareFallWareListControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待落仓:Visible:Collapsed}" />
<local:WareHouseListControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待封箱|待落仓|待质检|待打包:Collapsed:Visible}" />
<local:WareHouseListControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待封箱|待落仓|待验收|待打包|待转运:Collapsed:Visible}" />
<fallware:WareFallWareListControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待封箱:Visible:Collapsed}" />
<waitquality:WaitQualityControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待质检:Visible:Collapsed}" />
<waitquality:WaitQualityControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收:Visible:Collapsed}" />
<local:WaitPackageControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待打包:Visible:Collapsed}" />
<waittransport:WareWaitTransportListControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待转运:Visible:Collapsed}" />
</Grid>
<c:PageControl PageIndex="{Binding PageIndex,Mode=TwoWay}"

15
BBWY.Client/Views/PackTask/WareHouseListControl.xaml

@ -109,7 +109,10 @@
CommandParameter="{Binding TaskId}"
Margin=" 5,0,7,0"/>
<Label Width="70" Height="25" HorizontalAlignment="Center" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" VerticalAlignment="Center" Content="{Binding TaskState}" Foreground="White" Background="{Binding TaskState,Converter={StaticResource objConverter} , ConverterParameter=已完成:#02a7f0:#facd91 }" Margin="5,0,0,0"/>
<Label Width="70" Height="25" HorizontalAlignment="Center" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" VerticalAlignment="Center" Content="{Binding TaskState}" Foreground="White" Background="{Binding TaskState,Converter={StaticResource objConverter} , ConverterParameter=已完成:#02a7f0:#facd91 }" Margin="5,0,0,0"
Visibility="{Binding DataContext.TaskState,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}},Converter={StaticResource objConverter},ConverterParameter=#null:Visible:Collapsed}"
/>
<TextBlock VerticalAlignment="Center" Text="部门:" Margin="14,0,0,0" />
<c:BButton Content="{Binding DepartmentName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
@ -139,12 +142,12 @@
<!--<StackPanel Grid.Column="12" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center" >
<c:BButton Command="{Binding DataContext.DeletedTaskCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}" CommandParameter="{Binding}"
Style="{StaticResource LinkButton}" Content="取消任务" Margin="0 5 0 5 "
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=未到货|部分到货|待质检:Visible:Collapsed}"
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=未到货|部分到货|待验收:Visible:Collapsed}"
/>
</StackPanel>-->
<StackPanel Grid.Column="9" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center"
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=未到货|部分到货|待质检:Visible:Collapsed}"
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=未到货|部分到货|待验收:Visible:Collapsed}"
>
<!-- -->
<c:BButton Command="{Binding UpdateTaskCommand}" Style="{StaticResource LinkButton}" Content="修改" />
@ -442,7 +445,7 @@
</StackPanel>
<Grid Grid.Row="1" Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=未到货|部分到货|待质检|已取消|商家自取:Collapsed:Visible}">
<Grid Grid.Row="1" Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=未到货|部分到货|待验收|已取消|商家自取:Collapsed:Visible}">
<Border Grid.Row="0" VerticalAlignment="Top" Height="1" Background="{StaticResource Border.Brush}"/>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center"
@ -474,7 +477,7 @@
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<c:BButton HorizontalAlignment="Center" Style="{StaticResource LinkButton}" Height="20" Margin="0 5 0 5 " VerticalAlignment="Center" Grid.Row="1" Content="验收"
Command="{Binding QualityTaskCommand}"
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待质检:Visible:Collapsed}"
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收:Visible:Collapsed}"
/>
<c:BButton Grid.Column="11" HorizontalAlignment="Stretch" Style="{StaticResource LinkButton}" Margin="0 5 0 5 " VerticalAlignment="Center" Content="完成"
@ -487,7 +490,7 @@
<c:BButton HorizontalAlignment="Center" Style="{StaticResource LinkButton}" Height="20" Margin="0 5 0 5 " VerticalAlignment="Center" Grid.Row="1" Content="商家自取"
CommandParameter="{Binding TaskId}"
Command="{Binding DataContext.StoreGetBySelfCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待质检|待打包:Visible:Collapsed}"
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收|待打包:Visible:Collapsed}"
/>
<c:BButton Grid.Column="11" HorizontalAlignment="Stretch" Style="{StaticResource LinkButton}" Margin="0 5 0 5 " VerticalAlignment="Center" Content="完成"

12
BBWY.Client/Views/QualityTask/WaitQualityControl.xaml

@ -109,7 +109,7 @@
CommandParameter="{Binding TaskId}"
Margin=" 5,0,7,0"/>
<Label Width="70" Height="25" HorizontalAlignment="Center" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" VerticalAlignment="Center" Content="{Binding TaskState}" Foreground="White" Background="{Binding TaskState,Converter={StaticResource objConverter} , ConverterParameter=已完成:#02a7f0:#facd91 }" Margin="5,0,0,0"/>
<!--<Label Width="70" Height="25" HorizontalAlignment="Center" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" VerticalAlignment="Center" Content="{Binding TaskState}" Foreground="White" Background="{Binding TaskState,Converter={StaticResource objConverter} , ConverterParameter=已完成:#02a7f0:#facd91 }" Margin="5,0,0,0"/>-->
<TextBlock VerticalAlignment="Center" Text="部门:" Margin="14,0,0,0" />
<c:BButton Content="{Binding DepartmentName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
@ -139,12 +139,12 @@
<!--<StackPanel Grid.Column="12" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center" >
<c:BButton Command="{Binding DataContext.DeletedTaskCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}" CommandParameter="{Binding}"
Style="{StaticResource LinkButton}" Content="取消任务" Margin="0 5 0 5 "
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=未到货|部分到货|待质检:Visible:Collapsed}"
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=未到货|部分到货|待验收:Visible:Collapsed}"
/>
</StackPanel>-->
<StackPanel Grid.Column="12" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center"
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=未到货|部分到货|待质检:Visible:Collapsed}"
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=未到货|部分到货|待验收:Visible:Collapsed}"
>
<!-- -->
<c:BButton Command="{Binding UpdateTaskCommand}" Style="{StaticResource LinkButton}" Content="修改" />
@ -455,7 +455,7 @@
</StackPanel>
<Grid Grid.Row="1" Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=未到货|部分到货|待质检|已取消|商家自取:Collapsed:Visible}">
<Grid Grid.Row="1" Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=未到货|部分到货|待验收|已取消|商家自取:Collapsed:Visible}">
<Border Grid.Row="0" VerticalAlignment="Top" Height="1" Background="{StaticResource Border.Brush}"/>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center"
@ -487,7 +487,7 @@
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<c:BButton HorizontalAlignment="Center" Style="{StaticResource LinkButton}" Height="20" Margin="0 5 0 5 " VerticalAlignment="Center" Grid.Row="1" Content="验收"
Command="{Binding QualityTaskCommand}"
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待质检:Visible:Collapsed}"
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收:Visible:Collapsed}"
/>
<c:BButton Grid.Column="11" HorizontalAlignment="Stretch" Style="{StaticResource LinkButton}" Margin="0 5 0 5 " VerticalAlignment="Center" Content="完成"
@ -500,7 +500,7 @@
<c:BButton HorizontalAlignment="Center" Style="{StaticResource LinkButton}" Height="20" Margin="0 5 0 5 " VerticalAlignment="Center" Grid.Row="1" Content="商家自取"
CommandParameter="{Binding TaskId}"
Command="{Binding DataContext.StoreGetBySelfCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待质检|待打包:Visible:Collapsed}"
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收|待打包:Visible:Collapsed}"
/>
<c:BButton Grid.Column="11" HorizontalAlignment="Stretch" Style="{StaticResource LinkButton}" Margin="0 5 0 5 " VerticalAlignment="Center" Content="完成"

2
BBWY.Client/Views/SealBox/SealBoxNoConfigureControl.xaml

@ -203,7 +203,7 @@
</StackPanel>
<!--<TextBlock Foreground="{StaticResource Text.Gray}" TextWrapping="Wrap" Margin="0,10,0 0">
<Run Text="任务状态:"/>
<Run Foreground="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待质检|待打包:Red:black}" Text="{Binding TaskState}"/>
<Run Foreground="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收|待打包:Red:black}" Text="{Binding TaskState}"/>
</TextBlock>-->
</StackPanel>

2
BBWY.Client/Views/SealBox/WaitSealBoxControl.xaml

@ -210,7 +210,7 @@
</StackPanel>
<TextBlock Foreground="{StaticResource Text.Gray}" TextWrapping="Wrap" Margin="0,10,0 0">
<Run Text="任务状态:"/>
<Run Foreground="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待质检|待打包:Red:black}" Text="{Binding TaskState}"/>
<Run Foreground="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收|待打包:Red:black}" Text="{Binding TaskState}"/>
</TextBlock>
</StackPanel>

319
BBWY.Client/Views/WaitTransport/WareWaitTransportControl.xaml

@ -0,0 +1,319 @@
<UserControl x:Class="BBWY.Client.Views.WaitTransport.WareWaitTransportControl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:BBWY.Client.Views.WaitTransport"
mc:Ignorable="d"
xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls"
xmlns:ctr="clr-namespace:BBWY.Client.Converters"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:cmodel="clr-namespace:BBWY.Client.Models"
DataContext="{Binding WareHouseList,Source={StaticResource Locator}}"
xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
d:DesignHeight="450" d:DesignWidth="1500">
<UserControl.Resources>
<ObjectDataProvider x:Key="storageTypeProvider" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
<ObjectDataProvider.MethodParameters>
<x:Type TypeName="cmodel:StorageType"/>
</ObjectDataProvider.MethodParameters>
</ObjectDataProvider>
<ctr:OrderStorageTypeOptionConverter x:Key="ostConverter"/>
<ctr:ProfitRatioConverter x:Key="profitRatioConverter"/>
<ctr:WaybillNoConverter x:Key="waybillConverter"/>
<ctr:MultiParameterTransferConverter x:Key="mptConverter"/>
<ctr:SaleGrossProfitConverter x:Key="sgpcConverter"/>
</UserControl.Resources>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="35"/>
<RowDefinition />
</Grid.RowDefinitions>
<Border BorderBrush="{StaticResource Border.Brush}" BorderThickness="1,1,1,0"
Background="#F2F2F2">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="400"/>
<ColumnDefinition Width="80"/>
<ColumnDefinition Width="0"/>
<ColumnDefinition Width="150"/>
<ColumnDefinition MinWidth="80"/>
<ColumnDefinition Width="100"/>
</Grid.ColumnDefinitions>
<TextBlock Text="商品信息" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="数量" Grid.Column="1" Style="{StaticResource middleTextBlock}"/>
<!--<TextBlock Text="封箱数量" Grid.Column="2" Style="{StaticResource middleTextBlock}"/>-->
<TextBlock Text="任务时间" Grid.Column="3" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text=" " Grid.Column="4" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="操作" Grid.Column="5" Style="{StaticResource middleTextBlock}"/>
<!--<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}"/>-->
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="1"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="2"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="3"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="4"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="5"/>
<!--<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="5"/>-->
<!--<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="6"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="7"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="8"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="9"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="10"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="11"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="12"/>-->
<!--<Border Height="1" VerticalAlignment="Top" Background="{StaticResource Border.Brush}" Grid.ColumnSpan="6"/>-->
</Grid>
</Border>
<ListBox x:Name="listbox_order"
Grid.Row="7"
ItemsSource="{Binding WaitTransportList}"
ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
BorderBrush="{StaticResource Border.Brush}"
BorderThickness="1,1,1,0"
Foreground="{StaticResource Text.Color}">
<ListBox.ItemTemplate>
<DataTemplate>
<Grid Width="{Binding ActualWidth,ElementName=listbox_order,Converter={StaticResource widthConverter},ConverterParameter=-0}"
MinHeight="100">
<Grid.RowDefinitions>
<RowDefinition Height="30"/>
<RowDefinition MinHeight="90"/>
</Grid.RowDefinitions>
<Grid Background="#F2F2F2" >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="400"/>
<ColumnDefinition Width="80"/>
<ColumnDefinition Width="0"/>
<ColumnDefinition Width="150"/>
<ColumnDefinition MinWidth="80"/>
<ColumnDefinition Width="100"/>
</Grid.ColumnDefinitions>
<StackPanel Orientation="Horizontal" Grid.Column="0" Grid.ColumnSpan="11">
<TextBlock Text="店铺:" Style="{StaticResource middleTextBlock}" Margin="10 0 0 0"/>
<c:BButton Content="{Binding ShopName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
CommandParameter="{Binding ShopName}"
Margin=" 5,0,7,0"/>
<TextBlock VerticalAlignment="Center" Text="仓库:" Margin="16,0,0,0" />
<c:BButton Content="{Binding WareName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
CommandParameter="{Binding WareName}"
Margin=" 5,0,7,0"/>
<TextBlock VerticalAlignment="Center" Text="封箱ID:" Margin="16,0,0,0" />
<c:BButton Content="{Binding SealBoxId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
CommandParameter="{Binding SealBoxId}"
Margin=" 5,0,7,0"/>
<TextBlock VerticalAlignment="Center" Text="部门:" Margin="14,0,0,0" />
<c:BButton Content="{Binding DepartmentName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
CommandParameter="{Binding DepartmentName}"
Margin=" 5,0,0,0"/>
<TextBlock VerticalAlignment="Center" Text="对接人:" Margin="16,0,0,0" />
<TextBlock VerticalAlignment="Center" Text="{Binding AcceptUserNames}" Margin="5,0,0,0" />
</StackPanel>
</Grid>
<Grid Grid.Row="1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="400"/>
<ColumnDefinition Width="80"/>
<ColumnDefinition Width="0"/>
<ColumnDefinition Width="150"/>
<ColumnDefinition MinWidth="80"/>
<ColumnDefinition Width="100"/>
</Grid.ColumnDefinitions>
<ListBox x:Name="listbox_orerSku" ItemsSource="{Binding WaitTransportSkus}"
Style="{StaticResource NoScrollViewListBoxStyle}"
ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}" >
<ListBox.ItemTemplate>
<DataTemplate>
<Grid MinHeight="100" Width="{Binding ActualWidth,ElementName=listbox_orerSku}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="90"/>
<ColumnDefinition/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<!--{Binding Logo}-->
<c:BAsyncImage UrlSource="{Binding Logo}"
Width="80" DecodePixelWidth="80"
VerticalAlignment="Top" Margin="11,10,0,10"
Cursor="Hand">
<b:Interaction.Triggers>
<b:EventTrigger EventName="PreviewMouseLeftButtonDown">
<b:InvokeCommandAction Command="{Binding DataContext.OpenSkuDetailCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}">
<b:InvokeCommandAction.CommandParameter>
<MultiBinding Converter="{StaticResource mptConverter}">
<Binding Path="SkuId"/>
</MultiBinding>
</b:InvokeCommandAction.CommandParameter>
</b:InvokeCommandAction>
</b:EventTrigger>
</b:Interaction.Triggers>
</c:BAsyncImage>
<StackPanel Grid.Column="1" Orientation="Vertical" Margin="8,15,0,10">
<StackPanel Orientation="Horizontal" Margin="0 0 0 13">
<TextBlock Text="SKU:" Style="{StaticResource middleTextBlock}" />
<c:BButton Content="{Binding SkuId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
CommandParameter="{Binding SkuId}"
Margin=" 5,0,0,0"/>
</StackPanel>
<TextBlock Foreground="{StaticResource Text.Gray}" TextTrimming="CharacterEllipsis">
<TextBlock.ToolTip>
<ToolTip Style="{StaticResource OrderCouponToolipStyle}">
<TextBlock Text="{Binding SkuTitle,Mode=TwoWay}"/>
</ToolTip>
</TextBlock.ToolTip>
<Run Text="SKU名称:"/>
<Run Text="{Binding SkuTitle}"/>
</TextBlock>
<TextBlock Foreground="{StaticResource Text.Gray}" TextWrapping="Wrap" Margin="0,13,0 0">
<Run Text="品名:"/>
<Run Text="{Binding BrandName}"/>
</TextBlock>
</StackPanel>
<StackPanel Orientation="Vertical" Grid.Column="2" Margin="20,15,0,10">
<!--<StackPanel Orientation="Horizontal" >
<TextBlock Foreground="{StaticResource Text.Gray}">
<Run Text="货号:" />
</TextBlock>
<c:BButton Content="{Binding ProductNo}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Top"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
CommandParameter="{Binding ProductNo}"
Margin=" 5,0,0,0"/>
</StackPanel>-->
<StackPanel Grid.Column="2" Orientation="Horizontal" Margin="0,0,0,5">
<TextBlock Foreground="{StaticResource Text.Gray}">
<Run Text="任务ID:" />
</TextBlock>
<c:BButton Content="{Binding TaskId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Top"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
CommandParameter="{Binding TaskId}"
Margin=" 5,0,0,0"/>
</StackPanel>
<!--<TextBlock Foreground="{StaticResource Text.Gray}" TextWrapping="Wrap" Margin="0,10,0 0">
<Run Text="任务状态:"/>
<Run Foreground="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收|待打包:Red:black}" Text="{Binding TaskState}"/>
</TextBlock>-->
</StackPanel>
</Grid>
<Border Grid.Row="0" VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/>
</Grid>
</DataTemplate>
</ListBox.ItemTemplate>
</ListBox>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="0"/>
<ListBox x:Name="listbox_skuCount" ItemsSource="{Binding WaitTransportSkus}"
Style="{StaticResource NoScrollViewListBoxStyle}" Grid.Column="1"
ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}" >
<ListBox.ItemTemplate>
<DataTemplate>
<Grid MinHeight="100" Width="{Binding ActualWidth,ElementName=listbox_skuCount}">
<Grid>
<TextBlock x:Name="txt_storeName"
Text="{Binding WareHourseSkuCount}"
TextWrapping="Wrap"
HorizontalAlignment="Center" VerticalAlignment="Center"
/>
</Grid>
<Border Grid.Row="0" VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/>
</Grid>
</DataTemplate>
</ListBox.ItemTemplate>
</ListBox>
<Grid Grid.Column="2" >
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding SealBoxCount}"/>
</StackPanel>
</Grid>
<Grid Grid.Column="3" >
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center"
Visibility="{Binding WaitTransportRemainTime,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
>
<StackPanel Margin="10,5" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center"
Visibility="{Binding IsWaitTransportOverTime,Converter={StaticResource objConverter},ConverterParameter=false:Visible:Collapsed}"
>
<TextBlock Text="剩余: " />
<TextBlock Text="{Binding WaitTransportRemainTime}"/>
</StackPanel>
<StackPanel Margin="10,5" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center"
Visibility="{Binding IsWaitTransportOverTime,Converter={StaticResource objConverter},ConverterParameter=true:Visible:Collapsed}"
>
<TextBlock Foreground="Red" Text="超时: "/>
<TextBlock Foreground="Red" Text="{Binding WaitTransportRemainTime}"/>
</StackPanel>
</StackPanel>
</Grid>
<Grid Grid.Column="5" >
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<c:BButton Grid.Column="11" HorizontalAlignment="Stretch" Style="{StaticResource LinkButton}" VerticalAlignment="Center" Content="完成"
Command="{Binding DataContext.CompeteWaitTransportCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}"
CommandParameter="{Binding}"
>
</c:BButton>
<!-- Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待打包:Visible:Collapsed}" -->
</StackPanel>
</Grid>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="1"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="2"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="3" Margin="0 0 0 0"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="4" Margin="0 0 2 0"/>
<!--<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="5"/>-->
<!--<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="5"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="6"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="7"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="8"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="9"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="10"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="11"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="12"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="13"/>-->
</Grid>
<Border Grid.Row="1" VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/>
</Grid>
</DataTemplate>
</ListBox.ItemTemplate>
</ListBox>
</Grid>
</UserControl>

26
BBWY.Client/Views/WaitTransport/WareWaitTransportControl.xaml.cs

@ -0,0 +1,26 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace BBWY.Client.Views.WaitTransport
{
/// <summary>
/// WareWaitTransportControl.xaml 的交互逻辑
/// </summary>
public partial class WareWaitTransportControl : UserControl
{
public WareWaitTransportControl()
{
InitializeComponent();
}
}
}

94
BBWY.Client/Views/WaitTransport/WareWaitTransportListControl.xaml

@ -0,0 +1,94 @@
<UserControl x:Class="BBWY.Client.Views.WaitTransport.WareWaitTransportListControl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:BBWY.Client.Views.WaitTransport"
mc:Ignorable="d"
xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls"
xmlns:ctr="clr-namespace:BBWY.Client.Converters" Background="White"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:packtask ="clr-namespace:BBWY.Client.Views.PackTask"
xmlns:sealbox="clr-namespace:BBWY.Client.Views.SealBox"
xmlns:fallware="clr-namespace:BBWY.Client.Views.FallWare"
xmlns:cmodel="clr-namespace:BBWY.Client.Models"
DataContext="{Binding WareHouseList,Source={StaticResource Locator}}"
xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
d:DesignHeight="450" d:DesignWidth="1500">
<UserControl.Resources>
<ObjectDataProvider x:Key="storageTypeProvider" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
<ObjectDataProvider.MethodParameters>
<x:Type TypeName="cmodel:StorageType"/>
</ObjectDataProvider.MethodParameters>
</ObjectDataProvider>
<ctr:OrderStorageTypeOptionConverter x:Key="ostConverter"/>
<ctr:ProfitRatioConverter x:Key="profitRatioConverter"/>
<ctr:WaybillNoConverter x:Key="waybillConverter"/>
<ctr:MultiParameterTransferConverter x:Key="mptConverter"/>
<ctr:SaleGrossProfitConverter x:Key="sgpcConverter"/>
<Style TargetType="RadioButton">
<Setter Property="IsChecked" Value="False" />
<Setter Property="Background" Value="#8080FF" />
<Setter Property="Foreground" Value="Black" />
<!--<Setter Property="Content" Value="{Binding ElementName=txt,Path=Text}"/>-->
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="RadioButton">
<Grid Background="#F2F2F2" >
<Rectangle x:Name="_Rect" Fill="#F2F2F2" HorizontalAlignment="Center" Height="35" VerticalAlignment="Center" Width="{TemplateBinding Width}" RenderTransformOrigin="0.5,0.5">
<Rectangle.RenderTransform>
<TransformGroup>
<ScaleTransform ScaleY="-1"/>
<SkewTransform/>
<RotateTransform/>
<TranslateTransform/>
</TransformGroup>
</Rectangle.RenderTransform>
</Rectangle>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Height="35">
<TextBlock VerticalAlignment="Center" Text="{TemplateBinding Content}" />
<TextBlock VerticalAlignment="Center" Text="{TemplateBinding Tag}" Foreground="{StaticResource Text.Pink}" Margin="5 0 0 0" />
</StackPanel>
</Grid>
<ControlTemplate.Triggers>
<Trigger Property="IsChecked" Value="true">
<Setter TargetName="_Rect" Property="Fill" Value="#8080FF" />
<Setter Property="Foreground" Value="white"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
</UserControl.Resources>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="40"/>
<RowDefinition />
</Grid.RowDefinitions>
<StackPanel Orientation="Horizontal">
<RadioButton Content="京仓" Height="35" Width="130" Tag="{Binding WaitTransportJDWareCount,Mode=TwoWay}" IsChecked="{Binding SelectWareType,Converter={StaticResource objConverter},ConverterParameter=京仓:True:False}"
Command="{Binding SetWareTypeCommand}" CommandParameter="{x:Static cmodel:WareType.京仓}"
/>
<RadioButton Content="云仓" Height="35" Width="130" Tag="{Binding WaitTransportCloudWareCount,Mode=TwoWay}" IsChecked="{Binding SelectWareType,Converter={StaticResource objConverter},ConverterParameter=云仓:True:False}"
Command="{Binding SetWareTypeCommand}" CommandParameter="{x:Static cmodel:WareType.云仓}"
/>
<RadioButton Content="聚水潭" Height="35" Width="130" Tag="{Binding WaitTransportJuShuiTanCount,Mode=TwoWay}" IsChecked="{Binding SelectWareType,Converter={StaticResource objConverter},ConverterParameter=聚水潭齐越仓:True:False}"
Command="{Binding SetWareTypeCommand}" CommandParameter="{x:Static cmodel:WareType.聚水潭齐越仓}"
/>
<RadioButton Content="商家仓" Height="35" Width="130" Tag="{Binding WaitTransportStoreWareCount,Mode=TwoWay}" IsChecked="{Binding SelectWareType,Converter={StaticResource objConverter},ConverterParameter=商家仓:True:False}"
Command="{Binding SetWareTypeCommand}" CommandParameter="{x:Static cmodel:WareType.商家仓}"
/>
</StackPanel>
<Grid Grid.Row="1"
>
<local:WareWaitTransportControl/>
</Grid>
</Grid>
</UserControl>

26
BBWY.Client/Views/WaitTransport/WareWaitTransportListControl.xaml.cs

@ -0,0 +1,26 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace BBWY.Client.Views.WaitTransport
{
/// <summary>
/// WareWaitTransportUserControl.xaml 的交互逻辑
/// </summary>
public partial class WareWaitTransportListControl : UserControl
{
public WareWaitTransportListControl()
{
InitializeComponent();
}
}
}
Loading…
Cancel
Save