Browse Source

Merge remote-tracking branch 'origin/update'

AddValidOverTime
506583276@qq.com 2 years ago
parent
commit
1ca2197555
  1. 173
      BBWY.Client/Models/APIModel/Response/PackTask/PackTaskResultResponse.cs
  2. 5
      BBWY.Client/Models/APIModel/Response/PackTask/ProductSkuCountsResponse.cs
  3. 36
      BBWY.Client/Models/APIModel/Response/PackTask/SearchTaskListResponse.cs
  4. 17
      BBWY.Client/Models/Enums.cs
  5. 27
      BBWY.Client/Models/PackTask/PackTaskModel.cs
  6. 56
      BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs
  7. 5
      BBWY.Client/ViewModels/PackTask/UpdatePurchaseTaskViewModel.cs
  8. 137
      BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
  9. 10
      BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs
  10. 34
      BBWY.Client/Views/PackTask/ShopWaitPackageControl.xaml
  11. 6
      BBWY.Client/Views/PackTask/TaskList.xaml
  12. 54
      BBWY.Client/Views/PackTask/WaitPackageControl.xaml
  13. 6
      BBWY.Client/Views/PackTask/WareHouseList.xaml
  14. 26
      BBWY.Client/Views/PackTask/WareHouseListControl.xaml
  15. 9
      BBWY.Client/Views/QualityTask/WaitQualityControl.xaml
  16. 4
      BBWY.Client/Views/TaskOverTime/SubmitOverTimeMarkMsgWindow.xaml.cs

173
BBWY.Client/Models/APIModel/Response/PackTask/PackTaskResultResponse.cs

@ -1,173 +0,0 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Windows.Automation.Peers;
using WebSocketSharp;
namespace BBWY.Client.Models.APIModel.Response.PackTask
{
//public class PackTaskResultResponse
//{
// /// <summary>
// /// 查询总数据(判断总页数)
// /// </summary>
// public int TotalCount { get; set; }
// /// <summary>
// /// 页面返回的数据
// /// </summary>
// public GetPackTaskDTO[] Items { get; set; }
//}
//public class GetPackTaskDTO
//{
// /// <summary>
// /// SKU标题
// /// </summary>
// public string SkuName { get; set; }
// /// <summary>
// /// 图片链接
// /// </summary>
// public string Logo { get; set; }
// /// <summary>
// /// 任务id
// /// </summary>
// public long TaskId { get; set; }
// /// <summary>
// /// 需求方创建日期
// /// </summary>
// public DateTime CreateTime { get; set; }
// /// <summary>
// /// 任务状态(未完成=0,已完成=1,)
// /// </summary>
// public int TaskStatus { get; set; }
// /// <summary>
// /// 需求方团队
// /// </summary>
// public string DepartmentName { get; set; }
// /// <summary>
// /// 需求方店铺
// /// </summary>
// public string ShopName { get; set; }
// /// <summary>
// /// 货号
// /// </summary>
// public string ProductItemNum { get; set; }
// /// <summary>
// /// 货号品名
// /// </summary>
// public string BrandName { get; set; }
// /// <summary>
// /// 对接人
// /// </summary>
// public string UserName { get; set; }
// /// <summary>
// /// 打包人
// /// </summary>
// public string[] PackUserName { get; set; }
// /// <summary>
// /// skuid
// /// </summary>
// public string SkuId { get; set; }
// /// <summary>
// /// sku数量
// /// </summary>
// public int SkuCount { get; set; }
// /// <summary>
// /// 打包类型(单件=0,多件=1)
// /// </summary>
// public int PackType { get; set; }
// /// <summary>
// /// 落仓(商家仓=0,云仓=1,京仓=2,3=聚水潭)
// /// </summary>
// public int PositionType { get; set; }
// /// <summary>
// /// 基础包装(快递袋=0,纸箱=1,麻袋=2)
// /// </summary>
// public int BasicPack { get; set; }
// /// <summary>
// /// 增量1()
// /// </summary>
// public string Increment1 { get; set; }
// /// <summary>
// /// 工序道数
// /// </summary>
// public int? ProcessCount { get; set; }
// /// <summary>
// /// 到货情况(待收货=0,部分收货=1,已到货=2)
// /// </summary>
// public int Availability { get; set; }
// //todo: 条形码数据 合格证数据
// ///// <summary>
// ///// 打包费用
// ///// </summary>
// //public FeesItemTypeDTO FeesItemTypeDTO { get; set; }
// /// <summary>
// ///
// /// </summary>
// public FeesItemResponse FeesItemResponse { get; set; }
// /// <summary>
// /// 合格证位置(外部包装=0,产品包装=1)
// /// </summary>
// public int? CertificatePosition { get; set; }
// /// <summary>
// /// 箱子耗材(自带=0,4-13号纸箱=1-10,)
// /// </summary>
// public int? BoxConsumables { get; set; }
// /// <summary>
// /// sku配件名称
// /// </summary>
// public string SkuGoodsTitle { get; set; }
// /// <summary>
// /// 配件数
// /// </summary>
// public int GoodsNumber { get; set; }
// /// <summary>
// /// 气泡纸耗材(长=0,宽=1)
// /// </summary>
// public int? AirConsumables { get; set; }
// /// <summary>
// /// 注意事项(对接备注)
// /// </summary>
// public string MarkMessage { get; set; }
// public BarCodeModel BarCodeDTO { get; set; }
// public CertificateModel[] cers { get; set; }
// /// <summary>
// /// 是否加急
// /// </summary>
// public int IsWorry { get; set; }
// /// <summary>
// /// 品牌
// /// </summary>
// public string Brand { get; set; }
// public string OrderId { get; set; }
//}
}

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

@ -52,5 +52,10 @@ namespace BBWY.Client.Models.APIModel.Response.PackTask
/// 待转运 /// 待转运
/// </summary> /// </summary>
public int? WaitTransportCount { get; set; } public int? WaitTransportCount { get; set; }
/// <summary>
/// 待排单
/// </summary>
public int? WaitScheduleCount { get; set; }
} }
} }

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

@ -105,10 +105,10 @@ namespace BBWY.Client.Models.APIModel
public string Increment1 { get; set; } public string Increment1 { get; set; }
/// <summary> ///// <summary>
/// 到货情况(待收货=0,部分收货=1,已到货=2) ///// 到货情况(待收货=0,部分收货=1,已到货=2)
/// </summary> ///// </summary>
public int Availability { get; set; } //public int Availability { get; set; }
/// <summary> /// <summary>
@ -134,10 +134,10 @@ namespace BBWY.Client.Models.APIModel
public int GoodsNumber { get; set; } public int GoodsNumber { get; set; }
/// <summary> ///// <summary>
/// 注意事项(对接备注) ///// 注意事项(对接备注)
/// </summary> ///// </summary>
public string MarkMessage { get; set; } //public string MarkMessage { get; set; }
/// <summary> /// <summary>
@ -151,10 +151,10 @@ namespace BBWY.Client.Models.APIModel
public CertificateModel[] Cers { get; set; } public CertificateModel[] Cers { get; set; }
/// <summary> ///// <summary>
/// 品牌 ///// 品牌
/// </summary> ///// </summary>
public string Brand { get; set; } //public string Brand { get; set; }
public string OrderId { get; set; } public string OrderId { get; set; }
@ -188,9 +188,6 @@ namespace BBWY.Client.Models.APIModel
/// 打包超时备注信息 /// 打包超时备注信息
/// </summary> /// </summary>
public string PackOverTimeMarkMsg { get; set; } public string PackOverTimeMarkMsg { get; set; }
/// <summary> /// <summary>
/// 备注消息列表 /// 备注消息列表
/// </summary> /// </summary>
@ -199,6 +196,15 @@ namespace BBWY.Client.Models.APIModel
/// 采购方案 /// 采购方案
/// </summary> /// </summary>
public string SkuPurchaseSchemeId { get; set; } public string SkuPurchaseSchemeId { get; set; }
/// <summary>
/// 排单超时备注信息
/// </summary>
public string ScheduleOverTimeMarkMsg { get; set; }
/// <summary>
/// 排单超时时间
/// </summary>
public DateTime? ScheduleOverTime { get; set; }
} }
public class ExpressOrderResponse public class ExpressOrderResponse
{ {

17
BBWY.Client/Models/Enums.cs

@ -216,18 +216,7 @@
= 2, = 2,
} }
/////// <summary>
/////// 快递到货情况
/////// </summary>
//public enum TaskState
//{
// 已到货 = 0,
// 部分到货 = 1,
// 未到货 = 2,
// 已完成 = 3,
// 全部 = 4,
// 加急 = 5
//}
/// <summary> /// <summary>
/// 仓库打包任务状态 /// 仓库打包任务状态
/// </summary> /// </summary>
@ -245,7 +234,8 @@
//待完结 = 9, //待完结 = 9,
= 10, = 10,
=11, =11,
=12 =12,
=13,
} }
@ -528,6 +518,7 @@
= 4, = 4,
= 8, = 8,
= 11, = 11,
=13,
} }
/// <summary> /// <summary>

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

@ -45,14 +45,14 @@ namespace BBWY.Client.Models
{ {
if (!this.SkuPurchaseSchemeId.IsNullOrEmpty()) if (!this.SkuPurchaseSchemeId.IsNullOrEmpty())//B端有采购方案
{ {
UpdatePurchaseTaskWindow updatePurchaseWindow = new UpdatePurchaseTaskWindow(this,ReflashTask); UpdatePurchaseTaskWindow updatePurchaseWindow = new UpdatePurchaseTaskWindow(this,ReflashTask);
updatePurchaseWindow.ShowDialog(); updatePurchaseWindow.ShowDialog();
return; return;
} }
if (!OrderId.IsNullOrEmpty()&& SkuPurchaseSchemeId.IsNullOrEmpty())//B端手动添加合格证 if (!OrderId.IsNullOrEmpty()&& SkuPurchaseSchemeId.IsNullOrEmpty())//B端无采购方案 ,手动添加合格证
{ {
PublishTaskWindow publishB = new PublishTaskWindow(ReflashTask, this,SaveType.B端); PublishTaskWindow publishB = new PublishTaskWindow(ReflashTask, this,SaveType.B端);
publishB.ShowDialog(); publishB.ShowDialog();
@ -396,6 +396,23 @@ namespace BBWY.Client.Models
private bool isPackOverTime; private bool isPackOverTime;
public bool IsPackOverTime { get => isPackOverTime; set { Set(ref isPackOverTime, value); } } public bool IsPackOverTime { get => isPackOverTime; set { Set(ref isPackOverTime, value); } }
private bool isScheduleOverTime;
public bool IsScheduleOverTime { get => isScheduleOverTime; set { Set(ref isScheduleOverTime, value); } }
private string scheduleRemainTime;
/// <summary>
/// 打包剩余时间
/// </summary>
public string ScheduleRemainTime { get => scheduleRemainTime; set { Set(ref scheduleRemainTime, value); } }
/// <summary>
/// 排单超时备注信息
/// </summary>
public string ScheduleOverTimeMarkMsg { get; set; }
/// <summary> /// <summary>
/// 物流信息 /// 物流信息
/// </summary> /// </summary>
@ -436,6 +453,12 @@ namespace BBWY.Client.Models
/// </summary> /// </summary>
public string SkuPurchaseSchemeId { get; set; } public string SkuPurchaseSchemeId { get; set; }
/// <summary>
/// 排单超时时间
/// </summary>
public DateTime? ScheduleOverTime { get; set; }
} }
public class SkuMessage : NotifyObject public class SkuMessage : NotifyObject

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

@ -186,6 +186,13 @@ 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 string waitScheduleCount;
/// <summary>
/// 待排单任务数
/// </summary>
public string WaitScheduleCount { get => waitScheduleCount; set { Set(ref waitScheduleCount, value); } }
private string waitPackCount; private string waitPackCount;
/// <summary> /// <summary>
/// 待打包任务数 /// 待打包任务数
@ -412,6 +419,7 @@ namespace BBWY.Client.ViewModels.PackTask
WaitSealBoxCount = packTaskResult.Data.WaitSealBox?.ToString(); WaitSealBoxCount = packTaskResult.Data.WaitSealBox?.ToString();
WaitFallWareCount = packTaskResult.Data.WaitFallWareCount?.ToString(); WaitFallWareCount = packTaskResult.Data.WaitFallWareCount?.ToString();
WaitCompleted = packTaskResult.Data.WaitCompleted?.ToString(); WaitCompleted = packTaskResult.Data.WaitCompleted?.ToString();
WaitScheduleCount = packTaskResult.Data.WaitScheduleCount?.ToString();
})); }));
} }
} }
@ -508,6 +516,7 @@ namespace BBWY.Client.ViewModels.PackTask
private Thread packOverTimeThread = null; private Thread packOverTimeThread = null;
private Thread sealboxOverTimeThread = null; private Thread sealboxOverTimeThread = null;
private Thread fallwareOverTimeThread = null; private Thread fallwareOverTimeThread = null;
private Thread scheduleOverTimeThread = null;
/// <summary> /// <summary>
/// 搜索任务列表 /// 搜索任务列表
/// </summary> /// </summary>
@ -547,10 +556,8 @@ namespace BBWY.Client.ViewModels.PackTask
var data = new PackTaskModel() var data = new PackTaskModel()
{ {
Brand = item.Brand,
SkuId = item.SkuId, SkuId = item.SkuId,
AcceptName = item.UserName, AcceptName = item.UserName,
Availability = (Availability)item.Availability,
BasicPack = (BasicPack)item.BasicPack, BasicPack = (BasicPack)item.BasicPack,
DepartmentName = item.DepartmentName, DepartmentName = item.DepartmentName,
CertificatePosition = (CertificatePosition)item.CertificatePosition, CertificatePosition = (CertificatePosition)item.CertificatePosition,
@ -580,6 +587,8 @@ namespace BBWY.Client.ViewModels.PackTask
PackCompletionOverTime = item.PackCompletionOverTime, PackCompletionOverTime = item.PackCompletionOverTime,
ShopName = item.ShopName, ShopName = item.ShopName,
SkuPurchaseSchemeId = item.SkuPurchaseSchemeId, SkuPurchaseSchemeId = item.SkuPurchaseSchemeId,
ScheduleOverTimeMarkMsg = item.ScheduleOverTimeMarkMsg,
ScheduleOverTime = item.ScheduleOverTime
}; };
if (!item.OrderId.IsNullOrEmpty() && !item.SkuId.IsNullOrEmpty())//加载物流信息 if (!item.OrderId.IsNullOrEmpty() && !item.SkuId.IsNullOrEmpty())//加载物流信息
@ -722,7 +731,50 @@ namespace BBWY.Client.ViewModels.PackTask
} }
} }
if (TaskState == Models.TaskState.)
{
var packCompletedTasks = PackTaskList.Where(p => p.TaskState == Models.TaskState. && p.ScheduleOverTime != null).ToList();
if (packCompletedTasks.Count() > 0)
{
//if (packOverTimeThread!=null)
//{
// packOverTimeThread.Abort();
//}
scheduleOverTimeThread = new Thread(() =>
{
IsStartThread = true;
while (IsStartThread)
{
App.Current.Dispatcher.BeginInvoke(new Action(() =>
{
foreach (var item in packCompletedTasks)
{
var datetime = item.ScheduleOverTime.Value.Subtract(DateTime.Now);
if (datetime.TotalMilliseconds > 0)
{
item.IsScheduleOverTime = false;
item.ScheduleRemainTime = OverTimeHelper.GetTimeString(datetime);
}
else
{
item.IsScheduleOverTime = true;
item.ScheduleRemainTime = OverTimeHelper.GetTimeString(datetime);
}
}
}));
Thread.Sleep(1000);
}
});
//任务倒计时数据
scheduleOverTimeThread.IsBackground = true;
scheduleOverTimeThread.Start();
}
}
} }

5
BBWY.Client/ViewModels/PackTask/UpdatePurchaseTaskViewModel.cs

@ -487,7 +487,7 @@ namespace BBWY.Client.ViewModels.PackTask
OriginShopName = obj.ShopName; OriginShopName = obj.ShopName;
SkuId =obj.SkuId; SkuId = obj.SkuId;
OrderId = obj.OrderId; OrderId = obj.OrderId;
var shopList = globalContext.User.ShopList; var shopList = globalContext.User.ShopList;
@ -552,7 +552,8 @@ namespace BBWY.Client.ViewModels.PackTask
foreach (var item in productSku.Data.PurchaseSkus) foreach (var item in productSku.Data.PurchaseSkus)
{ {
var list = purchaseService.GetPurchaseSkuBasicInfo(item.PurchaseProductId); var list = purchaseService.GetPurchaseSkuBasicInfo(item.PurchaseProductId);
if (list == null) continue; if (list == null ||!list.Success|| list.Data == null)
continue;
var skuItem = list.Data.ItemList.FirstOrDefault(f => f.PurchaseSkuId == item.PurchaseSkuId); var skuItem = list.Data.ItemList.FirstOrDefault(f => f.PurchaseSkuId == item.PurchaseSkuId);
if (skuItem == null) if (skuItem == null)
{ {

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

@ -199,7 +199,7 @@ 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., OverTimeTaskType., OverTimeTaskType.
}; };
/// <summary> /// <summary>
///超时任务类型 ///超时任务类型
@ -409,6 +409,13 @@ namespace BBWY.Client.ViewModels.PackTask
private string waitScheduleCount;
/// <summary>
/// 待排单任务数
/// </summary>
public string WaitScheduleCount { get => waitScheduleCount; set { Set(ref waitScheduleCount, value); } }
private string waitPackCount; private string waitPackCount;
/// <summary> /// <summary>
/// 待打包任务数 /// 待打包任务数
@ -582,6 +589,9 @@ namespace BBWY.Client.ViewModels.PackTask
case Models.TaskState.: case Models.TaskState.:
overTimeTaskType = Models.OverTimeTaskType.; overTimeTaskType = Models.OverTimeTaskType.;
break; break;
case Models.TaskState.:
overTimeTaskType = Models.OverTimeTaskType.;
break;
case Models.TaskState.: case Models.TaskState.:
overTimeTaskType = Models.OverTimeTaskType.; overTimeTaskType = Models.OverTimeTaskType.;
break; break;
@ -1064,6 +1074,14 @@ namespace BBWY.Client.ViewModels.PackTask
System.Windows.MessageBox.Show("该任务采购单未进行发货,请联系业务进行发货后在确认收货", "提示"); System.Windows.MessageBox.Show("该任务采购单未进行发货,请联系业务进行发货后在确认收货", "提示");
return; return;
} }
}
if (System.Windows.MessageBox.Show("是否确认收货?", "提示",
MessageBoxButton.YesNo,
MessageBoxImage.Warning) != MessageBoxResult.Yes)
return;
if (!model.OrderId.IsNullOrEmpty())
{
var manualSigns = packTaskService.BatchManualSign(model.ExpressOrderList.Select(e => e.WaybillNo).ToArray()); var manualSigns = packTaskService.BatchManualSign(model.ExpressOrderList.Select(e => e.WaybillNo).ToArray());
if (manualSigns == null || !manualSigns.Success) if (manualSigns == null || !manualSigns.Success)
{ {
@ -1074,11 +1092,6 @@ namespace BBWY.Client.ViewModels.PackTask
} }
} }
} }
if (System.Windows.MessageBox.Show("是否确认收货?", "提示",
MessageBoxButton.YesNo,
MessageBoxImage.Warning) != MessageBoxResult.Yes)
return;
res = packTaskService.SetPackTaskState(taskId, Models.TaskState.); res = packTaskService.SetPackTaskState(taskId, Models.TaskState.);
break; break;
case Models.TaskState.: case Models.TaskState.:
@ -1088,7 +1101,7 @@ namespace BBWY.Client.ViewModels.PackTask
var packModel = PackTaskList.SingleOrDefault(p => p.TaskId == taskId); var packModel = PackTaskList.SingleOrDefault(p => p.TaskId == taskId);
if (packModel == null || packModel.FeesItemResponse == null || packModel.FeesItemResponse.DiscountAllFees == 0) if (packModel == null || packModel.FeesItemResponse == null || packModel.FeesItemResponse.DiscountAllFees == 0)
{ {
System.Windows.MessageBox.Show("请先设置打包费用!"); System.Windows.MessageBox.Show("请先设置打包费用0!");
return; return;
} }
if (System.Windows.MessageBox.Show("是否完成打包?", "提示", if (System.Windows.MessageBox.Show("是否完成打包?", "提示",
@ -1130,6 +1143,7 @@ namespace BBWY.Client.ViewModels.PackTask
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 scheduleOverTimeThread = null;
private Thread sealboxOverTimeThread = null; private Thread sealboxOverTimeThread = null;
private Thread fallwareOverTimeThread = null; private Thread fallwareOverTimeThread = null;
private Thread waitTransportOverTimeThread = null; private Thread waitTransportOverTimeThread = null;
@ -1317,50 +1331,7 @@ namespace BBWY.Client.ViewModels.PackTask
}); });
})); }));
} }
//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
{ {
@ -1374,8 +1345,7 @@ namespace BBWY.Client.ViewModels.PackTask
else if (TaskState == Models.TaskState.) else if (TaskState == Models.TaskState.)
Task.Factory.StartNew(() => Task.Factory.StartNew(() =>
{ {
//var randNum = new Random().Next(81, 90);
var randNum = 90;
if (SealBoxConfigureType == SealBoxConfigureType.) if (SealBoxConfigureType == SealBoxConfigureType.)
{ {
@ -1398,7 +1368,7 @@ namespace BBWY.Client.ViewModels.PackTask
SealBoxSkus = item.SealBoxSkus.Select(s => SealBoxSkus = item.SealBoxSkus.Select(s =>
{ {
s.Logo = s.Logo.Replace("80x80", $"{randNum}x{randNum}"); s.Logo = s.Logo;
return s; return s;
}).ToList(), }).ToList(),
ShopId = item.ShopId, ShopId = item.ShopId,
@ -1469,7 +1439,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(() =>
{ {
WareNoSealBoxModels.Add(new WareNoSealBoxModel WareNoSealBoxModels.Add(new WareNoSealBoxModel
{ {
@ -1477,8 +1447,7 @@ namespace BBWY.Client.ViewModels.PackTask
DepartmentName = item.DepartmentName, DepartmentName = item.DepartmentName,
SealBoxSkus = item.SealBoxSkus.Select(s => SealBoxSkus = item.SealBoxSkus.Select(s =>
{ {
s.Logo = s.Logo;
s.Logo = s.Logo.Replace("80x80", $"{randNum}x{randNum}");
return s; return s;
}).ToList(), }).ToList(),
ShopId = item.ShopId, ShopId = item.ShopId,
@ -1516,7 +1485,6 @@ namespace BBWY.Client.ViewModels.PackTask
var data = new PackTaskModel() var data = new PackTaskModel()
{ {
AcceptName = item.UserName, AcceptName = item.UserName,
Availability = (Availability)item.Availability,
BasicPack = (BasicPack)item.BasicPack, BasicPack = (BasicPack)item.BasicPack,
DepartmentName = item.DepartmentName, DepartmentName = item.DepartmentName,
CertificatePosition = (CertificatePosition)item.CertificatePosition, CertificatePosition = (CertificatePosition)item.CertificatePosition,
@ -1546,7 +1514,9 @@ namespace BBWY.Client.ViewModels.PackTask
QualityOverTimeMarkMsg = item.QualityOverTimeMarkMsg, QualityOverTimeMarkMsg = item.QualityOverTimeMarkMsg,
PackOverTimeMarkMsg = item.PackOverTimeMarkMsg, PackOverTimeMarkMsg = item.PackOverTimeMarkMsg,
ShowMarkMessage = item.ShowMarkMessage, ShowMarkMessage = item.ShowMarkMessage,
SkuPurchaseSchemeId = item.SkuPurchaseSchemeId SkuPurchaseSchemeId = item.SkuPurchaseSchemeId,
ScheduleOverTimeMarkMsg = item.ScheduleOverTimeMarkMsg,
ScheduleOverTime = item.ScheduleOverTime
}; };
@ -1662,10 +1632,6 @@ namespace BBWY.Client.ViewModels.PackTask
var packCompletedTasks = PackTaskList.Where(p => p.TaskState == Models.TaskState. && p.PackCompletionOverTime != null).ToList(); var packCompletedTasks = PackTaskList.Where(p => p.TaskState == Models.TaskState. && p.PackCompletionOverTime != null).ToList();
if (packCompletedTasks.Count() > 0) if (packCompletedTasks.Count() > 0)
{ {
//if (packOverTimeThread!=null)
//{
// packOverTimeThread.Abort();
//}
packOverTimeThread = new Thread(() => packOverTimeThread = new Thread(() =>
{ {
@ -1703,6 +1669,52 @@ namespace BBWY.Client.ViewModels.PackTask
} }
if (TaskState == Models.TaskState.)
{
var packCompletedTasks = PackTaskList.Where(p => p.TaskState == Models.TaskState. && p.ScheduleOverTime != null).ToList();
if (packCompletedTasks.Count() > 0)
{
//if (packOverTimeThread!=null)
//{
// packOverTimeThread.Abort();
//}
scheduleOverTimeThread = new Thread(() =>
{
IsStartThread = true;
while (IsStartThread)
{
App.Current.Dispatcher.BeginInvoke(new Action(() =>
{
foreach (var item in packCompletedTasks)
{
var datetime = item.ScheduleOverTime.Value.Subtract(DateTime.Now);
if (datetime.TotalMilliseconds > 0)
{
item.IsScheduleOverTime = false;
item.ScheduleRemainTime = OverTimeHelper.GetTimeString(datetime);
}
else
{
item.IsScheduleOverTime = true;
item.ScheduleRemainTime = OverTimeHelper.GetTimeString(datetime);
}
}
}));
Thread.Sleep(1000);
}
});
//任务倒计时数据
scheduleOverTimeThread.IsBackground = true;
scheduleOverTimeThread.Start();
}
}
//任务状态为待打包 //任务状态为待打包
} }
@ -1766,6 +1778,7 @@ namespace BBWY.Client.ViewModels.PackTask
WaitFallWareCount = packTaskResult.Data.WaitFallWareCount?.ToString(); WaitFallWareCount = packTaskResult.Data.WaitFallWareCount?.ToString();
WaitCompleted = packTaskResult.Data.WaitCompleted?.ToString(); WaitCompleted = packTaskResult.Data.WaitCompleted?.ToString();
WaitTransportCount = packTaskResult.Data.WaitTransportCount?.ToString(); WaitTransportCount = packTaskResult.Data.WaitTransportCount?.ToString();
WaitScheduleCount = packTaskResult.Data.WaitScheduleCount?.ToString();
})); }));
} }
} }

10
BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs

@ -638,7 +638,6 @@ namespace BBWY.Client.ViewModels
FloorDragNumberList.Add(i + 1); FloorDragNumberList.Add(i + 1);
})); }));
} }
TaskId = model.TaskId; TaskId = model.TaskId;
OrderId = model.OrderId; OrderId = model.OrderId;
@ -700,9 +699,6 @@ namespace BBWY.Client.ViewModels
MessageBox.Show(packTaskRes.Msg); MessageBox.Show(packTaskRes.Msg);
return; return;
} }
SkuPurchaseSchemeId = packTaskRes.Data.SkuPurchaseSchemeId; SkuPurchaseSchemeId = packTaskRes.Data.SkuPurchaseSchemeId;
saveType = packTaskRes.Data.SaveType; saveType = packTaskRes.Data.SaveType;
if (saveType == null) if (saveType == null)
@ -741,9 +737,8 @@ namespace BBWY.Client.ViewModels
})); }));
continue; continue;
} }
var list = purchaseService.GetPurchaseSkuBasicInfo(item.PurchaseProductId); var list = purchaseService.GetPurchaseSkuBasicInfo(item.PurchaseProductId);
if (list == null && !list.Success) if (list == null && !list.Success && list.Data == null)
{ {
App.Current.Dispatcher.Invoke(new Action(() => App.Current.Dispatcher.Invoke(new Action(() =>
{ {
@ -752,7 +747,8 @@ namespace BBWY.Client.ViewModels
continue; continue;
} }
PurchaseSkuItemBasicInfoResponse skuItem = null; PurchaseSkuItemBasicInfoResponse skuItem = null;
if (list.Data != null) skuItem = list.Data.ItemList.FirstOrDefault(f => f.PurchaseSkuId == item.PurchaseSkuId); if (list.Data != null)
skuItem = list.Data.ItemList.FirstOrDefault(f => f.PurchaseSkuId == item.PurchaseSkuId);
App.Current.Dispatcher.Invoke(new Action(() => App.Current.Dispatcher.Invoke(new Action(() =>

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

@ -349,6 +349,7 @@
</StackPanel> </StackPanel>
</Grid> </Grid>
<Grid Grid.Column="8" > <Grid Grid.Column="8" >
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待打包:Visible:Collapsed}">
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center"
Visibility="{Binding PackRemainTime,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}" Visibility="{Binding PackRemainTime,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
> >
@ -358,13 +359,42 @@
<TextBlock Text="剩余: " /> <TextBlock Text="剩余: " />
<TextBlock Text="{Binding PackRemainTime}"/> <TextBlock Text="{Binding PackRemainTime}"/>
</StackPanel> </StackPanel>
<StackPanel Margin="10,5" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" <StackPanel Margin="10,5" Orientation="Vertical" VerticalAlignment="Center" HorizontalAlignment="Center"
Visibility="{Binding IsPackOverTime,Converter={StaticResource objConverter},ConverterParameter=true:Visible:Collapsed}" Visibility="{Binding IsPackOverTime,Converter={StaticResource objConverter},ConverterParameter=true:Visible:Collapsed}">
<StackPanel Orientation="Horizontal"
> >
<TextBlock Foreground="Red" Text="超时: "/> <TextBlock Foreground="Red" Text="超时: "/>
<TextBlock Foreground="Red" Text="{Binding PackRemainTime}"/> <TextBlock Foreground="Red" Text="{Binding PackRemainTime}"/>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</StackPanel>
</StackPanel>
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center"
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待排单:Visible:Collapsed}"
>
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center"
Visibility="{Binding ScheduleRemainTime,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
>
<StackPanel Margin="10,5" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center"
Visibility="{Binding IsScheduleOverTime,Converter={StaticResource objConverter},ConverterParameter=false:Visible:Collapsed}"
>
<TextBlock Text="剩余: " />
<TextBlock Text="{Binding ScheduleRemainTime}"/>
</StackPanel>
<StackPanel Margin="10,5" Orientation="Vertical" VerticalAlignment="Center" HorizontalAlignment="Center"
Visibility="{Binding IsScheduleOverTime,Converter={StaticResource objConverter},ConverterParameter=true:Visible:Collapsed}">
<StackPanel Orientation="Horizontal"
>
<TextBlock Foreground="Red" Text="超时: "/>
<TextBlock Foreground="Red" Text="{Binding ScheduleRemainTime}"/>
</StackPanel>
</StackPanel>
</StackPanel>
</StackPanel>
</Grid> </Grid>

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

@ -93,6 +93,9 @@
IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收:True:False}" IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收:True:False}"
/> />
<RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待排单}" Content="待排单" Tag="{Binding WaitScheduleCount,Mode=TwoWay}"
IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待排单:True:False}"
/>
<RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待打包}" Content="待打包" Tag="{Binding WaitPackCount,Mode=TwoWay}" <RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待打包}" Content="待打包" Tag="{Binding WaitPackCount,Mode=TwoWay}"
IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待打包:True:False}" IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待打包:True:False}"
/> />
@ -184,7 +187,7 @@
<Grid Grid.Row="3" Margin="0,5,0,0"> <Grid Grid.Row="3" 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}"
/> />
@ -194,6 +197,7 @@
<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:ShopWaitPackageControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待打包:Visible:Collapsed}" />
<local:ShopWaitCompletedControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待出库:Visible:Collapsed}" /> <local:ShopWaitCompletedControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待出库:Visible:Collapsed}" />

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

@ -152,7 +152,7 @@
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="300"/> <ColumnDefinition Width="300"/>
<ColumnDefinition Width="80"/> <ColumnDefinition Width="80"/>
<ColumnDefinition Width="100"/> <ColumnDefinition Width="120"/>
<ColumnDefinition MinWidth="100"/> <ColumnDefinition MinWidth="100"/>
<ColumnDefinition Width="150"/> <ColumnDefinition Width="150"/>
<ColumnDefinition Width="100"/> <ColumnDefinition Width="100"/>
@ -161,7 +161,6 @@
<ColumnDefinition Width="120"/> <ColumnDefinition Width="120"/>
<ColumnDefinition Width="140"/> <ColumnDefinition Width="140"/>
<ColumnDefinition Width="120"/> <ColumnDefinition Width="120"/>
</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}"/>
@ -212,7 +211,7 @@
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="300"/> <ColumnDefinition Width="300"/>
<ColumnDefinition Width="80"/> <ColumnDefinition Width="80"/>
<ColumnDefinition Width="100"/> <ColumnDefinition Width="120"/>
<ColumnDefinition MinWidth="100"/> <ColumnDefinition MinWidth="100"/>
<ColumnDefinition Width="150"/> <ColumnDefinition Width="150"/>
<ColumnDefinition Width="100"/> <ColumnDefinition Width="100"/>
@ -284,7 +283,7 @@
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="300"/> <ColumnDefinition Width="300"/>
<ColumnDefinition Width="80"/> <ColumnDefinition Width="80"/>
<ColumnDefinition Width="100"/> <ColumnDefinition Width="120"/>
<ColumnDefinition MinWidth="100"/> <ColumnDefinition MinWidth="100"/>
<ColumnDefinition Width="150"/> <ColumnDefinition Width="150"/>
<ColumnDefinition Width="100"/> <ColumnDefinition Width="100"/>
@ -529,6 +528,8 @@
</Grid> </Grid>
<Grid Grid.Column="9"> <Grid Grid.Column="9">
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待打包:Visible:Collapsed}">
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center"
Visibility="{Binding PackRemainTime,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}" Visibility="{Binding PackRemainTime,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
> >
@ -565,6 +566,45 @@
</c:BButton> </c:BButton>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</StackPanel>
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center"
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待排单:Visible:Collapsed}"
>
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center"
Visibility="{Binding ScheduleRemainTime,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
>
<StackPanel Margin="10,5" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center"
Visibility="{Binding IsScheduleOverTime,Converter={StaticResource objConverter},ConverterParameter=false:Visible:Collapsed}"
>
<TextBlock Text="剩余: " />
<TextBlock Text="{Binding ScheduleRemainTime}"/>
</StackPanel>
<StackPanel Margin="10,5" Orientation="Vertical" VerticalAlignment="Center" HorizontalAlignment="Center"
Visibility="{Binding IsScheduleOverTime,Converter={StaticResource objConverter},ConverterParameter=true:Visible:Collapsed}">
<StackPanel Orientation="Horizontal"
>
<TextBlock Foreground="Red" Text="超时: "/>
<TextBlock Foreground="Red" Text="{Binding ScheduleRemainTime}"/>
</StackPanel>
<c:BButton Margin="0 10 0 0" Content="{Binding ScheduleOverTimeMarkMsg ,Converter={StaticResource objConverter},ConverterParameter=#null:提交备注:修改备注}" Style="{StaticResource LinkButton}"
>
<b:Interaction.Triggers>
<b:EventTrigger EventName="PreviewMouseLeftButtonDown">
<b:InvokeCommandAction Command="{Binding DataContext.SubmitOverTimeMarkMsgCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}">
<b:InvokeCommandAction.CommandParameter>
<MultiBinding Converter="{StaticResource mptConverter}">
<Binding Path="TaskId"/>
<Binding Path="ScheduleOverTimeMarkMsg"/>
</MultiBinding>
</b:InvokeCommandAction.CommandParameter>
</b:InvokeCommandAction>
</b:EventTrigger>
</b:Interaction.Triggers>
</c:BButton>
</StackPanel>
</StackPanel>
</StackPanel>
</Grid> </Grid>
@ -578,8 +618,8 @@
<c:BButton HorizontalAlignment="Center" Height="20" Style="{StaticResource LinkButton}" VerticalAlignment="Center" Grid.Row="1" <c:BButton HorizontalAlignment="Center" Height="20" Style="{StaticResource LinkButton}" VerticalAlignment="Center" Grid.Row="1"
Content="{Binding FeesItemResponse,Converter={StaticResource objConverter},ConverterParameter=#null:打包设置:修改设置 }" Content="{Binding FeesItemResponse,Converter={StaticResource objConverter},ConverterParameter=#null:打包设置:修改设置 }"
Command="{Binding SetServiceCommand}" Command="{Binding SetServiceCommand}"
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待打包|待排单:Visible:Collapsed}"
Visibility="Visible" /> />
<c:BButton HorizontalAlignment="Center" Style="{StaticResource LinkButton}" Height="20" Margin="0 5 0 5 " VerticalAlignment="Center" Grid.Row="1" Content="验收" <c:BButton HorizontalAlignment="Center" Style="{StaticResource LinkButton}" Height="20" Margin="0 5 0 5 " VerticalAlignment="Center" Grid.Row="1" Content="验收"
Command="{Binding QualityTaskCommand}" Command="{Binding QualityTaskCommand}"
@ -612,7 +652,7 @@
<c:BButton HorizontalAlignment="Center" Style="{StaticResource LinkButton}" Height="20" Margin="0 5 0 5 " VerticalAlignment="Center" Grid.Row="1" Content="商家自取" <c:BButton HorizontalAlignment="Center" Style="{StaticResource LinkButton}" Height="20" Margin="0 5 0 5 " VerticalAlignment="Center" Grid.Row="1" Content="商家自取"
CommandParameter="{Binding TaskId}" CommandParameter="{Binding TaskId}"
Command="{Binding DataContext.StoreGetBySelfCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}" Command="{Binding DataContext.StoreGetBySelfCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收|待打包:Visible:Collapsed}" Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待排单|待打包:Visible:Collapsed}"
/> />
<hc:SplitButton Content="更多操作" Foreground="{StaticResource Button.Background}" BorderThickness="0" HitMode="Hover" HorizontalAlignment="Stretch"> <hc:SplitButton Content="更多操作" Foreground="{StaticResource Button.Background}" BorderThickness="0" HitMode="Hover" HorizontalAlignment="Stretch">
<hc:SplitButton.Resources> <hc:SplitButton.Resources>

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

@ -99,6 +99,9 @@
IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收:True:False}" IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收:True:False}"
/> />
<RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待排单}" Content="待排单" Tag="{Binding WaitScheduleCount,Mode=TwoWay}"
IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待排单:True:False}"
/>
<RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待打包}" Content="待打包" Tag="{Binding WaitPackCount,Mode=TwoWay}" <RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待打包}" Content="待打包" Tag="{Binding WaitPackCount,Mode=TwoWay}"
IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待打包:True:False}" IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待打包:True:False}"
/> />
@ -143,9 +146,10 @@
<Grid Grid.Row="1" Margin="0,5,0,0"> <Grid Grid.Row="1" 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}" /> <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}" />

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

@ -157,11 +157,11 @@
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="300"/> <ColumnDefinition Width="300"/>
<ColumnDefinition Width="90"/> <ColumnDefinition Width="90"/>
<ColumnDefinition Width="100"/> <ColumnDefinition Width="120"/>
<ColumnDefinition MinWidth="100"/> <ColumnDefinition MinWidth="100"/>
<ColumnDefinition Width="150"/> <ColumnDefinition Width="150"/>
<ColumnDefinition MinWidth="280"/>
<ColumnDefinition MinWidth="140"/> <ColumnDefinition MinWidth="140"/>
<ColumnDefinition Width="0"/>
<ColumnDefinition Width="100"/> <ColumnDefinition Width="100"/>
<ColumnDefinition Width="100"/> <ColumnDefinition Width="100"/>
<ColumnDefinition Width="120"/> <ColumnDefinition Width="120"/>
@ -172,7 +172,7 @@
<TextBlock Text="SKU配件商品" Grid.Column="3" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="SKU配件商品" 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}"/> <!--<TextBlock Text="注意事项/对接备注" Grid.Column="6" Style="{StaticResource middleTextBlock}"/>-->
<TextBlock Text="费用" Grid.Column="7" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="费用" Grid.Column="7" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="打包员" Grid.Column="8" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="打包员" Grid.Column="8" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="操作" Grid.Column="9" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="操作" Grid.Column="9" Style="{StaticResource middleTextBlock}"/>
@ -214,11 +214,11 @@
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="300"/> <ColumnDefinition Width="300"/>
<ColumnDefinition Width="90"/> <ColumnDefinition Width="90"/>
<ColumnDefinition Width="100"/> <ColumnDefinition Width="120"/>
<ColumnDefinition MinWidth="100"/> <ColumnDefinition MinWidth="100"/>
<ColumnDefinition Width="150"/> <ColumnDefinition Width="150"/>
<ColumnDefinition MinWidth="280"/>
<ColumnDefinition MinWidth="140"/> <ColumnDefinition MinWidth="140"/>
<ColumnDefinition Width="0"/>
<ColumnDefinition Width="100"/> <ColumnDefinition Width="100"/>
<ColumnDefinition Width="100"/> <ColumnDefinition Width="100"/>
<ColumnDefinition Width="120"/> <ColumnDefinition Width="120"/>
@ -272,11 +272,11 @@
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="300"/> <ColumnDefinition Width="300"/>
<ColumnDefinition Width="90"/> <ColumnDefinition Width="90"/>
<ColumnDefinition Width="100"/> <ColumnDefinition Width="120"/>
<ColumnDefinition MinWidth="100"/> <ColumnDefinition MinWidth="100"/>
<ColumnDefinition Width="150"/> <ColumnDefinition Width="150"/>
<ColumnDefinition MinWidth="280"/>
<ColumnDefinition MinWidth="140"/> <ColumnDefinition MinWidth="140"/>
<ColumnDefinition Width="0"/>
<ColumnDefinition Width="100"/> <ColumnDefinition Width="100"/>
<ColumnDefinition Width="100"/> <ColumnDefinition Width="100"/>
<ColumnDefinition Width="120"/> <ColumnDefinition Width="120"/>
@ -454,7 +454,7 @@
</ListBox> </ListBox>
</Grid> </Grid>
<Grid Grid.Column="6" > <!--<Grid Grid.Column="6" >
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center"> <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock <TextBlock
Text="{Binding MarkMessage}" Text="{Binding MarkMessage}"
@ -464,7 +464,7 @@
</StackPanel> </StackPanel>
</Grid> </Grid>-->
<Grid Grid.Column="7"> <Grid Grid.Column="7">
<Grid> <Grid>
@ -517,11 +517,15 @@
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收:Visible:Collapsed}" Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收:Visible:Collapsed}"
/> />
<StackPanel
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待打包:Visible:Collapsed}"
>
<c:BButton Grid.Column="11" HorizontalAlignment="Stretch" Style="{StaticResource LinkButton}" Margin="0 5 0 5 " VerticalAlignment="Center" Content="完成" <c:BButton Grid.Column="11" HorizontalAlignment="Stretch" Style="{StaticResource LinkButton}" Margin="0 5 0 5 " VerticalAlignment="Center" Content="完成"
CommandParameter="{Binding}" CommandParameter="{Binding}"
Command="{Binding DataContext.UpdateTaskStateCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}" Command="{Binding DataContext.CompletedPackTaskCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}"
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待打包:Visible:Collapsed}" Visibility="{Binding FeesItemResponse,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible }"
/> />
</StackPanel>
<c:BButton HorizontalAlignment="Center" Style="{StaticResource LinkButton}" Height="20" Margin="0 5 0 5 " VerticalAlignment="Center" Grid.Row="1" Content="商家自取" <c:BButton HorizontalAlignment="Center" Style="{StaticResource LinkButton}" Height="20" Margin="0 5 0 5 " VerticalAlignment="Center" Grid.Row="1" Content="商家自取"

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

@ -625,17 +625,10 @@
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="完成"
CommandParameter="{Binding}"
Command="{Binding DataContext.UpdateTaskStateCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待打包:Visible:Collapsed}"
/>
<c:BButton HorizontalAlignment="Center" Style="{StaticResource LinkButton}" Height="20" Margin="0 5 0 5 " VerticalAlignment="Center" Grid.Row="1" Content="商家自取" <c:BButton HorizontalAlignment="Center" Style="{StaticResource LinkButton}" Height="20" Margin="0 5 0 5 " VerticalAlignment="Center" Grid.Row="1" Content="商家自取"
CommandParameter="{Binding TaskId}" CommandParameter="{Binding TaskId}"
Command="{Binding DataContext.StoreGetBySelfCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}" Command="{Binding DataContext.StoreGetBySelfCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收|待打包:Visible:Collapsed}" Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待排单|待打包:Visible:Collapsed}"
/> />

4
BBWY.Client/Views/TaskOverTime/SubmitOverTimeMarkMsgWindow.xaml.cs

@ -68,7 +68,9 @@ namespace BBWY.Client.Views.TaskOverTime
return; return;
} }
if (reflashWindow != null) reflashWindow(); if (reflashWindow != null) reflashWindow();
this.Close();
App.Current.Dispatcher.Invoke(new Action(() => { this.Close(); }));
} }
} }
} }

Loading…
Cancel
Save