Browse Source

添加 超时任务统计 修复取消任务 商家自取 移除封箱的任务

AddValidOverTime
506583276@qq.com 2 years ago
parent
commit
0a4beab5f1
  1. 17
      BBWY.Client/APIServices/QiKu/PackTaskService.cs
  2. 17
      BBWY.Client/APIServices/QiKu/SealBoxService.cs
  3. 41
      BBWY.Client/Helpers/OverTimeHelper.cs
  4. 1
      BBWY.Client/Models/APIModel/Request/CreateTaskRequest.cs
  5. 26
      BBWY.Client/Models/APIModel/Response/PackTask/SearchOverTimeTaskResponse.cs
  6. 13
      BBWY.Client/Models/APIModel/Response/PackTask/SearchTaskListResponse.cs
  7. 20
      BBWY.Client/Models/APIModel/Response/PackTask/SearchWaitFallWareResponse.cs
  8. 50
      BBWY.Client/Models/APIModel/Response/SealBox/GetWareWaitCompletedResponse.cs
  9. 10
      BBWY.Client/Models/BatchPurchase/BatchPublishTask.cs
  10. 26
      BBWY.Client/Models/Enums.cs
  11. 12
      BBWY.Client/Models/PackTask/PackTaskModel.cs
  12. 99
      BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs
  13. 12
      BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs
  14. 208
      BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs
  15. 332
      BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
  16. 25
      BBWY.Client/Views/FallWare/SetJDWareBoxWindow2.xaml.cs
  17. 27
      BBWY.Client/Views/FallWare/WaitFallWareControl.xaml
  18. 79
      BBWY.Client/Views/PackTask/ServiceWindow.xaml
  19. 301
      BBWY.Client/Views/PackTask/ShopWaitCompletedControl.xaml
  20. 26
      BBWY.Client/Views/PackTask/ShopWaitCompletedControl.xaml.cs
  21. 17
      BBWY.Client/Views/PackTask/ShopWaitPackageControl.xaml
  22. 4
      BBWY.Client/Views/PackTask/TaskList.xaml
  23. 16
      BBWY.Client/Views/PackTask/TaskListControl.xaml
  24. 301
      BBWY.Client/Views/PackTask/WaitCompletedControl.xaml
  25. 26
      BBWY.Client/Views/PackTask/WaitCompletedControl.xaml.cs
  26. 35
      BBWY.Client/Views/PackTask/WaitPackageControl.xaml
  27. 3
      BBWY.Client/Views/PackTask/WareHouseList.xaml
  28. 141
      BBWY.Client/Views/PackTask/WareHouseListControl.xaml
  29. 17
      BBWY.Client/Views/QualityTask/ShopWaitQualityControl.xaml
  30. 36
      BBWY.Client/Views/QualityTask/WaitQualityControl.xaml
  31. 49
      BBWY.Client/Views/TaskOverTime/WareTaskOverTimeControl.xaml

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

@ -56,7 +56,7 @@ namespace BBWY.Client.APIServices
ShopId = globalContext.User.Shop.ShopId.ToString() ShopId = globalContext.User.Shop.ShopId.ToString()
}, null, HttpMethod.Post); }, 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, public ApiResponse<SearchTaskListResponse> GetWareHouseList(string WayBillNo = null, string SourceExpressName = null, string departmentName = null, string skuId = null, string taskId = null,
TaskState? TaskState = null, TaskState? TaskState = null,
string ShopName = null, string ShopName = null,
@ -74,7 +74,6 @@ namespace BBWY.Client.APIServices
} }
return SendRequest<SearchTaskListResponse>(globalContext.QKApiHost, "api/PackTask/SearchTaskList", new return SendRequest<SearchTaskListResponse>(globalContext.QKApiHost, "api/PackTask/SearchTaskList", new
{ {
IsWorry = isWorry,
DepartmentName = departmentName, DepartmentName = departmentName,
SkuId = skuId, SkuId = skuId,
TaskId = taskId, TaskId = taskId,
@ -143,16 +142,6 @@ namespace BBWY.Client.APIServices
, null, HttpMethod.Post); , null, HttpMethod.Post);
} }
public ApiResponse<object> UpdateTaskStatus(long id, int taskStatus, string orderId)
{
return SendRequest<object>(globalContext.QKApiHost, "api/PackTask/UpdatePackTaskStatus", new
{
id,
taskStatus,
orderId
}
, null, HttpMethod.Post);
}
@ -304,13 +293,13 @@ namespace BBWY.Client.APIServices
/// </summary> /// </summary>
/// <param name="taskId"></param> /// <param name="taskId"></param>
/// <returns></returns> /// <returns></returns>
public ApiResponse<SearchOverTimeTaskResponse> SearchOverTimeTaskList(string ShopId, DateTime? StartTime, DateTime? EndTime, OverTimeTaskType? TaskState, int? PageIndex, int? PageSize) public ApiResponse<SearchOverTimeTaskResponse> SearchOverTimeTaskList(string ShopId, DateTime? StartTime, DateTime? EndTime, OverTimeTaskType? OverTimeTaskType, int? PageIndex, int? PageSize=20)
{ {
return SendRequest<SearchOverTimeTaskResponse>(globalContext.QKApiHost, $"api/PackTask/SearchOverTimeTaskList", new { return SendRequest<SearchOverTimeTaskResponse>(globalContext.QKApiHost, $"api/PackTask/SearchOverTimeTaskList", new {
ShopId, ShopId,
StartTime, StartTime,
EndTime, EndTime,
TaskState, OverTimeTaskType,
PageIndex, PageIndex,
PageSize PageSize
}, null, HttpMethod.Post); }, null, HttpMethod.Post);

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

@ -263,5 +263,22 @@ namespace BBWY.Client.APIServices
return SendRequest<GetWareTransportCountResponse>(globalContext.QKApiHost, $"api/SealBox/GetWareTransportCounts", return SendRequest<GetWareTransportCountResponse>(globalContext.QKApiHost, $"api/SealBox/GetWareTransportCounts",
null, null, HttpMethod.Post); null, null, HttpMethod.Post);
} }
public ApiResponse<GetWareWaitCompletedResponse> GetWareWaitCompletedList(string shopId, int? PageIndex, int? PageSize)
{
return SendRequest<GetWareWaitCompletedResponse>(globalContext.QKApiHost, $"api/SealBox/GetWareWaitCompletedList",
new {
shopId,
PageIndex,
PageSize
}, null, HttpMethod.Post);
}
public ApiResponse<bool> WareCompetedWaitCompleted(long sealBoxId)
{
return SendRequest<bool>(globalContext.QKApiHost, $"api/SealBox/WareCompetedWaitCompleted?sealBoxId={sealBoxId}",
null, null, HttpMethod.Post);
}
} }
} }

41
BBWY.Client/Helpers/OverTimeHelper.cs

@ -0,0 +1,41 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace BBWY.Client.Helpers
{
public class OverTimeHelper
{
public static string GetTimeString(TimeSpan timespan)
{
if (timespan.TotalMilliseconds > 0)
{
if (timespan.Days > 0)
{
return $"{timespan.Days}天{timespan.Hours}小时{timespan.Minutes}分";
}
if (timespan.Hours > 0)
{
return $"{timespan.Hours}小时{timespan.Minutes}分";
}
return $"{timespan.Minutes}分钟";
}
else
{
if (-timespan.Days > 0)
{
return $"{-timespan.Days}天{-timespan.Hours}小时{-timespan.Minutes}分";
}
if (-timespan.Hours > 0)
{
return $"{-timespan.Hours}小时{-timespan.Minutes}分";
}
return $"{-timespan.Minutes}分钟";
}
}
}
}

1
BBWY.Client/Models/APIModel/Request/CreateTaskRequest.cs

@ -98,7 +98,6 @@ namespace BBWY.Client.Models.APIModel.Request
/// </summary> /// </summary>
public int? CertificatePosition { get; set; } public int? CertificatePosition { get; set; }
//public Worry IsWorry { get; set; }
public string OrderId { get; set; } public string OrderId { get; set; }
public Platform Platform { get; set; } public Platform Platform { get; set; }

26
BBWY.Client/Models/APIModel/Response/PackTask/SearchOverTimeTaskResponse.cs

@ -16,15 +16,15 @@ namespace BBWY.Client.Models.APIModel
/// 超时日期 /// 超时日期
/// </summary> /// </summary>
public DateTime OverTimeDate { get; set; } public DateTime OverTimeDate { get; set; }
/// <summary> ///// <summary>
/// 任务信息(任务id 或者封箱id) ///// 任务信息(任务id 或者封箱id)
/// </summary> ///// </summary>
public string TaskMessage { get; set; } //public string TaskMessage { get; set; }
/// <summary> /// <summary>
/// 任务类型 /// 超时任务类型
/// </summary> /// </summary>
public TaskState TaskState { get; set; } public OverTimeTaskType? OverTimeTaskType { get; set; }
/// <summary> /// <summary>
/// 任务人 /// 任务人
/// </summary> /// </summary>
@ -38,5 +38,19 @@ namespace BBWY.Client.Models.APIModel
/// 备注 /// 备注
/// </summary> /// </summary>
public string RemarkMessage { get; set; } public string RemarkMessage { get; set; }
/// <summary>
/// 任务类型(任务ID = 0,封箱ID = 1)
/// </summary>
public TaskMessageType TaskMessageType { get; set; }
/// <summary>
/// 任务id 或者 封箱id
/// </summary>
public long Id { get; set; }
/// <summary>
/// 任务状态/或者封箱状态
/// </summary>
public string TaskState { get; set; }
} }
} }

13
BBWY.Client/Models/APIModel/Response/PackTask/SearchTaskListResponse.cs

@ -149,10 +149,7 @@ namespace BBWY.Client.Models.APIModel
/// 合格证数据 /// 合格证数据
/// </summary> /// </summary>
public CertificateModel[] Cers { get; set; } public CertificateModel[] Cers { get; set; }
/// <summary>
/// 是否加急
/// </summary>
public int IsWorry { get; set; }
/// <summary> /// <summary>
/// 品牌 /// 品牌
@ -161,10 +158,10 @@ namespace BBWY.Client.Models.APIModel
public string OrderId { get; set; } public string OrderId { get; set; }
/// <summary> ///// <summary>
///分箱情况 /////分箱情况
/// </summary> ///// </summary>
public WareHourseDTO[] WareHourses { get; set; } //public WareHourseDTO[] WareHourses { get; set; }
/// <summary> /// <summary>
/// 地托编号 /// 地托编号
/// </summary> /// </summary>

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

@ -73,9 +73,14 @@ namespace BBWY.Client.Models.APIModel
/// 商品数量(封箱sku任务数总和) /// 商品数量(封箱sku任务数总和)
/// </summary> /// </summary>
public int ProductCount { get; set; } public int ProductCount { get; set; }
/// <summary>
/// 提交采购单过期时间
/// </summary>
public DateTime? SetPurchaseOrderOverTime { get; set; }
} }
public class WaitFallWareModel public class WaitFallWareModel:NotifyObject
{ {
/// <summary> /// <summary>
/// 仓库类型 /// 仓库类型
@ -129,6 +134,19 @@ namespace BBWY.Client.Models.APIModel
/// 商品数量(封箱sku任务数总和) /// 商品数量(封箱sku任务数总和)
/// </summary> /// </summary>
public int ProductCount { get; set; } public int ProductCount { get; set; }
/// <summary>
/// 提交采购单过期时间
/// </summary>
public DateTime? SetPurchaseOrderOverTime { get; set; }
private string fallWareRemainTime;
public string FallWareRemainTime { get => fallWareRemainTime; set { Set(ref fallWareRemainTime, value); } }
private bool isFallWareOverTime;
public bool IsFallWareOverTime { get => isFallWareOverTime; set { Set(ref isFallWareOverTime, value); } }
} }
public class BoxConfigureData public class BoxConfigureData
{ {

50
BBWY.Client/Models/APIModel/Response/SealBox/GetWareWaitCompletedResponse.cs

@ -0,0 +1,50 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace BBWY.Client.Models.APIModel
{
public class GetWareWaitCompletedResponse
{
/// <summary>
/// 数量
/// </summary>
public int TotalCount { get; set; }
public List<WareWaitCompleted> WareWaitCompleteds { get; set; }
}
public class WareWaitCompleted:NotifyObject
{
public long SealBoxId { get; set; }
/// <summary>
/// 店铺Id
/// </summary>
public string ShopId { 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; }
}
}

10
BBWY.Client/Models/BatchPurchase/BatchPublishTask.cs

@ -114,11 +114,11 @@ namespace BBWY.Client.Models
/// 配件数 /// 配件数
/// </summary> /// </summary>
public int GoodsNumber { get => goodsNumber; set { Set(ref goodsNumber, value); } } public int GoodsNumber { get => goodsNumber; set { Set(ref goodsNumber, value); } }
private Worry isWorry; //private Worry isWorry;
/// <summary> ///// <summary>
/// 是否加急 ///// 是否加急
/// </summary> ///// </summary>
public Worry IsWorry { get => isWorry; set { Set(ref isWorry, value); } } //public Worry IsWorry { get => isWorry; set { Set(ref isWorry, value); } }
private Availability availability; private Availability availability;
/// <summary> /// <summary>

26
BBWY.Client/Models/Enums.cs

@ -242,7 +242,7 @@
= 6, = 6,
= 7, = 7,
= 8, = 8,
= 9, //待完结 = 9,
= 10, = 10,
=11, =11,
=12 =12
@ -337,15 +337,14 @@
= 0, = 0,
= 1 = 1
} }
/// <summary> ///// <summary>
/// 任务状态 ///// 任务状态
/// </summary> ///// </summary>
public enum TaskStateType //public enum TaskStateType
{ //{
= 0, // 未完成 = 0,
= 1 // 已完成 = 1
//}
}
/// <summary> /// <summary>
/// 服务单状态 /// 服务单状态
@ -532,12 +531,17 @@
/// </summary> /// </summary>
public enum OverTimeTaskType public enum OverTimeTaskType
{ {
=0,
= 2,//已到货 = 2,//已到货
= 3, = 3,
= 4, = 4,
= 8, = 8,
= 11, = 11,
} }
public enum TaskMessageType
{
ID = 0,
ID=1
}
} }

12
BBWY.Client/Models/PackTask/PackTaskModel.cs

@ -207,18 +207,8 @@ namespace BBWY.Client.Models
public Availability Availability { get => availability; set { Set(ref availability, value); } } public Availability Availability { get => availability; set { Set(ref availability, value); } }
private Worry isWorry;
/// <summary>
/// 是否加急
/// </summary>
public Worry IsWorry { get => isWorry; set { Set(ref isWorry, value); } }
private TaskStateType taskStatus;
/// <summary>
/// 任务状态(未完成=0,已完成=1)
/// </summary>
public TaskStateType TaskStatus { get => taskStatus; set { Set(ref taskStatus, value); } }
private TaskState taskState; private TaskState taskState;
@ -265,7 +255,7 @@ namespace BBWY.Client.Models
private string positionType; private string positionType;
/// <summary> /// <summary>
/// 落仓(本地仓=0,云仓=1,京仓=2) /// 落仓(商家仓=0,云仓=1,京仓=2,聚水潭=3)
/// </summary> /// </summary>
public string PositionType { get => positionType; set { Set(ref positionType, value); } } public string PositionType { get => positionType; set { Set(ref positionType, value); } }

99
BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs

@ -66,11 +66,7 @@ namespace BBWY.Client.ViewModels.PackTask
private bool isLoading = false; private bool isLoading = false;
public bool IsLoading { get => isLoading; set { Set(ref isLoading, value); } } public bool IsLoading { get => isLoading; set { Set(ref isLoading, value); } }
private Worry isWorry;
/// <summary>
/// 是否加急
/// </summary>
public Worry IsWorry { get => isWorry; set { Set(ref isWorry, value); } }
private DelayTrigger delayTrigger; private DelayTrigger delayTrigger;
@ -432,7 +428,7 @@ namespace BBWY.Client.ViewModels.PackTask
SkuTitle = model.SkuTitle; SkuTitle = model.SkuTitle;
GoodsNumber = model.GoodsNumber; GoodsNumber = model.GoodsNumber;
Availability = model.Availability; Availability = model.Availability;
IsWorry = model.IsWorry;
if (string.IsNullOrEmpty(model.OrderId)) if (string.IsNullOrEmpty(model.OrderId))
{ {
@ -505,16 +501,8 @@ namespace BBWY.Client.ViewModels.PackTask
this.globalContext = globalContext; this.globalContext = globalContext;
SetBarCodeCommand = new RelayCommand(SetBarCode); SetBarCodeCommand = new RelayCommand(SetBarCode);
SetCertificateCommand = new RelayCommand(SetCertificate); SetCertificateCommand = new RelayCommand(SetCertificate);
//SaveBarCodeCommand = new RelayCommand(SaveBarCode);
//SetSpuCerCommand = new RelayCommand(SetSpuCer);
//SaveSpuCerCommand = new RelayCommand(SaveSpuCer);
//InseartCerCommand = new RelayCommand(InseartCer);
//SaveCerCommand = new RelayCommand(SaveCer);
BarLabelCheckCommand = new RelayCommand<BarcodeLabelModel>(BarLabelCheck); BarLabelCheckCommand = new RelayCommand<BarcodeLabelModel>(BarLabelCheck);
//CerLabelCheckCommand = new RelayCommand<CertificateLabelModel>(CerLabelCheck);
//SpuCerLabelCheckCommand = new RelayCommand<CertificateLabelModel>(SpuCerLabelCheck);
LookBarCommand = new RelayCommand(LookBar); LookBarCommand = new RelayCommand(LookBar);
@ -525,84 +513,7 @@ namespace BBWY.Client.ViewModels.PackTask
BarLabelCheck(BarcodeLabelModel.);//默认精简模式 BarLabelCheck(BarcodeLabelModel.);//默认精简模式
} }
//private void InseartCer()
//{
// if (IsSetSpuCertificate)
// {
// new TipsWindow("无可用模板").Show();
// return;
// }
// CertificateModel = new CertificateModel()
// {
// //SpuId = SpuCertificateModel.SpuId,
// SkuId = SkuId,
// Brand = SpuCertificateModel.Brand,
// BrandName = SpuCertificateModel.BrandName,
// ExcuteStander = SpuCertificateModel.ExcuteStander,
// FactoryNumber = SpuCertificateModel.FactoryNumber,
// IsLogo = SpuCertificateModel.IsLogo,
// LabelModel = SpuCertificateModel.LabelModel,
// ProductAdress = SpuCertificateModel.ProductAdress,
// ProductNo = SpuCertificateModel.ProductNo,
// Shader = SpuCertificateModel.Shader,
// ProductShop = SpuCertificateModel.ProductShop,
// ApplyAge = SpuCertificateModel.ApplyAge,
// };
//}
//private void SetSpuCer()
//{
// if (SpuCertificateModel == null)
// {
// SpuCertificateModel = new CertificateModel();
// SpuCertificateModel.ProductNo = ProductNo;
// SpuCertificateModel.Brand = Brand;
// SpuCertificateModel.SkuId = SkuId;
// }
// if (!string.IsNullOrEmpty(BrandName))
// SpuCertificateModel.BrandName = BrandName;
// setSpuCerWindow = new SetSpuCerWindow();
// setSpuCerWindow.Show();
//}
//private void SaveSpuCer()
//{
// if (string.IsNullOrEmpty(SpuCertificateModel.ExcuteStander)
// || string.IsNullOrEmpty(SpuCertificateModel.BrandName)
// || string.IsNullOrEmpty(SpuCertificateModel.Brand) || string.IsNullOrEmpty(SpuCertificateModel.ProductShop)
// || string.IsNullOrEmpty(SpuCertificateModel.ProductAdress))
// {
// new TipsWindow("参数出错!请重新填写!").Show();
// return;
// }
// var resData = packTaskService.SaveSpuCer(new CerRequest
// {
// Brand = SpuCertificateModel.Brand,
// BrandName = SpuCertificateModel.BrandName,
// ProductNo = SpuCertificateModel.ProductNo,
// SpuId = SpuCertificateModel.SpuId,
// ExcuteStander = SpuCertificateModel.ExcuteStander,
// LabelModel = (int)SpuCertificateModel.LabelModel,
// FactoryNumber = SpuCertificateModel.FactoryNumber,
// IsLogo = SpuCertificateModel.IsLogo,
// ProductAdress = SpuCertificateModel.ProductAdress,
// ProductShop = SpuCertificateModel.ProductShop,
// Shader = SpuCertificateModel.Shader,
// SkuId = SpuCertificateModel.SkuId,
// ApplyAge = SpuCertificateModel.ApplyAge,
// });
// if (resData == null || !resData.Success)
// {
// IsSetSpuCertificate = false;
// return;
// }
// IsSetSpuCertificate = false;
// setSpuCerWindow.Close();
//}
private void OnSearchIncreateKeyWordChanged(string key) private void OnSearchIncreateKeyWordChanged(string key)
{ {
@ -881,7 +792,7 @@ namespace BBWY.Client.ViewModels.PackTask
SkuCount = SkuCount, SkuCount = SkuCount,
UserId = AccepUserId, UserId = AccepUserId,
ShopId = globalContext.User.Shop.ShopId.ToString(), ShopId = globalContext.User.Shop.ShopId.ToString(),
//IsWorry = IsWorry
}; };
if (IsNeedBarCode == Need.) if (IsNeedBarCode == Need.)
{ {

12
BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs

@ -118,11 +118,7 @@ namespace BBWY.Client.ViewModels.PackTask
/// 配件数 /// 配件数
/// </summary> /// </summary>
public int GoodsNumber { get => goodsNumber; set { Set(ref goodsNumber, value); } } public int GoodsNumber { get => goodsNumber; set { Set(ref goodsNumber, value); } }
private Worry isWorry;
/// <summary>
/// 是否加急
/// </summary>
public Worry IsWorry { get => isWorry; set { Set(ref isWorry, value); } }
private Availability availability; private Availability availability;
/// <summary> /// <summary>
@ -630,7 +626,7 @@ namespace BBWY.Client.ViewModels.PackTask
SkuTitle = model.SkuTitle; SkuTitle = model.SkuTitle;
GoodsNumber = model.GoodsNumber; GoodsNumber = model.GoodsNumber;
Availability = model.Availability; Availability = model.Availability;
IsWorry = model.IsWorry;
try try
{ {
PositionType = model.PositionType.ToEnum<PositionType>();//多个仓库异常 PositionType = model.PositionType.ToEnum<PositionType>();//多个仓库异常
@ -729,9 +725,7 @@ namespace BBWY.Client.ViewModels.PackTask
ShopId = globalContext.User.Shop.ShopId.ToString(), ShopId = globalContext.User.Shop.ShopId.ToString(),
NeedBar = IsNeedBarCode == Need., NeedBar = IsNeedBarCode == Need.,
NeedCer = IsNeedCertificateModel == Need. NeedCer = IsNeedCertificateModel == Need.
//IsWorry = IsWorry
}; };
if (IsNeedBarCode == Need.) if (IsNeedBarCode == Need.)
{ {

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

@ -44,6 +44,11 @@ namespace BBWY.Client.ViewModels.PackTask
private ObservableCollection<WareWaitCompleted> waitCompletedList;
/// <summary>
/// 待完结列表
/// </summary>
public ObservableCollection<WareWaitCompleted> WaitCompletedList { get => waitCompletedList; set { Set(ref waitCompletedList, value); } }
private string sealBoxWaitConfigureCount; private string sealBoxWaitConfigureCount;
/// <summary> /// <summary>
@ -202,26 +207,20 @@ namespace BBWY.Client.ViewModels.PackTask
private SealBoxService sealBoxService; private SealBoxService sealBoxService;
private PackTaskService packTaskService; private PackTaskService packTaskService;
WorkProcessService workProcessService;
public int? taskStatus { get; set; }
private ObservableCollection<PackTaskModel> packTaskList; private ObservableCollection<PackTaskModel> packTaskList;
/// <summary> /// <summary>
/// 动态数据表 /// 动态数据表
/// </summary> /// </summary>
public ObservableCollection<PackTaskModel> PackTaskList { get => packTaskList; set { Set(ref packTaskList, value); } } public ObservableCollection<PackTaskModel> PackTaskList { get => packTaskList; set { Set(ref packTaskList, value); } }
#endregion #endregion
public TaskListViewModel(PackTaskService packTaskService, GlobalContext globalContext, ProductService productService, ConsumableService consumableService, WorkProcessService workProcessService, IncreateServiceService increateServiceService, SealBoxService sealBoxService) public TaskListViewModel(PackTaskService packTaskService, GlobalContext globalContext, SealBoxService sealBoxService)
{ {
this.globalContext = globalContext; this.globalContext = globalContext;
this.productService = productService;
this.consumableService = consumableService;
this.workProcessService = workProcessService;
this.increateServiceService = increateServiceService;
this.packTaskService = packTaskService; this.packTaskService = packTaskService;
PackTaskList = new ObservableCollection<PackTaskModel>();//初始化数据 PackTaskList = new ObservableCollection<PackTaskModel>();//初始化数据
@ -229,7 +228,6 @@ namespace BBWY.Client.ViewModels.PackTask
SetSealBoxConfigureTypeCommand = new RelayCommand<SealBoxConfigureType>(s => SetSealBoxConfigureTypeCommand = new RelayCommand<SealBoxConfigureType>(s =>
{ {
PageIndex = 1;
SealBoxConfigureType = s; SealBoxConfigureType = s;
Task.Factory.StartNew(() => SearchTaskList()); Task.Factory.StartNew(() => SearchTaskList());
}); });
@ -237,7 +235,6 @@ namespace BBWY.Client.ViewModels.PackTask
CreateTaskCommand = new RelayCommand(CreateTask); CreateTaskCommand = new RelayCommand(CreateTask);
SearchTaskCommand = new RelayCommand(() => SearchTaskCommand = new RelayCommand(() =>
{ {
PageIndex = 1;
Task.Factory.StartNew(() => SearchTaskList()); //手动点击查询订单 Task.Factory.StartNew(() => SearchTaskList()); //手动点击查询订单
}); });
TaskPageIndexChangedCommand = new RelayCommand<PageArgs>(p => TaskPageIndexChangedCommand = new RelayCommand<PageArgs>(p =>
@ -457,8 +454,6 @@ namespace BBWY.Client.ViewModels.PackTask
} }
private ConsumableService consumableService;
private IncreateServiceService increateServiceService;
public void ReflashTask()//刷新界面 public void ReflashTask()//刷新界面
@ -467,7 +462,7 @@ namespace BBWY.Client.ViewModels.PackTask
} }
private List<TaskState> waitSealBoxTaskStates = new List<TaskState> { private List<TaskState> waitSealBoxTaskStates = new List<TaskState> {
Models.TaskState., Models.TaskState. Models.TaskState., Models.TaskState., Models.TaskState.
};//配置封箱的任务状态范围 };//配置封箱的任务状态范围
@ -551,7 +546,7 @@ namespace BBWY.Client.ViewModels.PackTask
QualityCompletionOverTime = item.QualityCompletionOverTime, QualityCompletionOverTime = item.QualityCompletionOverTime,
PackCompletionOverTime = item.PackCompletionOverTime, PackCompletionOverTime = item.PackCompletionOverTime,
ShopName = item.ShopName, ShopName = item.ShopName,
// IsWorry = (Worry)item.IsWorry,
}; };
if (!item.OrderId.IsNullOrEmpty() && !item.SkuId.IsNullOrEmpty())//加载物流信息 if (!item.OrderId.IsNullOrEmpty() && !item.SkuId.IsNullOrEmpty())//加载物流信息
@ -561,14 +556,8 @@ namespace BBWY.Client.ViewModels.PackTask
{ {
expressData.Data.ForEach(e => { expressData.Data.ForEach(e => {
e.ExpressState = ExpressOrderHelper.GetExpressStateName(e.ExpressState); e.ExpressState = ExpressOrderHelper.GetExpressStateName(e.ExpressState);
}); });
data.ExpressOrderList = expressData.Data; data.ExpressOrderList = expressData.Data;
} }
} }
if (item.BarCodeDTO != null && item.BarCodeDTO.Id > 0) if (item.BarCodeDTO != null && item.BarCodeDTO.Id > 0)
@ -599,100 +588,106 @@ namespace BBWY.Client.ViewModels.PackTask
data.ReflashTask = ReflashTask; data.ReflashTask = ReflashTask;
App.Current.Dispatcher.BeginInvoke(new Action(() => App.Current.Dispatcher.Invoke(new Action(() =>
{ {
PackTaskList.Add(data); PackTaskList.Add(data);
})); }));
} }
Thread.Sleep(500);
//任务状态为待验收 //任务状态为待验收
var packtasks = PackTaskList.Where(p => p.TaskState == Models.TaskState. && p.QualityCompletionOverTime != null).ToList(); if (TaskState == Models.TaskState.)
if (packtasks.Count() > 0 && TaskState == Models.TaskState.)
{ {
//if (qualityOverTimeThread!=null) var packtasks = PackTaskList.Where(p => p.TaskState == Models.TaskState. && p.QualityCompletionOverTime != null).ToList();
//{ if (packtasks.Count() > 0)
// qualityOverTimeThread.Abort();
//}
qualityOverTimeThread = new Thread(() =>
{ {
IsStartThread = true; //if (qualityOverTimeThread!=null)
while (IsStartThread) //{
// qualityOverTimeThread.Abort();
//}
qualityOverTimeThread = new Thread(() =>
{ {
App.Current.Dispatcher.BeginInvoke(new Action(() => IsStartThread = true;
while (IsStartThread)
{ {
foreach (var item in packtasks) App.Current.Dispatcher.BeginInvoke(new Action(() =>
{ {
var datetime = item.QualityCompletionOverTime.Value.Subtract(DateTime.Now); foreach (var item in packtasks)
if (datetime.TotalMilliseconds > 0)
{ {
item.IsQualityOverTime = false; var datetime = item.QualityCompletionOverTime.Value.Subtract(DateTime.Now);
//item.QualityRemainTime = $"{datetime.Days}天{datetime.Hours}小时{datetime.Minutes}分{datetime.Seconds}秒"; if (datetime.TotalMilliseconds > 0)
item.QualityRemainTime = $"{datetime.Days}天{datetime.Hours}小时{datetime.Minutes}分"; {
} item.IsQualityOverTime = false;
else //item.QualityRemainTime = $"{datetime.Days}天{datetime.Hours}小时{datetime.Minutes}分{datetime.Seconds}秒";
{ item.QualityRemainTime = $"{datetime.Days}天{datetime.Hours}小时{datetime.Minutes}分";
item.IsQualityOverTime = true; }
//item.QualityRemainTime = $"{-datetime.Days}天{-datetime.Hours}小时{-datetime.Minutes}分{-datetime.Seconds}秒"; else
item.QualityRemainTime = $"{-datetime.Days}天{-datetime.Hours}小时{-datetime.Minutes}分"; {
} item.IsQualityOverTime = true;
//item.QualityRemainTime = $"{-datetime.Days}天{-datetime.Hours}小时{-datetime.Minutes}分{-datetime.Seconds}秒";
item.QualityRemainTime = $"{-datetime.Days}天{-datetime.Hours}小时{-datetime.Minutes}分";
}
} }
})); }));
Thread.Sleep(1000); Thread.Sleep(1000);
} }
}); });
//任务倒计时数据 //任务倒计时数据
qualityOverTimeThread.IsBackground = true; qualityOverTimeThread.IsBackground = true;
qualityOverTimeThread.Start(); qualityOverTimeThread.Start();
}
} }
var packCompletedTasks = PackTaskList.Where(p => p.TaskState == Models.TaskState. && p.PackCompletionOverTime != null).ToList();
if (packCompletedTasks.Count() > 0 && TaskState == Models.TaskState.)
{
//if (packOverTimeThread!=null)
//{
// packOverTimeThread.Abort();
//}
packOverTimeThread = new Thread(() => //任务状态为待打包
if (TaskState == Models.TaskState.)
{
var packCompletedTasks = PackTaskList.Where(p => p.TaskState == Models.TaskState. && p.PackCompletionOverTime != null).ToList();
if (packCompletedTasks.Count() > 0)
{ {
IsStartThread = true;
while (IsStartThread) packOverTimeThread = new Thread(() =>
{ {
App.Current.Dispatcher.BeginInvoke(new Action(() => IsStartThread = true;
while (IsStartThread)
{ {
foreach (var item in packCompletedTasks) App.Current.Dispatcher.BeginInvoke(new Action(() =>
{ {
var datetime = item.PackCompletionOverTime.Value.Subtract(DateTime.Now); foreach (var item in packCompletedTasks)
if (datetime.TotalMilliseconds > 0)
{
item.IsPackOverTime = false;
item.PackRemainTime = $"{datetime.Days}天{datetime.Hours}小时{datetime.Minutes}分";
}
else
{ {
item.IsPackOverTime = true; var datetime = item.PackCompletionOverTime.Value.Subtract(DateTime.Now);
item.PackRemainTime = $"{-datetime.Days}天{-datetime.Hours}小时{-datetime.Minutes}分"; if (datetime.TotalMilliseconds > 0)
} {
item.IsPackOverTime = false;
item.PackRemainTime = $"{datetime.Days}天{datetime.Hours}小时{datetime.Minutes}分";
}
else
{
item.IsPackOverTime = true;
item.PackRemainTime = $"{-datetime.Days}天{-datetime.Hours}小时{-datetime.Minutes}分";
}
} }
})); }));
Thread.Sleep(1000); Thread.Sleep(1000);
} }
}); });
//任务倒计时数据 //任务倒计时数据
packOverTimeThread.IsBackground = true; packOverTimeThread.IsBackground = true;
packOverTimeThread.Start(); packOverTimeThread.Start();
}
} }
//任务状态为待打包
} }
@ -844,20 +839,20 @@ namespace BBWY.Client.ViewModels.PackTask
{ {
System.Windows.MessageBox.Show(fallWareRes.Msg); IsLoading = false; return; System.Windows.MessageBox.Show(fallWareRes.Msg); IsLoading = false; return;
} }
App.Current.Dispatcher.BeginInvoke(new Action(() => App.Current.Dispatcher.Invoke(new Action(() =>
{ {
OrderCount = fallWareRes.Data.TotalCount; OrderCount = fallWareRes.Data.TotalCount;
})); }));
foreach (var item in fallWareRes.Data.FallWareConfiguredModels) foreach (var item in fallWareRes.Data.FallWareConfiguredModels)
{ {
App.Current.Dispatcher.BeginInvoke(new Action(() => App.Current.Dispatcher.Invoke(new Action(() =>
{ {
FallWareWaitConfigureList.Add(item); FallWareWaitConfigureList.Add(item);
})); }));
} }
Thread.Sleep(100);
var fallWareTasks = FallWareWaitConfigureList.Where(p => p.SetPurchaseOrderOverTime != null).ToList(); var fallWareTasks = FallWareWaitConfigureList.Where(p => p.SetPurchaseOrderOverTime != null).ToList();
if (fallWareTasks.Count() > 0 && TaskState == Models.TaskState.&& SealBoxConfigureType == SealBoxConfigureType.) if (fallWareTasks.Count() > 0 && TaskState == Models.TaskState.&& SealBoxConfigureType == SealBoxConfigureType.)
{ {
@ -941,6 +936,34 @@ namespace BBWY.Client.ViewModels.PackTask
IsLoading = false; IsLoading = false;
}); });
if (TaskState == Models.TaskState.)
{
Task.Factory.StartNew(() =>
{
WaitCompletedList = new ObservableCollection<WareWaitCompleted>();
var datas = sealBoxService.GetWareWaitCompletedList(globalContext.User.Shop.ShopId.ToString(), PageIndex, PageSize);
if (datas != null && datas.Data != null && datas.Success)
{
var dataModel = datas.Data;
OrderCount = dataModel.TotalCount;
foreach (var item in dataModel.WareWaitCompleteds)
{
App.Current.Dispatcher.BeginInvoke(new Action(() =>
{
WaitCompletedList.Add(item);
}));
}
}
else
{
if (datas != null) System.Windows.MessageBox.Show(datas.Msg);
}
IsLoadCount();
IsLoading = false;
});
}
} }
@ -948,7 +971,7 @@ namespace BBWY.Client.ViewModels.PackTask
} }
GlobalContext globalContext; GlobalContext globalContext;
ProductService productService;
private void IsLoadFallWareCount() private void IsLoadFallWareCount()
{ {
var res = sealBoxService.GetFallWareConfigureCounts(globalContext.User.Shop.ShopId.ToString()); var res = sealBoxService.GetFallWareConfigureCounts(globalContext.User.Shop.ShopId.ToString());
@ -994,10 +1017,7 @@ namespace BBWY.Client.ViewModels.PackTask
public void ShowCertificateWindow() public void ShowCertificateWindow()
{ {
} }
/// <summary>
/// 筛选任务状态数据(根据TaskList数据)
/// </summary>
public void SelectTaskStatus() { }
#endregion #endregion
private void OpenSkuDetail(object param) private void OpenSkuDetail(object param)
{ {

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

@ -27,6 +27,7 @@ using BBWY.Client.Models.FallWare;
using WebSocketSharp; using WebSocketSharp;
using System.Threading; using System.Threading;
using BBWY.Client.Helpers; using BBWY.Client.Helpers;
using System.Diagnostics.Eventing.Reader;
namespace BBWY.Client.ViewModels.PackTask namespace BBWY.Client.ViewModels.PackTask
{ {
@ -44,11 +45,7 @@ namespace BBWY.Client.ViewModels.PackTask
private DateTime endTime; private DateTime endTime;
public DateTime EndTime { get => endTime; set { Set(ref endTime, value); } } public DateTime EndTime { get => endTime; set { Set(ref endTime, value); } }
private OverTimeTaskType overTimeTaskState;
/// <summary>
/// 任务类型(超时)
/// </summary>
public OverTimeTaskType OverTimeTaskState { get => overTimeTaskState; set { Set(ref overTimeTaskState, value); } }
public IList<OverTimeTaskResponse> OverTimeTaskResponses { get; set; } public IList<OverTimeTaskResponse> OverTimeTaskResponses { get; set; }
@ -60,13 +57,23 @@ namespace BBWY.Client.ViewModels.PackTask
public ObservableCollection<OverTimeTaskResponse> OverTimeTaskList { get => overTimeTaskList; set { Set(ref overTimeTaskList, value); } } public ObservableCollection<OverTimeTaskResponse> OverTimeTaskList { get => overTimeTaskList; set { Set(ref overTimeTaskList, value); } }
private ObservableCollection<OverTimeTaskType> overTimeTaskTypeList = new ObservableCollection<OverTimeTaskType> { private ObservableCollection<OverTimeTaskType> overTimeTaskTypeList = new ObservableCollection<OverTimeTaskType> {
OverTimeTaskType., OverTimeTaskType., OverTimeTaskType., OverTimeTaskType., OverTimeTaskType. OverTimeTaskType., OverTimeTaskType., OverTimeTaskType., OverTimeTaskType., OverTimeTaskType., OverTimeTaskType.
}; };
/// <summary> /// <summary>
///超时任务类型 ///超时任务类型
/// </summary> /// </summary>
public ObservableCollection<OverTimeTaskType> OverTimeTaskTypeList { get => overTimeTaskTypeList; set { Set(ref overTimeTaskTypeList, value); } } public ObservableCollection<OverTimeTaskType> OverTimeTaskTypeList { get => overTimeTaskTypeList; set { Set(ref overTimeTaskTypeList, value); } }
private OverTimeTaskType overTimeTaskState = OverTimeTaskType.;
/// <summary>
/// 任务类型(超时)
/// </summary>
public OverTimeTaskType OverTimeTaskState { get => overTimeTaskState; set { Set(ref overTimeTaskState, value); } }
private string waitTransportJDWareCount; private string waitTransportJDWareCount;
public string WaitTransportJDWareCount { get => waitTransportJDWareCount; set { Set(ref waitTransportJDWareCount, value); } } public string WaitTransportJDWareCount { get => waitTransportJDWareCount; set { Set(ref waitTransportJDWareCount, value); } }
@ -104,8 +111,11 @@ namespace BBWY.Client.ViewModels.PackTask
public string fallWareConfiguredCount; public string fallWareConfiguredCount;
public string FallWareConfiguredCount { get => fallWareConfiguredCount; set { Set(ref fallWareConfiguredCount, value); } } public string FallWareConfiguredCount { get => fallWareConfiguredCount; set { Set(ref fallWareConfiguredCount, value); } }
private ObservableCollection<WareWaitCompleted> waitCompletedList;
/// <summary>
/// 待完结列表
/// </summary>
public ObservableCollection<WareWaitCompleted> WaitCompletedList { get => waitCompletedList; set { Set(ref waitCompletedList, value); } }
private ObservableCollection<WareWaitTransport> waitTransportList; private ObservableCollection<WareWaitTransport> waitTransportList;
/// <summary> /// <summary>
/// 待转运列表 /// 待转运列表
@ -266,9 +276,6 @@ namespace BBWY.Client.ViewModels.PackTask
public bool IsLoading { get => isLoading; set { Set(ref isLoading, value); } } public bool IsLoading { get => isLoading; set { Set(ref isLoading, value); } }
private int? IsWorry { get; set; }
public int? taskStatus { get; set; }
public string searchDepartment; public string searchDepartment;
public string SearchDepartment public string SearchDepartment
@ -300,7 +307,6 @@ namespace BBWY.Client.ViewModels.PackTask
this.sealBoxService = sealBoxService; this.sealBoxService = sealBoxService;
this.packTaskService = packTaskService; this.packTaskService = packTaskService;
//Messenger.Default.Send(globalContext, "AcceptGlobalContext"); //Messenger.Default.Send(globalContext, "AcceptGlobalContext");
PackTaskList = new ObservableCollection<PackTaskModel>();//初始化数据 PackTaskList = new ObservableCollection<PackTaskModel>();//初始化数据
@ -308,8 +314,7 @@ namespace BBWY.Client.ViewModels.PackTask
SearchTaskCommand = new RelayCommand(() => SearchTaskCommand = new RelayCommand(() =>
{ {
PageIndex = 1; SearchTaskList(); //手动点击查询订单
Task.Factory.StartNew(() => SearchTaskList()); //手动点击查询订单
}); });
TaskPageIndexChangedCommand = new RelayCommand<PageArgs>(p => TaskPageIndexChangedCommand = new RelayCommand<PageArgs>(p =>
{ {
@ -321,8 +326,6 @@ namespace BBWY.Client.ViewModels.PackTask
StartTime = DateTime.Now.Date; StartTime = DateTime.Now.Date;
EndTime = DateTime.Now.Date; EndTime = DateTime.Now.Date;
IsLoading = false; IsLoading = false;
SetTaskStatusCommand = new RelayCommand<object>(SetTaskStatus);
TaskState = null; TaskState = null;
//加载数据 //加载数据
SelectWareType = WareType.; SelectWareType = WareType.;
@ -338,10 +341,10 @@ namespace BBWY.Client.ViewModels.PackTask
PositionState = PositionState.; PositionState = PositionState.;
SetSealBoxConfigureTypeCommand = new RelayCommand<SealBoxConfigureType>(s => SetSealBoxConfigureTypeCommand = new RelayCommand<SealBoxConfigureType>(s =>
{ {
PageIndex = 1;
SealBoxConfigureType = s; SealBoxConfigureType = s;
PositionState = s == SealBoxConfigureType. ? PositionState. : PositionState.; PositionState = s == SealBoxConfigureType. ? PositionState. : PositionState.;
Task.Factory.StartNew(() => SearchTaskList()); SearchTaskList();
}); });
@ -358,16 +361,39 @@ namespace BBWY.Client.ViewModels.PackTask
SetWareTypeCommand = new RelayCommand<WareType>(s => SetWareTypeCommand = new RelayCommand<WareType>(s =>
{ {
PageIndex = 1;
SelectWareType = s; SelectWareType = s;
Task.Factory.StartNew(() => SearchTaskList()); SearchTaskList();
}); });
CompeteWaitTransportCommand = new RelayCommand<object>(CompeteWaitTransport); CompeteWaitTransportCommand = new RelayCommand<object>(CompeteWaitTransport);
CompeteWaitCompletedCommand = new RelayCommand<object>(CompeteWaitCompleted);
} }
private void CompeteWaitCompleted(object obj)
{
var model = (WareWaitCompleted)obj;
if (System.Windows.MessageBox.Show("是否完成任务?", "提示",
MessageBoxButton.YesNo,
MessageBoxImage.Warning) != MessageBoxResult.Yes)
return;
var res = sealBoxService.WareCompetedWaitCompleted(model.SealBoxId);
if (res == null)
{
return;
}
if (!res.Success)
{
System.Windows.MessageBox.Show(res.Msg);
return;
}
Task.Factory.StartNew(() => SearchTaskList());
}
private void CompeteWaitTransport(object obj) private void CompeteWaitTransport(object obj)
{ {
var model = (WareWaitTransport)obj; var model = (WareWaitTransport)obj;
@ -562,9 +588,24 @@ namespace BBWY.Client.ViewModels.PackTask
#region 事件绑定 #region 事件绑定
/// <summary>
/// 待完结 完成事件
/// </summary>
public ICommand CompeteWaitCompletedCommand { get; set; }
/// <summary>
/// 待转运 完成事件
/// </summary>
public ICommand CompeteWaitTransportCommand { get; set; } public ICommand CompeteWaitTransportCommand { get; set; }
/// <summary>
/// 设置仓库类型
/// </summary>
public ICommand SetWareTypeCommand { get; set; } public ICommand SetWareTypeCommand { get; set; }
/// <summary>
/// 查看箱唛配置
/// </summary>
public ICommand LookBoxConfigureCommand { get; set; } public ICommand LookBoxConfigureCommand { get; set; }
/// <summary> /// <summary>
/// 待配置 /已配置 /// 待配置 /已配置
@ -575,7 +616,7 @@ namespace BBWY.Client.ViewModels.PackTask
public ICommand CompletedPackTaskCommand { get; set; } public ICommand CompletedPackTaskCommand { get; set; }
public ICommand SetTaskStatusCommand { get; set; }
/// <summary> /// <summary>
/// 打开图片链接 /// 打开图片链接
/// </summary> /// </summary>
@ -714,36 +755,31 @@ namespace BBWY.Client.ViewModels.PackTask
} }
public void SetTaskStatus(object obj)
{
var objList = (object[])obj;
long taskId = (long)objList[0];
string orderId = (string)objList[1];
///修改完成
var model = packTaskService.UpdateTaskStatus(taskId, 1, orderId);
if (model != null && model.Success)
SearchTaskList();
}
public void SetTaskState(TaskState? taskState) public void SetTaskState(TaskState? taskState)
{ {
PageIndex = 1;
TaskState = taskState; TaskState = taskState;
SearchTaskList(); if (PageIndex == 1)
SearchTaskList();
else
PageIndex = 1;
} }
private bool IsStartThread = false; private bool IsStartThread = false;
private Thread qualityOverTimeThread = null; private Thread qualityOverTimeThread = null;
private Thread packOverTimeThread = null; private Thread packOverTimeThread = null;
private Thread sealboxOverTimeThread = null; private Thread sealboxOverTimeThread = null;
private Thread fallwareOverTimeThread = null;
private Thread waitTransportOverTimeThread = null;
/// <summary> /// <summary>
/// 搜索任务列表 /// 搜索任务列表
/// </summary> /// </summary>
public void SearchTaskList() public void SearchTaskList()
{ {
PageSize = 10;
IsStartThread = false; IsStartThread = false;
long? taskId = null; long? taskId = null;
try try
@ -757,12 +793,42 @@ namespace BBWY.Client.ViewModels.PackTask
} }
IsLoading = true; IsLoading = true;
if (TaskState == Models.TaskState.)
if (TaskState == Models.TaskState.)
{ {
Task.Factory.StartNew(() => Task.Factory.StartNew(() =>
{ {
OverTimeTaskList = new ObservableCollection< OverTimeTaskResponse>(); WaitCompletedList = new ObservableCollection<WareWaitCompleted>();
var datas = packTaskService.SearchOverTimeTaskList(null, StartTime,EndTime,OverTimeTaskState,PageIndex,PageSize); var datas = sealBoxService.GetWareWaitCompletedList(null, PageIndex, PageSize);
if (datas != null && datas.Data != null && datas.Success)
{
var dataModel = datas.Data;
OrderCount = dataModel.TotalCount;
foreach (var item in dataModel.WareWaitCompleteds)
{
App.Current.Dispatcher.BeginInvoke(new Action(() =>
{
WaitCompletedList.Add(item);
}));
}
}
else
{
if (datas != null) System.Windows.MessageBox.Show(datas.Msg);
}
IsLoadCount();
IsLoading = false;
});
}
else if (TaskState == Models.TaskState.)
{
PageSize = 20;
Task.Factory.StartNew(() =>
{
OverTimeTaskList = new ObservableCollection<OverTimeTaskResponse>();
var datas = packTaskService.SearchOverTimeTaskList(null, StartTime, EndTime, OverTimeTaskState, PageIndex, PageSize);
if (datas != null && datas.Data != null && datas.Success) if (datas != null && datas.Data != null && datas.Success)
{ {
var dataModel = datas.Data; var dataModel = datas.Data;
@ -796,19 +862,19 @@ namespace BBWY.Client.ViewModels.PackTask
OrderCount = dataModel.TotalCount; OrderCount = dataModel.TotalCount;
foreach (var item in dataModel.WareWaitTransports) foreach (var item in dataModel.WareWaitTransports)
{ {
App.Current.Dispatcher.BeginInvoke(new Action(() => App.Current.Dispatcher.Invoke(new Action(() =>
{ {
WaitTransportList.Add(item); WaitTransportList.Add(item);
})); }));
} }
Thread.Sleep(500);
var sealboxTasks = WaitTransportList.Where(p => p.TransportOverTime != null).ToList(); var sealboxTasks = WaitTransportList.Where(p => p.TransportOverTime != null).ToList();
if (sealboxTasks.Count() > 0 && TaskState == Models.TaskState.) if (sealboxTasks.Count() > 0 && TaskState == Models.TaskState.)
{ {
sealboxOverTimeThread = new Thread(() => waitTransportOverTimeThread = new Thread(() =>
{ {
IsStartThread = true; IsStartThread = true;
while (IsStartThread) while (IsStartThread)
@ -836,8 +902,8 @@ namespace BBWY.Client.ViewModels.PackTask
}); });
//任务倒计时数据 //任务倒计时数据
sealboxOverTimeThread.IsBackground = true; waitTransportOverTimeThread.IsBackground = true;
sealboxOverTimeThread.Start(); waitTransportOverTimeThread.Start();
} }
@ -880,11 +946,54 @@ namespace BBWY.Client.ViewModels.PackTask
BoxConfigureData = item.BoxConfigureData, BoxConfigureData = item.BoxConfigureData,
ProductCount = item.ProductCount, ProductCount = item.ProductCount,
WareType = item.WareType, WareType = item.WareType,
SetPurchaseOrderOverTime=item.SetPurchaseOrderOverTime
}); });
})); }));
} }
var fallWareTasks = WaitFallWareList.Where(p => p.SetPurchaseOrderOverTime != null).ToList();
if (fallWareTasks.Count() > 0 && TaskState == Models.TaskState. && SealBoxConfigureType == SealBoxConfigureType.)
{
//if (packOverTimeThread!=null)
//{
// packOverTimeThread.Abort();
//}
fallwareOverTimeThread = new Thread(() =>
{
IsStartThread = true;
while (IsStartThread)
{
App.Current.Dispatcher.BeginInvoke(new Action(() =>
{
foreach (var item in fallWareTasks)
{
var datetime = item.SetPurchaseOrderOverTime.Value.Subtract(DateTime.Now);
if (datetime.TotalMilliseconds > 0)
{
item.IsFallWareOverTime = false;
item.FallWareRemainTime = $"{datetime.Hours}小时{datetime.Minutes}分";
}
else
{
item.IsFallWareOverTime = true;
item.FallWareRemainTime = datetime.Days == 0 ? $"{-datetime.Hours}小时{-datetime.Minutes}分" : $"{-datetime.Days}天{-datetime.Hours}小时{-datetime.Minutes}分";
}
}
}));
Thread.Sleep(1000);
}
});
//任务倒计时数据
fallwareOverTimeThread.IsBackground = true;
fallwareOverTimeThread.Start();
}
} }
else else
{ {
@ -913,7 +1022,7 @@ namespace BBWY.Client.ViewModels.PackTask
foreach (var item in dataModel.WaitSealBoxModels) foreach (var item in dataModel.WaitSealBoxModels)
{ {
App.Current.Dispatcher.BeginInvoke(new Action(() => App.Current.Dispatcher.Invoke(new Action(() =>
{ {
WaitSealBoxModels.Add(new SealBoxModel WaitSealBoxModels.Add(new SealBoxModel
{ {
@ -935,7 +1044,7 @@ namespace BBWY.Client.ViewModels.PackTask
})); }));
} }
Thread.Sleep(500);
var sealboxTasks = WaitSealBoxModels.Where(p => p.SealBoxPackOverTime != null).ToList(); var sealboxTasks = WaitSealBoxModels.Where(p => p.SealBoxPackOverTime != null).ToList();
if (sealboxTasks.Count() > 0 && TaskState == Models.TaskState.) if (sealboxTasks.Count() > 0 && TaskState == Models.TaskState.)
{ {
@ -1028,7 +1137,7 @@ namespace BBWY.Client.ViewModels.PackTask
PackTaskList = new ObservableCollection<PackTaskModel>();//初始化数据 PackTaskList = new ObservableCollection<PackTaskModel>();//初始化数据
var datas = packTaskService.GetWareHouseList(SearchWayBillNo, SearchExpressName, IsWorry, SearchDepartment, SearchSkuId, SearchTaskId, this.TaskState, SearchShopName, var datas = packTaskService.GetWareHouseList(SearchWayBillNo, SearchExpressName, SearchDepartment, SearchSkuId, SearchTaskId, this.TaskState, SearchShopName,
PageIndex, PageSize); PageIndex, PageSize);
if (datas != null && datas.Data != null && datas.Success) if (datas != null && datas.Data != null && datas.Success)
{ {
@ -1122,99 +1231,104 @@ namespace BBWY.Client.ViewModels.PackTask
data.PackUser = string.Join("\r\n", item.PackUserName); data.PackUser = string.Join("\r\n", item.PackUserName);
} }
App.Current.Dispatcher.BeginInvoke(new Action(() => App.Current.Dispatcher.Invoke(new Action(() =>
{ {
PackTaskList.Add(data); PackTaskList.Add(data);
})); }));
} }
Thread.Sleep(500);
//任务状态为待验收
var packtasks = PackTaskList.Where(p => p.TaskState == Models.TaskState. && p.QualityCompletionOverTime != null).ToList();
if (packtasks.Count() > 0 && TaskState == Models.TaskState.)
{
//if (qualityOverTimeThread!=null)
//{
// qualityOverTimeThread.Abort();
//}
if (TaskState == Models.TaskState.)
{
qualityOverTimeThread = new Thread(() => qualityOverTimeThread = new Thread(() =>
{ {
IsStartThread = true;
while (IsStartThread) var packtasks = PackTaskList.Where(p => p.TaskState == Models.TaskState. && p.QualityCompletionOverTime != null).ToList();
if (packtasks.Count() > 0)
{ {
App.Current.Dispatcher.BeginInvoke(new Action(() => IsStartThread = true;
while (IsStartThread)
{ {
foreach (var item in packtasks) App.Current.Dispatcher.BeginInvoke(new Action(() =>
{ {
var datetime = item.QualityCompletionOverTime.Value.Subtract(DateTime.Now); foreach (var item in packtasks)
if (datetime.TotalMilliseconds > 0)
{ {
item.IsQualityOverTime = false; var datetime = item.QualityCompletionOverTime.Value.Subtract(DateTime.Now);
//item.QualityRemainTime = $"{datetime.Days}天{datetime.Hours}小时{datetime.Minutes}分{datetime.Seconds}秒"; item.QualityRemainTime = OverTimeHelper.GetTimeString(datetime);
item.QualityRemainTime = $"{datetime.Days}天{datetime.Hours}小时{datetime.Minutes}分"; if (datetime.TotalMilliseconds > 0)
} {
else item.IsQualityOverTime = false;
{
item.IsQualityOverTime = true;
//item.QualityRemainTime = $"{-datetime.Days}天{-datetime.Hours}小时{-datetime.Minutes}分{-datetime.Seconds}秒";
item.QualityRemainTime = $"{-datetime.Days}天{-datetime.Hours}小时{-datetime.Minutes}分";
}
} }
})); else
Thread.Sleep(1000); {
item.IsQualityOverTime = true;
}
}
}));
Thread.Sleep(1000);
}
} }
}); });
//任务倒计时数据 //任务倒计时数据
qualityOverTimeThread.IsBackground = true; qualityOverTimeThread.IsBackground = true;
qualityOverTimeThread.Start(); qualityOverTimeThread.Start();
//任务状态为待验收
} }
var packCompletedTasks = PackTaskList.Where(p => p.TaskState == Models.TaskState. && p.PackCompletionOverTime != null).ToList(); if (TaskState == Models.TaskState.)
if (packCompletedTasks.Count() > 0 && TaskState == Models.TaskState.)
{ {
//if (packOverTimeThread!=null) var packCompletedTasks = PackTaskList.Where(p => p.TaskState == Models.TaskState. && p.PackCompletionOverTime != null).ToList();
//{ if (packCompletedTasks.Count() > 0)
// packOverTimeThread.Abort();
//}
packOverTimeThread = new Thread(() =>
{ {
IsStartThread = true; //if (packOverTimeThread!=null)
while (IsStartThread) //{
// packOverTimeThread.Abort();
//}
packOverTimeThread = new Thread(() =>
{ {
App.Current.Dispatcher.BeginInvoke(new Action(() => IsStartThread = true;
while (IsStartThread)
{ {
foreach (var item in packCompletedTasks) App.Current.Dispatcher.BeginInvoke(new Action(() =>
{ {
var datetime = item.PackCompletionOverTime.Value.Subtract(DateTime.Now); foreach (var item in packCompletedTasks)
if (datetime.TotalMilliseconds > 0)
{
item.IsPackOverTime = false;
item.PackRemainTime = $"{datetime.Days}天{datetime.Hours}小时{datetime.Minutes}分";
}
else
{ {
item.IsPackOverTime = true; var datetime = item.PackCompletionOverTime.Value.Subtract(DateTime.Now);
item.PackRemainTime = $"{-datetime.Days}天{-datetime.Hours}小时{-datetime.Minutes}分"; if (datetime.TotalMilliseconds > 0)
} {
item.IsPackOverTime = false;
item.PackRemainTime = datetime.Days == 0 ? $"{datetime.Hours}小时{datetime.Minutes}分" : $"{datetime.Days}天{datetime.Hours}小时{datetime.Minutes}分";
}
else
{
item.IsPackOverTime = true;
item.PackRemainTime = datetime.Days == 0 ? $"{-datetime.Hours}小时{-datetime.Minutes}分" : $"{-datetime.Days}天{-datetime.Hours}小时{-datetime.Minutes}分";
}
} }
})); }));
Thread.Sleep(1000); Thread.Sleep(1000);
} }
}); });
//任务倒计时数据 //任务倒计时数据
packOverTimeThread.IsBackground = true; packOverTimeThread.IsBackground = true;
packOverTimeThread.Start(); packOverTimeThread.Start();
}
} }
//任务状态为待打包 //任务状态为待打包

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

@ -119,10 +119,32 @@ namespace BBWY.Client.Views.FallWare
MessageBox.Show("采购单号不能为空"); MessageBox.Show("采购单号不能为空");
return; return;
} }
if (wareType == WareType. )
{
if (!JDWareBoxModel.PurchaseOrder.ToUpper().StartsWith("CPL"))
{
MessageBox.Show("CLPS采购单号必须以CPL开头");
return;
}
var number = JDWareBoxModel.PurchaseOrder.ToUpper().Substring(3);
var result = long.TryParse(number, out long res);
if (!result||number.Length!=13)
{
MessageBox.Show("CLPS采购单号必须以CPL开头,且后面为13位数字");
return;
}
}
Task.Factory.StartNew(() => Task.Factory.StartNew(() =>
{ {
var res = sealBoxService.SetFallWareConfigure(JDWareBoxModel.SealBoxId, JDWareBoxModel.ProductTitle, JDWareBoxModel.PurchaseOrder, JDWareBoxModel.PrewOrder, JDWareBoxModel.WaybillNo, null, null); var res = sealBoxService.SetFallWareConfigure(JDWareBoxModel.SealBoxId, JDWareBoxModel.ProductTitle, JDWareBoxModel.PurchaseOrder.ToUpper(), JDWareBoxModel.PrewOrder, JDWareBoxModel.WaybillNo, null, null);
if (!res.Success) if (!res.Success)
{ {
IsLoading = false; IsLoading = false;
@ -132,6 +154,7 @@ namespace BBWY.Client.Views.FallWare
IsLoading = false; IsLoading = false;
this.Dispatcher.Invoke(() => this.Dispatcher.Invoke(() =>
{ {
reflashWindow?.Invoke(); reflashWindow?.Invoke();
this.Close(); this.Close();
}); });

27
BBWY.Client/Views/FallWare/WaitFallWareControl.xaml

@ -36,14 +36,16 @@
<ColumnDefinition Width="400"/> <ColumnDefinition Width="400"/>
<ColumnDefinition Width="80"/> <ColumnDefinition Width="80"/>
<ColumnDefinition Width="110"/> <ColumnDefinition Width="110"/>
<ColumnDefinition Width="{Binding DataContext.SealBoxConfigureType,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}},Converter={StaticResource objConverter},ConverterParameter=待配置:150:0}"/>
<ColumnDefinition MinWidth="80"/> <ColumnDefinition MinWidth="80"/>
<ColumnDefinition Width="100"/> <ColumnDefinition Width="100"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Text="商品信息" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="商品信息" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="数量" Grid.Column="1" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="数量" Grid.Column="1" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="落仓材料" Grid.Column="2" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="落仓材料" Grid.Column="2" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text=" " Grid.Column="3" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="任务时间" Grid.Column="3" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="操作" Grid.Column="4" 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="Left" Background="{StaticResource Border.Brush}"/>-->
<Border Width="1" HorizontalAlignment="Right" 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="1"/>
@ -122,6 +124,7 @@
<ColumnDefinition Width="400"/> <ColumnDefinition Width="400"/>
<ColumnDefinition Width="80"/> <ColumnDefinition Width="80"/>
<ColumnDefinition Width="110"/> <ColumnDefinition Width="110"/>
<ColumnDefinition Width="{Binding DataContext.SealBoxConfigureType,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}},Converter={StaticResource objConverter},ConverterParameter=待配置:150:0}"/>
<ColumnDefinition MinWidth="80"/> <ColumnDefinition MinWidth="80"/>
<ColumnDefinition Width="100"/> <ColumnDefinition Width="100"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
@ -265,10 +268,30 @@
</StackPanel> </StackPanel>
</Grid> </Grid>
<Grid Grid.Column="3" > <Grid Grid.Column="3" >
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center"
Visibility="{Binding FallWareRemainTime,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
>
<StackPanel Margin="10,5" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center"
Visibility="{Binding IsFallWareOverTime,Converter={StaticResource objConverter},ConverterParameter=false:Visible:Collapsed}"
>
<TextBlock Text="剩余: " />
<TextBlock Text="{Binding FallWareRemainTime}"/>
</StackPanel>
<StackPanel Margin="10,5" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center"
Visibility="{Binding IsFallWareOverTime,Converter={StaticResource objConverter},ConverterParameter=true:Visible:Collapsed}"
>
<TextBlock Foreground="Red" Text="超时: "/>
<TextBlock Foreground="Red" Text="{Binding FallWareRemainTime}"/>
</StackPanel>
</StackPanel>
</Grid> </Grid>
<Grid Grid.Column="4" > <Grid Grid.Column="4" >
</Grid>
<Grid Grid.Column="5" >
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center"> <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">

79
BBWY.Client/Views/PackTask/ServiceWindow.xaml

@ -520,68 +520,49 @@
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
<ColumnDefinition MinWidth="100"/> <ColumnDefinition MinWidth="100"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<ListBox x:Name="listbox_orerSku" ItemsSource="{Binding ItemList}" <Grid Width="{Binding ActualWidth,ElementName=listbox_orerSku}">
Style="{StaticResource NoScrollViewListBoxStyle}" <Grid.ColumnDefinitions>
ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}" > <ColumnDefinition Width="90"/>
<ListBox.ItemTemplate> <ColumnDefinition/>
<DataTemplate>
<Grid Width="{Binding ActualWidth,ElementName=listbox_orerSku}"> </Grid.ColumnDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="90"/> <!--{Binding Logo}-->
<ColumnDefinition/> <c:BAsyncImage UrlSource="{Binding ItemList[0].Logo}"
</Grid.ColumnDefinitions>
<!--{Binding Logo}-->
<c:BAsyncImage UrlSource="{Binding Logo}"
Width="80" DecodePixelWidth="80" Width="80" DecodePixelWidth="80"
VerticalAlignment="Top" Margin="11,9,0,10" VerticalAlignment="Top" Margin="11,9,0,10"
Cursor="Hand"> Cursor="Hand">
<b:Interaction.Triggers>
<b:EventTrigger EventName="PreviewMouseLeftButtonDown"> </c:BAsyncImage>
<b:InvokeCommandAction Command="{Binding DataContext.OpenSkuDetailCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}">
<b:InvokeCommandAction.CommandParameter> <StackPanel Grid.Column="1" Orientation="Vertical" Margin="8,9,0,10">
<MultiBinding Converter="{StaticResource mptConverter}"> <TextBlock Foreground="{StaticResource Text.Gray}" TextWrapping="Wrap">
<Binding Path="DataContext.Id" RelativeSource="{RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox},AncestorLevel=1}"/> <TextBlock.ToolTip>
<Binding Path="Id"/> <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
</MultiBinding> <TextBlock Text="{Binding ItemList[0].SkuName}"/>
</b:InvokeCommandAction.CommandParameter> </ToolTip>
</b:InvokeCommandAction> </TextBlock.ToolTip>
</b:EventTrigger>
</b:Interaction.Triggers>
</c:BAsyncImage>
<StackPanel Grid.Column="1" Orientation="Vertical" Margin="8,12,0,10">
<TextBlock Foreground="{StaticResource Text.Gray}" TextWrapping="Wrap">
<TextBlock.ToolTip>
<ToolTip Style="{StaticResource OrderCouponToolipStyle}">
<TextBlock Text="{Binding SkuName}"/>
</ToolTip>
</TextBlock.ToolTip>
<Run Text="SKU名称:"/> <Run Text="SKU名称:"/>
<Run Text="{Binding SkuName}"/> <Run Text="{Binding ItemList[0].SkuName}"/>
</TextBlock> </TextBlock>
<TextBlock Foreground="{StaticResource Text.Gray}" TextWrapping="Wrap" Margin="0,11"> <TextBlock Foreground="{StaticResource Text.Gray}" TextWrapping="Wrap" Margin="0,11">
<Run Text="品名:"/> <Run Text="品名:"/>
<Run Text="{Binding BrandName}"/> <Run Text="{Binding ItemList[0].BrandName}"/>
</TextBlock> </TextBlock>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBlock Text="店铺:"/> <TextBlock Text="店铺:"/>
<c:BButton Content="{Binding ShopName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center" <c:BButton Content="{Binding ShopName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
CommandParameter="{Binding ShopName}" CommandParameter="{Binding ShopName}"
Margin=" 5,0,7,0"/> Margin=" 5,0,7,0"/>
</StackPanel> </StackPanel>
</StackPanel>
</StackPanel> </Grid>
</Grid>
</DataTemplate>
</ListBox.ItemTemplate>
</ListBox>
<Grid Grid.Column="1" > <Grid Grid.Column="1" >
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center"> <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">

301
BBWY.Client/Views/PackTask/ShopWaitCompletedControl.xaml

@ -0,0 +1,301 @@
<UserControl x:Class="BBWY.Client.Views.PackTask.ShopWaitCompletedControl"
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.PackTask"
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 TaskList,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="0"/>
<ColumnDefinition MinWidth="80"/>
<ColumnDefinition Width="0"/>
</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 WaitCompletedList}"
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="80"/>
<ColumnDefinition Width="0"/>
<ColumnDefinition MinWidth="80"/>
<ColumnDefinition Width="100"/>
</Grid.ColumnDefinitions>
<StackPanel Orientation="Horizontal" Grid.Column="0" Grid.ColumnSpan="11">
<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 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="部门:" 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="0"/>
<ColumnDefinition MinWidth="80"/>
<ColumnDefinition Width="0"/>
</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="5" >
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<c:BButton Grid.Column="11" HorizontalAlignment="Stretch" Style="{StaticResource LinkButton}" VerticalAlignment="Center" Content="完成"
Command="{Binding DataContext.CompeteWaitCompletedCommand,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/PackTask/ShopWaitCompletedControl.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.PackTask
{
/// <summary>
/// ShopWaitCompletedControl.xaml 的交互逻辑
/// </summary>
public partial class ShopWaitCompletedControl : UserControl
{
public ShopWaitCompletedControl()
{
InitializeComponent();
}
}
}

17
BBWY.Client/Views/PackTask/ShopWaitPackageControl.xaml

@ -31,7 +31,7 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="350"/> <ColumnDefinition Width="300"/>
<ColumnDefinition Width="80"/> <ColumnDefinition Width="80"/>
<ColumnDefinition Width="140"/> <ColumnDefinition Width="140"/>
<ColumnDefinition MinWidth="100"/> <ColumnDefinition MinWidth="100"/>
@ -92,7 +92,7 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid Background="#F2F2F2" > <Grid Background="#F2F2F2" >
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="350"/> <ColumnDefinition Width="300"/>
<ColumnDefinition Width="80"/> <ColumnDefinition Width="80"/>
<ColumnDefinition Width="140"/> <ColumnDefinition Width="140"/>
<ColumnDefinition MinWidth="100"/> <ColumnDefinition MinWidth="100"/>
@ -149,7 +149,7 @@
</Grid> </Grid>
<Grid Grid.Row="1"> <Grid Grid.Row="1">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="350"/> <ColumnDefinition Width="300"/>
<ColumnDefinition Width="80"/> <ColumnDefinition Width="80"/>
<ColumnDefinition Width="140"/> <ColumnDefinition Width="140"/>
<ColumnDefinition MinWidth="100"/> <ColumnDefinition MinWidth="100"/>
@ -167,8 +167,8 @@
<Grid Width="{Binding ActualWidth,ElementName=listbox_orerSku}"> <Grid Width="{Binding ActualWidth,ElementName=listbox_orerSku}">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="90"/> <ColumnDefinition Width="90"/>
<ColumnDefinition/> <ColumnDefinition />
<ColumnDefinition/> <!--<ColumnDefinition />-->
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<!--{Binding Logo}--> <!--{Binding Logo}-->
@ -189,6 +189,7 @@
</b:Interaction.Triggers> </b:Interaction.Triggers>
</c:BAsyncImage> </c:BAsyncImage>
<StackPanel Grid.Column="1" Orientation="Vertical" Margin="8,12,0,10"> <StackPanel Grid.Column="1" Orientation="Vertical" Margin="8,12,0,10">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
@ -196,7 +197,7 @@
<c:BButton Content="{Binding SkuId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center" <c:BButton Content="{Binding SkuId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
CommandParameter="{Binding SkuId}" CommandParameter="{Binding SkuId}"
Margin=" 5,0,7,11"/> Margin=" 5,0,0,11"/>
</StackPanel> </StackPanel>
<TextBlock Foreground="{StaticResource Text.Gray}" TextTrimming="CharacterEllipsis"> <TextBlock Foreground="{StaticResource Text.Gray}" TextTrimming="CharacterEllipsis">
@ -217,7 +218,7 @@
</StackPanel> </StackPanel>
<StackPanel Grid.Column="2" Orientation="Horizontal" Margin="20,12,0,5"> <!--<StackPanel Grid.Column="2" Orientation="Horizontal" Margin="0,12,0,5">
<TextBlock Foreground="{StaticResource Text.Gray}"> <TextBlock Foreground="{StaticResource Text.Gray}">
<Run Text="货号:" /> <Run Text="货号:" />
</TextBlock> </TextBlock>
@ -225,7 +226,7 @@
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
CommandParameter="{Binding GoodsNo}" CommandParameter="{Binding GoodsNo}"
Margin=" 5,0,0,0"/> Margin=" 5,0,0,0"/>
</StackPanel> </StackPanel>-->
</Grid> </Grid>
</DataTemplate> </DataTemplate>
</ListBox.ItemTemplate> </ListBox.ItemTemplate>

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

@ -169,7 +169,7 @@
<Grid Grid.Row="2" Margin="0,5,0,0"> <Grid Grid.Row="2" Margin="0,5,0,0">
<local:TaskListControl x:Name="listbox_task" <local:TaskListControl x:Name="listbox_task"
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待封箱|待落仓|待验收|待打包:Collapsed:Visible}" Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待封箱|待落仓|待验收|待打包|待出库:Collapsed:Visible}"
/> />
@ -180,6 +180,8 @@
<waitquality:ShopWaitQualityControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收:Visible:Collapsed}" /> <waitquality:ShopWaitQualityControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收:Visible:Collapsed}" />
<local:ShopWaitPackageControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待打包:Visible:Collapsed}" /> <local:ShopWaitPackageControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待打包:Visible:Collapsed}" />
<local:ShopWaitCompletedControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待出库:Visible:Collapsed}" />
</Grid> </Grid>
<c:PageControl PageIndex="{Binding PageIndex}" <c:PageControl PageIndex="{Binding PageIndex}"

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

@ -32,7 +32,7 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="350"/> <ColumnDefinition Width="300"/>
<ColumnDefinition Width="80"/> <ColumnDefinition Width="80"/>
<ColumnDefinition Width="100"/> <ColumnDefinition Width="100"/>
<ColumnDefinition Width="100"/> <ColumnDefinition Width="100"/>
@ -88,7 +88,7 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid Background="#F2F2F2" > <Grid Background="#F2F2F2" >
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="350"/> <ColumnDefinition Width="300"/>
<ColumnDefinition Width="80"/> <ColumnDefinition Width="80"/>
<ColumnDefinition Width="100"/> <ColumnDefinition Width="100"/>
<ColumnDefinition Width="100"/> <ColumnDefinition Width="100"/>
@ -127,7 +127,7 @@
</Grid> </Grid>
<Grid Grid.Row="1"> <Grid Grid.Row="1">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="350"/> <ColumnDefinition Width="300"/>
<ColumnDefinition Width="80"/> <ColumnDefinition Width="80"/>
<ColumnDefinition Width="100"/> <ColumnDefinition Width="100"/>
<ColumnDefinition Width="100"/> <ColumnDefinition Width="100"/>
@ -140,15 +140,15 @@
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<!--ItemsSource="{Binding ItemList}"--> <!--ItemsSource="{Binding ItemList}"-->
<ListBox x:Name="listbox_orerSku" ItemsSource="{Binding ItemList}" <ListBox x:Name="listbox_orerSku" ItemsSource="{Binding ItemList}"
Style="{StaticResource NoScrollViewListBoxStyle}" Style="{StaticResource NoScrollViewListBoxStyle}" BorderThickness="0"
ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}" > ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}" >
<ListBox.ItemTemplate> <ListBox.ItemTemplate>
<DataTemplate> <DataTemplate>
<Grid Width="{Binding ActualWidth,ElementName=listbox_orerSku}"> <Grid Width="{Binding ActualWidth,ElementName=listbox_orerSku}">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="90"/> <ColumnDefinition Width="90"/>
<ColumnDefinition/> <ColumnDefinition />
<ColumnDefinition/> <!--<ColumnDefinition />-->
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<!--{Binding Logo}--> <!--{Binding Logo}-->
@ -177,7 +177,7 @@
<c:BButton Content="{Binding SkuId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center" <c:BButton Content="{Binding SkuId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
CommandParameter="{Binding SkuId}" CommandParameter="{Binding SkuId}"
Margin=" 5,0,7,11"/> Margin=" 5,0,0,11"/>
</StackPanel> </StackPanel>
<TextBlock Foreground="{StaticResource Text.Gray}" TextTrimming="CharacterEllipsis"> <TextBlock Foreground="{StaticResource Text.Gray}" TextTrimming="CharacterEllipsis">
@ -198,7 +198,7 @@
</StackPanel> </StackPanel>
<!--<StackPanel Grid.Column="2" Orientation="Horizontal" Margin="20,12,0,5"> <!--<StackPanel Grid.Column="2" Orientation="Horizontal" Margin="0,12,0,5">
<TextBlock Foreground="{StaticResource Text.Gray}"> <TextBlock Foreground="{StaticResource Text.Gray}">
<Run Text="货号:" /> <Run Text="货号:" />
</TextBlock> </TextBlock>

301
BBWY.Client/Views/PackTask/WaitCompletedControl.xaml

@ -0,0 +1,301 @@
<UserControl x:Class="BBWY.Client.Views.PackTask.WaitCompletedControl"
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.PackTask"
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="0"/>
<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 WaitCompletedList}"
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="80"/>
<ColumnDefinition Width="0"/>
<ColumnDefinition MinWidth="80"/>
<ColumnDefinition Width="100"/>
</Grid.ColumnDefinitions>
<StackPanel Orientation="Horizontal" Grid.Column="0" Grid.ColumnSpan="11">
<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 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="部门:" 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="0"/>
<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="5" >
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<c:BButton Grid.Column="11" HorizontalAlignment="Stretch" Style="{StaticResource LinkButton}" VerticalAlignment="Center" Content="完成"
Command="{Binding DataContext.CompeteWaitCompletedCommand,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/PackTask/WaitCompletedControl.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.PackTask
{
/// <summary>
/// UserControl.xaml 的交互逻辑
/// </summary>
public partial class WaitCompletedControl : UserControl
{
public WaitCompletedControl()
{
InitializeComponent();
}
}
}

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

@ -33,7 +33,7 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="350"/> <ColumnDefinition Width="300"/>
<ColumnDefinition Width="80"/> <ColumnDefinition Width="80"/>
<ColumnDefinition Width="100"/> <ColumnDefinition Width="100"/>
<ColumnDefinition MinWidth="100"/> <ColumnDefinition MinWidth="100"/>
@ -93,7 +93,7 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid Background="#F2F2F2" > <Grid Background="#F2F2F2" >
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="350"/> <ColumnDefinition Width="300"/>
<ColumnDefinition Width="80"/> <ColumnDefinition Width="80"/>
<ColumnDefinition Width="100"/> <ColumnDefinition Width="100"/>
<ColumnDefinition MinWidth="100"/> <ColumnDefinition MinWidth="100"/>
@ -162,7 +162,7 @@
</Grid> </Grid>
<Grid Grid.Row="1"> <Grid Grid.Row="1">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="350"/> <ColumnDefinition Width="300"/>
<ColumnDefinition Width="80"/> <ColumnDefinition Width="80"/>
<ColumnDefinition Width="100"/> <ColumnDefinition Width="100"/>
<ColumnDefinition MinWidth="100"/> <ColumnDefinition MinWidth="100"/>
@ -182,8 +182,8 @@
<Grid Width="{Binding ActualWidth,ElementName=listbox_orerSku}"> <Grid Width="{Binding ActualWidth,ElementName=listbox_orerSku}">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="90"/> <ColumnDefinition Width="90"/>
<ColumnDefinition/> <ColumnDefinition />
<ColumnDefinition/> <!--<ColumnDefinition />-->
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<!--{Binding Logo}--> <!--{Binding Logo}-->
@ -212,7 +212,7 @@
<c:BButton Content="{Binding SkuId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center" <c:BButton Content="{Binding SkuId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
CommandParameter="{Binding SkuId}" CommandParameter="{Binding SkuId}"
Margin=" 5,0,7,11"/> Margin=" 5,0,0,11"/>
</StackPanel> </StackPanel>
<TextBlock Foreground="{StaticResource Text.Gray}" TextTrimming="CharacterEllipsis"> <TextBlock Foreground="{StaticResource Text.Gray}" TextTrimming="CharacterEllipsis">
@ -233,7 +233,7 @@
</StackPanel> </StackPanel>
<StackPanel Grid.Column="2" Orientation="Horizontal" Margin="20,12,0,5"> <!--<StackPanel Grid.Column="2" Orientation="Horizontal" Margin="0,12,0,5">
<TextBlock Foreground="{StaticResource Text.Gray}"> <TextBlock Foreground="{StaticResource Text.Gray}">
<Run Text="货号:" /> <Run Text="货号:" />
</TextBlock> </TextBlock>
@ -241,7 +241,7 @@
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
CommandParameter="{Binding GoodsNo}" CommandParameter="{Binding GoodsNo}"
Margin=" 5,0,0,0"/> Margin=" 5,0,0,0"/>
</StackPanel> </StackPanel>-->
</Grid> </Grid>
</DataTemplate> </DataTemplate>
</ListBox.ItemTemplate> </ListBox.ItemTemplate>
@ -473,25 +473,6 @@
</StackPanel> </StackPanel>
<c:BButton Grid.Column="11" HorizontalAlignment="Stretch" Style="{StaticResource LinkButton}" Margin="0 5 0 5 " VerticalAlignment="Center" Content="完成"
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待出库:Visible:Collapsed}"
>
<b:Interaction.Triggers>
<b:EventTrigger EventName="PreviewMouseLeftButtonDown">
<b:InvokeCommandAction Command="{Binding DataContext.SetTaskStatusCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}">
<b:InvokeCommandAction.CommandParameter>
<MultiBinding Converter="{StaticResource mptConverter}">
<Binding Path="TaskId" />
<Binding Path="OrderId"/>
</MultiBinding>
</b:InvokeCommandAction.CommandParameter>
</b:InvokeCommandAction>
</b:EventTrigger>
</b:Interaction.Triggers>
</c:BButton>
<Grid Margin="0 5 0 5 " <Grid Margin="0 5 0 5 "
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=未到货|部分到货:Visible:Collapsed}" Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=未到货|部分到货:Visible:Collapsed}"
> >

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

@ -205,12 +205,13 @@
<Grid Grid.Row="2" Margin="0,5,0,0"> <Grid Grid.Row="2" Margin="0,5,0,0">
<fallware:WareFallWareListControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待落仓:Visible:Collapsed}" /> <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}" /> <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}" /> <local:WaitPackageControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待打包:Visible:Collapsed}" />
<waittransport:WareWaitTransportListControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待转运:Visible:Collapsed}" /> <waittransport:WareWaitTransportListControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待转运:Visible:Collapsed}" />
<taskovertime:WareTaskOverTimeControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=已超时:Visible:Collapsed}" /> <taskovertime:WareTaskOverTimeControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=已超时:Visible:Collapsed}" />
<local:WaitCompletedControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待出库:Visible:Collapsed}" />
</Grid> </Grid>
<c:PageControl PageIndex="{Binding PageIndex,Mode=TwoWay}" <c:PageControl PageIndex="{Binding PageIndex,Mode=TwoWay}"

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

@ -31,7 +31,7 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="350"/> <ColumnDefinition Width="300"/>
<ColumnDefinition Width="90"/> <ColumnDefinition Width="90"/>
<ColumnDefinition Width="100"/> <ColumnDefinition Width="100"/>
<ColumnDefinition MinWidth="100"/> <ColumnDefinition MinWidth="100"/>
@ -88,7 +88,7 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid Background="#F2F2F2" > <Grid Background="#F2F2F2" >
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="350"/> <ColumnDefinition Width="300"/>
<ColumnDefinition Width="90"/> <ColumnDefinition Width="90"/>
<ColumnDefinition Width="100"/> <ColumnDefinition Width="100"/>
<ColumnDefinition MinWidth="100"/> <ColumnDefinition MinWidth="100"/>
@ -98,7 +98,6 @@
<ColumnDefinition Width="100"/> <ColumnDefinition Width="100"/>
<ColumnDefinition Width="100"/> <ColumnDefinition Width="100"/>
<ColumnDefinition Width="120"/> <ColumnDefinition Width="120"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<StackPanel Orientation="Horizontal" Grid.Column="0" Grid.ColumnSpan="11"> <StackPanel Orientation="Horizontal" Grid.Column="0" Grid.ColumnSpan="11">
<TextBlock VerticalAlignment="Center" Text="提交时间:" Margin="14,0,0,0" /> <TextBlock VerticalAlignment="Center" Text="提交时间:" Margin="14,0,0,0" />
@ -109,7 +108,7 @@
CommandParameter="{Binding TaskId}" CommandParameter="{Binding TaskId}"
Margin=" 5,0,7,0"/> Margin=" 5,0,7,0"/>
<Label Width="90" Height="25" HorizontalAlignment="Center" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" VerticalAlignment="Center" Content="{Binding TaskState}" <Label Width="90" Height="25" HorizontalAlignment="Center" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" VerticalAlignment="Center" Content="{Binding TaskState}"
Foreground="White" Background="{Binding TaskState,Converter={StaticResource enumToColorConverter} , ConverterParameter={x:Type cmodel:TaskState} }" Margin="20,0,0,0" Foreground="White" Background="{Binding TaskState,Converter={StaticResource enumToColorConverter} , ConverterParameter={x:Type cmodel:TaskState} }" Margin="25,0,0,0"
Visibility="{Binding DataContext.TaskState,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}},Converter={StaticResource objConverter},ConverterParameter=#null:Visible:Collapsed}" Visibility="{Binding DataContext.TaskState,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}},Converter={StaticResource objConverter},ConverterParameter=#null:Visible:Collapsed}"
/> />
@ -130,26 +129,8 @@
</StackPanel> </StackPanel>
<!--<StackPanel Orientation="Horizontal" Visibility="{Binding QualityRemainTime, Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}">
<TextBlock Foreground="Red" VerticalAlignment="Center" Text="{Binding QualityRemainTime}" Margin="20,0,0,0" />
</StackPanel>-->
</StackPanel> </StackPanel>
<!--<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}"
/>
</StackPanel>-->
<StackPanel Grid.Column="9" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center" <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}"
> >
@ -161,7 +142,7 @@
</Grid> </Grid>
<Grid Grid.Row="1"> <Grid Grid.Row="1">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="350"/> <ColumnDefinition Width="300"/>
<ColumnDefinition Width="90"/> <ColumnDefinition Width="90"/>
<ColumnDefinition Width="100"/> <ColumnDefinition Width="100"/>
<ColumnDefinition MinWidth="100"/> <ColumnDefinition MinWidth="100"/>
@ -180,8 +161,8 @@
<Grid Width="{Binding ActualWidth,ElementName=listbox_orerSku}"> <Grid Width="{Binding ActualWidth,ElementName=listbox_orerSku}">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="90"/> <ColumnDefinition Width="90"/>
<ColumnDefinition/> <ColumnDefinition />
<ColumnDefinition/> <!--<ColumnDefinition />-->
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<!--{Binding Logo}--> <!--{Binding Logo}-->
@ -210,7 +191,7 @@
<c:BButton Content="{Binding SkuId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center" <c:BButton Content="{Binding SkuId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
CommandParameter="{Binding SkuId}" CommandParameter="{Binding SkuId}"
Margin=" 5,0,7,11"/> Margin=" 5,0,0,11"/>
</StackPanel> </StackPanel>
<TextBlock Foreground="{StaticResource Text.Gray}" TextTrimming="CharacterEllipsis"> <TextBlock Foreground="{StaticResource Text.Gray}" TextTrimming="CharacterEllipsis">
@ -231,7 +212,7 @@
</StackPanel> </StackPanel>
<StackPanel Grid.Column="2" Orientation="Horizontal" Margin="20,12,0,5"> <!--<StackPanel Grid.Column="2" Orientation="Horizontal" Margin="0,12,0,5">
<TextBlock Foreground="{StaticResource Text.Gray}"> <TextBlock Foreground="{StaticResource Text.Gray}">
<Run Text="货号:" /> <Run Text="货号:" />
</TextBlock> </TextBlock>
@ -239,7 +220,7 @@
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
CommandParameter="{Binding GoodsNo}" CommandParameter="{Binding GoodsNo}"
Margin=" 5,0,0,0"/> Margin=" 5,0,0,0"/>
</StackPanel> </StackPanel>-->
</Grid> </Grid>
</DataTemplate> </DataTemplate>
</ListBox.ItemTemplate> </ListBox.ItemTemplate>
@ -344,69 +325,7 @@
</ListBox.ItemTemplate> </ListBox.ItemTemplate>
</ListBox> </ListBox>
</Grid> </Grid>
<!--<Grid Grid.Column="7" >
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<StackPanel Margin="10,5" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left" >
<TextBlock Text="条形码:"/>
<StackPanel Orientation="Horizontal" Visibility="{Binding BarCodeModel,Converter={StaticResource objConverter}, ConverterParameter=#null:Collapsed:Visible}">
<c:BButton x:Name="btn_lookBarCode" Content="查看" Style="{StaticResource LinkButton}" Margin="5,0,0,0"
Command="{Binding LookBarCommand}" />
<c:BButton x:Name="btn_daCer" Content="打印" Style="{StaticResource LinkButton}" Margin="5,0,0,0"
Command="{Binding PrintBarcodeCommand}"/>
</StackPanel>
<TextBlock Text="未配置" Style="{StaticResource middleTextBlock}" Margin="5,0,0,0"
Visibility="{Binding BarCodeModel,Converter={StaticResource objConverter}, ConverterParameter=#null:Visible:Collapsed}"
/>
</StackPanel>
<StackPanel Margin="10,5" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left" >
<TextBlock Text="合格证:"/>
<StackPanel Orientation="Horizontal"
Visibility="{Binding CertificateModel,Converter={StaticResource objConverter}, ConverterParameter=#null:Collapsed:Visible}"
>
<StackPanel Orientation="Horizontal"
Visibility="{Binding CertificatePosition,Converter={StaticResource objConverter}, ConverterParameter=无需合格证:Collapsed:Visible}"
>
<c:BButton x:Name="btn_lookCer" Content="查看" Style="{StaticResource LinkButton}" Margin="5,0,0,0"
Command="{Binding LookCerCommand}"/>
<c:BButton x:Name="btn_dayinCer" Content="打印" Style="{StaticResource LinkButton}" Margin="5,0,0,0"
Command="{Binding PrintCerCommand}"/>
</StackPanel>
<TextBlock Text="无需合格证" Style="{StaticResource middleTextBlock}" Margin="5,0,0,0"
Visibility="{Binding CertificatePosition,Converter={StaticResource objConverter}, ConverterParameter=无需合格证:Visible:Collapsed}"
/>
</StackPanel>
<TextBlock Text="未配置" Style="{StaticResource middleTextBlock}" Margin="5,0,0,0"
Visibility="{Binding CertificateModel,Converter={StaticResource objConverter}, ConverterParameter=#null:Visible:Collapsed}"
/>
</StackPanel>
</StackPanel>
</StackPanel>
</Grid>
<Grid Grid.Column="8" >
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock
Text="{Binding CertificatePosition}"
TextWrapping="Wrap"
HorizontalAlignment="Center"
/>
</StackPanel>
</Grid>-->
<Grid Grid.Column="6" > <Grid Grid.Column="6" >
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center"> <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock <TextBlock
@ -421,11 +340,8 @@
<Grid Grid.Column="7"> <Grid Grid.Column="7">
<Grid> <Grid>
<Grid.RowDefinitions>
<RowDefinition Height="*"/> <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center"
<RowDefinition Height="30"/>
</Grid.RowDefinitions>
<StackPanel Margin="20,0,0,0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left"
Visibility="{Binding IsShowFees,Converter={StaticResource objConverter},ConverterParameter=true:Visible:Collapsed}" Visibility="{Binding IsShowFees,Converter={StaticResource objConverter},ConverterParameter=true:Visible:Collapsed}"
> >
<TextBlock Text="收费:"/> <TextBlock Text="收费:"/>
@ -451,21 +367,7 @@
</StackPanel> </StackPanel>
<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"
>
<c:BButton HorizontalAlignment="Center" Height="20" Style="{StaticResource LinkButton}" VerticalAlignment="Center" Grid.Row="1" Content="设置"
Command="{Binding SetServiceCommand}"
Visibility="Visible" />
</StackPanel>
</Grid>
</Grid> </Grid>
</Grid> </Grid>
<Grid Grid.Column="8" > <Grid Grid.Column="8" >
@ -499,22 +401,7 @@
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="完成"
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待出库:Visible:Collapsed}"
>
<b:Interaction.Triggers>
<b:EventTrigger EventName="PreviewMouseLeftButtonDown">
<b:InvokeCommandAction Command="{Binding DataContext.SetTaskStatusCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}">
<b:InvokeCommandAction.CommandParameter>
<MultiBinding Converter="{StaticResource mptConverter}">
<Binding Path="TaskId" />
<Binding Path="OrderId"/>
</MultiBinding>
</b:InvokeCommandAction.CommandParameter>
</b:InvokeCommandAction>
</b:EventTrigger>
</b:Interaction.Triggers>
</c:BButton>
<Grid Margin="0 5 0 5 " <Grid Margin="0 5 0 5 "
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=未到货|部分到货:Visible:Collapsed}" Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=未到货|部分到货:Visible:Collapsed}"
> >

17
BBWY.Client/Views/QualityTask/ShopWaitQualityControl.xaml

@ -31,7 +31,7 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="350"/> <ColumnDefinition Width="300"/>
<ColumnDefinition Width="80"/> <ColumnDefinition Width="80"/>
<ColumnDefinition Width="140"/> <ColumnDefinition Width="140"/>
<ColumnDefinition MinWidth="100"/> <ColumnDefinition MinWidth="100"/>
@ -90,7 +90,7 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid Background="#F2F2F2" > <Grid Background="#F2F2F2" >
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="350"/> <ColumnDefinition Width="300"/>
<ColumnDefinition Width="80"/> <ColumnDefinition Width="80"/>
<ColumnDefinition Width="140"/> <ColumnDefinition Width="140"/>
<ColumnDefinition MinWidth="100"/> <ColumnDefinition MinWidth="100"/>
@ -147,7 +147,7 @@
</Grid> </Grid>
<Grid Grid.Row="1"> <Grid Grid.Row="1">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="350"/> <ColumnDefinition Width="300"/>
<ColumnDefinition Width="80"/> <ColumnDefinition Width="80"/>
<ColumnDefinition Width="140"/> <ColumnDefinition Width="140"/>
<ColumnDefinition MinWidth="100"/> <ColumnDefinition MinWidth="100"/>
@ -165,8 +165,8 @@
<Grid Width="{Binding ActualWidth,ElementName=listbox_orerSku}"> <Grid Width="{Binding ActualWidth,ElementName=listbox_orerSku}">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="90"/> <ColumnDefinition Width="90"/>
<ColumnDefinition/> <ColumnDefinition />
<ColumnDefinition/> <!--<ColumnDefinition />-->
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<!--{Binding Logo}--> <!--{Binding Logo}-->
@ -187,6 +187,7 @@
</b:Interaction.Triggers> </b:Interaction.Triggers>
</c:BAsyncImage> </c:BAsyncImage>
<StackPanel Grid.Column="1" Orientation="Vertical" Margin="8,12,0,10"> <StackPanel Grid.Column="1" Orientation="Vertical" Margin="8,12,0,10">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
@ -194,7 +195,7 @@
<c:BButton Content="{Binding SkuId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center" <c:BButton Content="{Binding SkuId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
CommandParameter="{Binding SkuId}" CommandParameter="{Binding SkuId}"
Margin=" 5,0,7,11"/> Margin=" 5,0,0,11"/>
</StackPanel> </StackPanel>
<TextBlock Foreground="{StaticResource Text.Gray}" TextTrimming="CharacterEllipsis"> <TextBlock Foreground="{StaticResource Text.Gray}" TextTrimming="CharacterEllipsis">
@ -215,7 +216,7 @@
</StackPanel> </StackPanel>
<StackPanel Grid.Column="2" Orientation="Horizontal" Margin="20,12,0,5"> <!--<StackPanel Grid.Column="2" Orientation="Horizontal" Margin="0,12,0,5">
<TextBlock Foreground="{StaticResource Text.Gray}"> <TextBlock Foreground="{StaticResource Text.Gray}">
<Run Text="货号:" /> <Run Text="货号:" />
</TextBlock> </TextBlock>
@ -223,7 +224,7 @@
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
CommandParameter="{Binding GoodsNo}" CommandParameter="{Binding GoodsNo}"
Margin=" 5,0,0,0"/> Margin=" 5,0,0,0"/>
</StackPanel> </StackPanel>-->
</Grid> </Grid>
</DataTemplate> </DataTemplate>
</ListBox.ItemTemplate> </ListBox.ItemTemplate>

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

@ -31,7 +31,7 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="350"/> <ColumnDefinition Width="300"/>
<ColumnDefinition Width="80"/> <ColumnDefinition Width="80"/>
<ColumnDefinition Width="140"/> <ColumnDefinition Width="140"/>
<ColumnDefinition MinWidth="100"/> <ColumnDefinition MinWidth="100"/>
@ -90,7 +90,7 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid Background="#F2F2F2" > <Grid Background="#F2F2F2" >
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="350"/> <ColumnDefinition Width="300"/>
<ColumnDefinition Width="80"/> <ColumnDefinition Width="80"/>
<ColumnDefinition Width="140"/> <ColumnDefinition Width="140"/>
<ColumnDefinition MinWidth="100"/> <ColumnDefinition MinWidth="100"/>
@ -154,7 +154,7 @@
</Grid> </Grid>
<Grid Grid.Row="1"> <Grid Grid.Row="1">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="350"/> <ColumnDefinition Width="300"/>
<ColumnDefinition Width="80"/> <ColumnDefinition Width="80"/>
<ColumnDefinition Width="140"/> <ColumnDefinition Width="140"/>
<ColumnDefinition MinWidth="100"/> <ColumnDefinition MinWidth="100"/>
@ -172,8 +172,8 @@
<Grid Width="{Binding ActualWidth,ElementName=listbox_orerSku}"> <Grid Width="{Binding ActualWidth,ElementName=listbox_orerSku}">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="90"/> <ColumnDefinition Width="90"/>
<ColumnDefinition/> <ColumnDefinition />
<ColumnDefinition/> <!--<ColumnDefinition />-->
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<!--{Binding Logo}--> <!--{Binding Logo}-->
@ -194,6 +194,7 @@
</b:Interaction.Triggers> </b:Interaction.Triggers>
</c:BAsyncImage> </c:BAsyncImage>
<StackPanel Grid.Column="1" Orientation="Vertical" Margin="8,12,0,10"> <StackPanel Grid.Column="1" Orientation="Vertical" Margin="8,12,0,10">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
@ -201,7 +202,7 @@
<c:BButton Content="{Binding SkuId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center" <c:BButton Content="{Binding SkuId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
CommandParameter="{Binding SkuId}" CommandParameter="{Binding SkuId}"
Margin=" 5,0,7,11"/> Margin=" 5,0,0,11"/>
</StackPanel> </StackPanel>
<TextBlock Foreground="{StaticResource Text.Gray}" TextTrimming="CharacterEllipsis"> <TextBlock Foreground="{StaticResource Text.Gray}" TextTrimming="CharacterEllipsis">
@ -219,10 +220,10 @@
</TextBlock> </TextBlock>
</StackPanel> </StackPanel>
<StackPanel Grid.Column="2" Orientation="Horizontal" Margin="20,12,0,5"> <!--<StackPanel Grid.Column="2" Orientation="Horizontal" Margin="0,12,0,5">
<TextBlock Foreground="{StaticResource Text.Gray}"> <TextBlock Foreground="{StaticResource Text.Gray}">
<Run Text="货号:" /> <Run Text="货号:" />
</TextBlock> </TextBlock>
@ -230,7 +231,7 @@
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
CommandParameter="{Binding GoodsNo}" CommandParameter="{Binding GoodsNo}"
Margin=" 5,0,0,0"/> Margin=" 5,0,0,0"/>
</StackPanel> </StackPanel>-->
</Grid> </Grid>
</DataTemplate> </DataTemplate>
</ListBox.ItemTemplate> </ListBox.ItemTemplate>
@ -503,22 +504,7 @@
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="完成"
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待出库:Visible:Collapsed}"
>
<b:Interaction.Triggers>
<b:EventTrigger EventName="PreviewMouseLeftButtonDown">
<b:InvokeCommandAction Command="{Binding DataContext.SetTaskStatusCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}">
<b:InvokeCommandAction.CommandParameter>
<MultiBinding Converter="{StaticResource mptConverter}">
<Binding Path="TaskId" />
<Binding Path="OrderId"/>
</MultiBinding>
</b:InvokeCommandAction.CommandParameter>
</b:InvokeCommandAction>
</b:EventTrigger>
</b:Interaction.Triggers>
</c:BButton>
<Grid Margin="0 5 0 5 " <Grid Margin="0 5 0 5 "
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=未到货|部分到货:Visible:Collapsed}" Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=未到货|部分到货:Visible:Collapsed}"
> >

49
BBWY.Client/Views/TaskOverTime/WareTaskOverTimeControl.xaml

@ -16,8 +16,7 @@
> >
<Grid> <Grid>
<c:RoundWaitProgress Play="{Binding IsLoading}" Panel.ZIndex="999"/> <Grid >
<Grid Margin="5,0">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="50"/> <RowDefinition Height="50"/>
<RowDefinition Height="*"/> <RowDefinition Height="*"/>
@ -35,7 +34,7 @@
<TextBlock Text="任务类型:" VerticalAlignment="Center" Margin="10,0,0,0"/> <TextBlock Text="任务类型:" VerticalAlignment="Center" Margin="10,0,0,0"/>
<Border BorderBrush="{StaticResource Border.Brush}" BorderThickness="1" Height="30" CornerRadius="0"> <Border BorderBrush="{StaticResource Border.Brush}" BorderThickness="1" Height="30" CornerRadius="0">
<ComboBox BorderThickness="0" Width="140" Height="30" Text="{Binding OverTimeTaskState}" ItemsSource="{Binding OverTimeTaskTypeList}"> <ComboBox BorderThickness="0" Width="140" Height="30" ItemsSource="{Binding OverTimeTaskTypeList}" Text="{Binding OverTimeTaskState,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
<ComboBox.Resources> <ComboBox.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
@ -66,8 +65,9 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="154"/> <ColumnDefinition Width="150"/>
<ColumnDefinition Width="204"/> <ColumnDefinition Width="150"/>
<ColumnDefinition Width="150"/>
<ColumnDefinition Width="150"/> <ColumnDefinition Width="150"/>
<ColumnDefinition Width="260"/> <ColumnDefinition Width="260"/>
<ColumnDefinition Width="150"/> <ColumnDefinition Width="150"/>
@ -76,9 +76,10 @@
<TextBlock Text="日期" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="日期" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="任务信息" Grid.Column="1" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="任务信息" Grid.Column="1" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="任务类型" Grid.Column="2" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="任务类型" Grid.Column="2" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="任务人" Grid.Column="3" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="任务状态" Grid.Column="3" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="超时时间" Grid.Column="4" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="任务人" Grid.Column="4" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="备注" Grid.Column="5" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="超时时间" Grid.Column="5" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="备注" Grid.Column="6" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}"/> <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}"/>
<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="1"/> <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="1"/>
@ -109,40 +110,50 @@
MinHeight="30"> MinHeight="30">
<Grid > <Grid >
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="154"/> <ColumnDefinition Width="150"/>
<ColumnDefinition Width="204"/> <ColumnDefinition Width="150"/>
<ColumnDefinition Width="150"/>
<ColumnDefinition Width="150"/> <ColumnDefinition Width="150"/>
<ColumnDefinition Width="260"/> <ColumnDefinition Width="260"/>
<ColumnDefinition Width="150"/> <ColumnDefinition Width="150"/>
<ColumnDefinition /> <ColumnDefinition />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Grid Grid.Column="0" > <Grid Grid.Column="0" VerticalAlignment="Center">
<StackPanel> <StackPanel>
<TextBlock Text="{Binding OverTimeDate}" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="{Binding OverTimeDate,StringFormat=yyyy-MM-dd}" Style="{StaticResource middleTextBlock}"/>
</StackPanel>
</Grid>
<Grid Grid.Column="1" VerticalAlignment="Center">
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
<TextBlock Text="{Binding TaskMessageType,StringFormat=\{0\}:}" Style="{StaticResource middleTextBlock}"/>
<c:BButton Content="{Binding Id}" Style="{StaticResource LinkButton}"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
CommandParameter="{Binding Id}"
/>
</StackPanel> </StackPanel>
</Grid> </Grid>
<Grid Grid.Column="1" > <Grid Grid.Column="2" VerticalAlignment="Center">
<StackPanel> <StackPanel>
<TextBlock Text="{Binding TaskMessage}" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="{Binding OverTimeTaskType}" Style="{StaticResource middleTextBlock}"/>
</StackPanel> </StackPanel>
</Grid> </Grid>
<Grid Grid.Column="2" > <Grid Grid.Column="3" VerticalAlignment="Center">
<StackPanel> <StackPanel>
<TextBlock Text="{Binding TaskState}" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="{Binding TaskState}" Style="{StaticResource middleTextBlock}"/>
</StackPanel> </StackPanel>
</Grid> </Grid>
<Grid Grid.Column="3" > <Grid Grid.Column="4" VerticalAlignment="Center">
<StackPanel> <StackPanel>
<TextBlock Text="{Binding TaskUserName}" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="{Binding TaskUserName}" Style="{StaticResource middleTextBlock}"/>
</StackPanel> </StackPanel>
</Grid> </Grid>
<Grid Grid.Column="4" > <Grid Grid.Column="5" VerticalAlignment="Center">
<StackPanel> <StackPanel>
<TextBlock Text="{Binding OverTime}" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="{Binding OverTime}" Style="{StaticResource middleTextBlock}"/>
</StackPanel> </StackPanel>
</Grid> </Grid>
<Grid Grid.Column="5" > <Grid Grid.Column="6" VerticalAlignment="Center">
<StackPanel> <StackPanel>
<TextBlock Text="{Binding RemarkMessage}" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="{Binding RemarkMessage}" Style="{StaticResource middleTextBlock}"/>
</StackPanel> </StackPanel>

Loading…
Cancel
Save