diff --git a/BBWY.Client/APIServices/QiKu/PackTaskService.cs b/BBWY.Client/APIServices/QiKu/PackTaskService.cs index 9d06354d..367cbb72 100644 --- a/BBWY.Client/APIServices/QiKu/PackTaskService.cs +++ b/BBWY.Client/APIServices/QiKu/PackTaskService.cs @@ -25,11 +25,10 @@ namespace BBWY.Client.APIServices { } - + public ApiResponse GetTaskList(string skuId = null, string taskId = null, - DateTime? startTime = null, - DateTime? endTime = null, + TaskState? TaskState = null, int pageIndex = 1, int pageSize = 10 @@ -51,8 +50,6 @@ namespace BBWY.Client.APIServices SkuId = skuId, TaskId = taskId, - StartTime = startTime, - EndTime = endTime, TaskState = TaskState, PageIndex = pageIndex, PageSize = pageSize, @@ -60,8 +57,7 @@ namespace BBWY.Client.APIServices }, null, HttpMethod.Post); } public ApiResponse GetWareHouseList(string WayBillNo = null, string SourceExpressName = null, int? isWorry = null, string departmentName = null, string skuId = null, string taskId = null, - DateTime? startTime = null, - DateTime? endTime = null, + TaskState? TaskState = null, string ShopName = null, int pageIndex = 1, @@ -82,8 +78,6 @@ namespace BBWY.Client.APIServices DepartmentName = departmentName, SkuId = skuId, TaskId = taskId, - StartTime = startTime, - EndTime = endTime, TaskState = TaskState, PageIndex = pageIndex, PageSize = pageSize, diff --git a/BBWY.Client/APIServices/QiKu/SealBoxService.cs b/BBWY.Client/APIServices/QiKu/SealBoxService.cs index bbd10ea9..3596fec7 100644 --- a/BBWY.Client/APIServices/QiKu/SealBoxService.cs +++ b/BBWY.Client/APIServices/QiKu/SealBoxService.cs @@ -104,7 +104,7 @@ namespace BBWY.Client.APIServices - public ApiResponse WareCompeteSealBox(long SealBoxId, int? BoxCount ) + public ApiResponse WareCompeteSealBox(long SealBoxId, int? BoxCount) { return SendRequest(globalContext.QKApiHost, $"api/SealBox/WareCompeteSealBox", new @@ -112,7 +112,7 @@ namespace BBWY.Client.APIServices SealBoxId, BoxCount -} + } , null, HttpMethod.Post); } /// @@ -234,5 +234,34 @@ namespace BBWY.Client.APIServices null , null, HttpMethod.Post); } + + + + + public ApiResponse GetWareWaitTransportList(WareType WareType, int? PageSize, int? PageIndex) + { + return SendRequest(globalContext.QKApiHost, $"api/SealBox/GetWareWaitTransportList", + new + { + WareType, + PageSize, + PageIndex + + } + , null, HttpMethod.Post); + } + + public ApiResponse WareCompeteTransport(long sealBoxId) + { + return SendRequest(globalContext.QKApiHost, $"api/SealBox/WareCompeteTransport?sealBoxId={sealBoxId}", + null , null, HttpMethod.Post); + } + + + public ApiResponse GetWareTransportCounts() + { + return SendRequest(globalContext.QKApiHost, $"api/SealBox/GetWareTransportCounts", + null, null, HttpMethod.Post); + } } } diff --git a/BBWY.Client/Converters/TaskStateToBooleanConvert.cs b/BBWY.Client/Converters/TaskStateToBooleanConvert.cs index 571f912a..ffe126a7 100644 --- a/BBWY.Client/Converters/TaskStateToBooleanConvert.cs +++ b/BBWY.Client/Converters/TaskStateToBooleanConvert.cs @@ -11,7 +11,7 @@ namespace BBWY.Client.Converters { public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { - string[] parray = parameter.ToString().ToLower().Split(':');//参数拆分 + string[] parray = parameter.ToString().Split(':');//参数拆分 string valueStr = value == null ? string.Empty : value.ToString().ToLower(); string returnValue = string.Empty; try diff --git a/BBWY.Client/Models/APIModel/Response/PackTask/ProductSkuCountsResponse.cs b/BBWY.Client/Models/APIModel/Response/PackTask/ProductSkuCountsResponse.cs index 1da09f27..52fc3327 100644 --- a/BBWY.Client/Models/APIModel/Response/PackTask/ProductSkuCountsResponse.cs +++ b/BBWY.Client/Models/APIModel/Response/PackTask/ProductSkuCountsResponse.cs @@ -45,6 +45,12 @@ namespace BBWY.Client.Models.APIModel.Response.PackTask /// /// 待完结 /// - public string WaitCompleted { get; set; } + public int? WaitCompleted { get; set; } + + + /// + /// 待转运 + /// + public int? WaitTransportCount { get; set; } } } diff --git a/BBWY.Client/Models/APIModel/Response/PackTask/SearchWaitFallWareResponse.cs b/BBWY.Client/Models/APIModel/Response/PackTask/SearchWaitFallWareResponse.cs index c540da6b..b25cd46d 100644 --- a/BBWY.Client/Models/APIModel/Response/PackTask/SearchWaitFallWareResponse.cs +++ b/BBWY.Client/Models/APIModel/Response/PackTask/SearchWaitFallWareResponse.cs @@ -150,6 +150,10 @@ namespace BBWY.Client.Models.APIModel /// 商品名称 /// public string ProductTitle { get; set; } + /// + /// 供应商 + /// + public string ProviderName { get; set; } } diff --git a/BBWY.Client/Models/APIModel/Response/SealBox/GetWareTransportCountResponse.cs b/BBWY.Client/Models/APIModel/Response/SealBox/GetWareTransportCountResponse.cs new file mode 100644 index 00000000..1b6e157e --- /dev/null +++ b/BBWY.Client/Models/APIModel/Response/SealBox/GetWareTransportCountResponse.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace BBWY.Client.Models.APIModel +{ + public class GetWareTransportCountResponse + { + public string WaitTransportJDWareCount { get; set; } + + public string WaitTransportCloudWareCount { get; set; } + + public string WaitTransportJuShuiTanCount { get; set; } + + public string WaitTransportStoreWareCount { get; set; } + } +} diff --git a/BBWY.Client/Models/APIModel/Response/SealBox/GetWareWaitTransportResponse.cs b/BBWY.Client/Models/APIModel/Response/SealBox/GetWareWaitTransportResponse.cs new file mode 100644 index 00000000..b521b9e4 --- /dev/null +++ b/BBWY.Client/Models/APIModel/Response/SealBox/GetWareWaitTransportResponse.cs @@ -0,0 +1,100 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace BBWY.Client.Models.APIModel +{ + public class GetWareWaitTransportResponse + { + /// + /// 数量 + /// + public int TotalCount { get; set; } + + public List WareWaitTransports { get; set; } + } + public class WareWaitTransport:NotifyObject + { + private string waitTransportRemainTime; + public string WaitTransportRemainTime { get => waitTransportRemainTime; set { Set(ref waitTransportRemainTime, value); } } + + private bool isWaitTransportOverTime; + public bool IsWaitTransportOverTime { get => isWaitTransportOverTime; set { Set(ref isWaitTransportOverTime, value); } } + + /// + /// 过期时间 + /// + public DateTime? TransportOverTime { get; set; } + + + public long SealBoxId { get; set; } + /// + /// 店铺Id + /// + public string ShopId { get; set; } + /// + /// 仓库Id(同一个店铺 唯一) + /// + public string WareId { get; set; } + /// + /// 店铺名称 + /// + public string ShopName { get; set; } + /// + /// 仓库名 + /// + public string WareName { get; set; } + + /// + /// 团队名称 + /// + public string DepartmentName { get; set; } + + /// + /// 对接人(同团队下) + /// + public string AcceptUserNames { get; set; } + + + /// + /// sku列表 + /// + public List WaitTransportSkus { get; set; } + } + public class WaitTransportSku + { + + ///// + ///// 任务状态 + ///// + //public TaskState? TaskState { get; set; } + /// + /// 任务Id + /// + public long TaskId { get; set; } + /// + /// 图片链接 + /// + public string Logo { get; set; } + /// + /// skuid + /// + public string SkuId { get; set; } + /// + /// sku标题 + /// + public string SkuTitle { get; set; } + /// + /// 品名 + /// + public string BrandName { get; set; } + ///// + ///// 货号 + ///// + //public string ProductNo { get; set; } + /// + /// (分箱的仓库的sku产品数量) + /// + public int WareHourseSkuCount { get; set; } + } +} diff --git a/BBWY.Client/Models/APIModel/Response/ServiceOrder/ServiceOrderItemResponse.cs b/BBWY.Client/Models/APIModel/Response/ServiceOrder/ServiceOrderItemResponse.cs index 19dd900d..2781e142 100644 --- a/BBWY.Client/Models/APIModel/Response/ServiceOrder/ServiceOrderItemResponse.cs +++ b/BBWY.Client/Models/APIModel/Response/ServiceOrder/ServiceOrderItemResponse.cs @@ -212,7 +212,7 @@ namespace BBWY.Client.Models public decimal? StorageAmount { get; set; } = 0.00M; /// - /// 服务单物流状态（0=待质检，1=已入库，2=派送中，3=运输中） + /// 服务单物流状态（0=待验收，1=已入库，2=派送中，3=运输中） /// public TransportState? TransportDetails { get; set; } diff --git a/BBWY.Client/Models/Enums.cs b/BBWY.Client/Models/Enums.cs index 2de89d87..935583b5 100644 --- a/BBWY.Client/Models/Enums.cs +++ b/BBWY.Client/Models/Enums.cs @@ -235,7 +235,7 @@ { 未到货 = 0, 部分到货 = 1, - 待质检 = 2,//已到货 + 待验收 = 2,//已到货 待打包 = 3, 待封箱 = 4, 待出库 = 5, @@ -364,11 +364,11 @@ /// - /// 运输状态 0=待质检，1=已入库，2=派送中，3=运输中 + /// 运输状态 0=待验收，1=已入库，2=派送中，3=运输中 /// public enum TransportState { - 待质检 = 0, 已入库 = 1, 派送中 = 2, 运输中 = 3 + 待验收 = 0, 已入库 = 1, 派送中 = 2, 运输中 = 3 } /// @@ -420,7 +420,7 @@ /// public enum PurchaseOrderState { - /*待付款 = 0, 待发货 = 1, 待收货 = 2, 待质检 = 3, 待打包 = 4, 待结算 = 5, 已完成 = 6, 已取消 = 7*/ + /*待付款 = 0, 待发货 = 1, 待收货 = 2, 待验收 = 3, 待打包 = 4, 待结算 = 5, 已完成 = 6, 已取消 = 7*/ 待付款 = 0, 等待采购 = 1, 部分采购 = 110, diff --git a/BBWY.Client/Models/FallWare/JDWareBoxModel.cs b/BBWY.Client/Models/FallWare/JDWareBoxModel.cs index bd9ba546..c3483d75 100644 --- a/BBWY.Client/Models/FallWare/JDWareBoxModel.cs +++ b/BBWY.Client/Models/FallWare/JDWareBoxModel.cs @@ -53,5 +53,10 @@ namespace BBWY.Client.Models.FallWare /// 商品名称 /// public string ProductTitle { get => productTitle; set { Set(ref productTitle, value); } } + + /// + /// 供应商 + /// + public string ProviderName { get; set; } } } diff --git a/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs b/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs index 258cfb00..418a559b 100644 --- a/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs +++ b/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs @@ -96,14 +96,14 @@ namespace BBWY.Client.ViewModels.PackTask /// public ObservableCollection FallWareConfiguredList { get => fallWareConfiguredList; set { Set(ref fallWareConfiguredList, value); } } - /// - /// 查询时间段 - /// - private DateTime startTime; - public DateTime StartTime { get => startTime; set { Set(ref startTime, value); } } + ///// + ///// 查询时间段 + ///// + //private DateTime startTime; + //public DateTime StartTime { get => startTime; set { Set(ref startTime, value); } } - private DateTime endTime; - public DateTime EndTime { get => endTime; set { Set(ref endTime, value); } } + //private DateTime endTime; + //public DateTime EndTime { get => endTime; set { Set(ref endTime, value); } } /// /// 查询任务id @@ -251,8 +251,8 @@ namespace BBWY.Client.ViewModels.PackTask ConfiguredSealBoxCommand = new RelayCommand(ConfiguredSealBox); UpdateSealBoxConfiguredCommand = new RelayCommand(UpdateSealBoxConfigured); - StartTime = DateTime.Now.Date; - EndTime = DateTime.Now.Date; + //StartTime = DateTime.Now.Date; + //EndTime = DateTime.Now.Date; IsLoading = false; //加载数据 SetTaskState(null); @@ -506,7 +506,7 @@ namespace BBWY.Client.ViewModels.PackTask try { PackTaskList = new ObservableCollection();//初始化数据 - var datas = packTaskService.GetTaskList(SearchSkuId, SearchTaskId, StartTime, EndTime, (this.TaskState), + var datas = packTaskService.GetTaskList(SearchSkuId, SearchTaskId, this.TaskState, PageIndex, PageSize); if (datas != null && datas.Data != null && datas.Success) { diff --git a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs index 56b8a77c..48725492 100644 --- a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs +++ b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs @@ -35,6 +35,20 @@ namespace BBWY.Client.ViewModels.PackTask //public RelayCommand SelectCmd => new RelayCommand(str => Growl.Info(str)); #region 属性绑定 + + private string waitTransportJDWareCount; + public string WaitTransportJDWareCount { get => waitTransportJDWareCount; set { Set(ref waitTransportJDWareCount, value); } } + private string waitTransportCloudWareCount; + public string WaitTransportCloudWareCount { get => waitTransportCloudWareCount; set { Set(ref waitTransportCloudWareCount, value); } } + + private string waitTransportJuShuiTanCount; + public string WaitTransportJuShuiTanCount { get => waitTransportJuShuiTanCount; set { Set(ref waitTransportJuShuiTanCount, value); } } + + private string waitTransportStoreWareCount; + public string WaitTransportStoreWareCount { get => waitTransportStoreWareCount; set { Set(ref waitTransportStoreWareCount, value); } } + + + private string searchWayBillNo; public string SearchWayBillNo { @@ -60,6 +74,12 @@ namespace BBWY.Client.ViewModels.PackTask + private ObservableCollection waitTransportList; + /// + /// 待转运列表 + /// + public ObservableCollection WaitTransportList { get => waitTransportList; set { Set(ref waitTransportList, value); } } + private ObservableCollection waitFallWareList; /// /// 待落仓列表 @@ -86,14 +106,14 @@ namespace BBWY.Client.ViewModels.PackTask /// public ObservableCollection PackTaskList { get => packTaskList; set { Set(ref packTaskList, value); } } - /// - /// 查询时间段 - /// - private DateTime startTime; - public DateTime StartTime { get => startTime; set { Set(ref startTime, value); } } + ///// + ///// 查询时间段 + ///// + //private DateTime startTime; + //public DateTime StartTime { get => startTime; set { Set(ref startTime, value); } } - private DateTime endTime; - public DateTime EndTime { get => endTime; set { Set(ref endTime, value); } } + //private DateTime endTime; + //public DateTime EndTime { get => endTime; set { Set(ref endTime, value); } } private string searchShopName; public string SearchShopName @@ -203,6 +223,13 @@ namespace BBWY.Client.ViewModels.PackTask public string WaitCompleted { get => waitCompleted; set { Set(ref waitCompleted, value); } } + private string waitTransportCount; + /// + /// 待转运 + /// + public string WaitTransportCount { get => waitTransportCount; set { Set(ref waitTransportCount, value); } } + + public int PageIndex { get => pageIndex; set { Set(ref pageIndex, value); } } @@ -233,6 +260,10 @@ namespace BBWY.Client.ViewModels.PackTask /// public SealBoxConfigureType SealBoxConfigureType { get => sealBoxConfigureType; set { Set(ref sealBoxConfigureType, value); } } + + private WareType selectWareType; + + public WareType SelectWareType { get => selectWareType; set { Set(ref selectWareType, value); } } #endregion private readonly PackTaskService packTaskService; @@ -262,13 +293,14 @@ namespace BBWY.Client.ViewModels.PackTask OpenSkuDetailCommand = new RelayCommand(OpenSkuDetail); - StartTime = DateTime.Now.Date; - EndTime = DateTime.Now.Date; + //StartTime = DateTime.Now.Date; + //EndTime = DateTime.Now.Date; IsLoading = false; SetTaskStatusCommand = new RelayCommand(SetTaskStatus); TaskState = null; //加载数据 + SelectWareType = WareType.云仓; SetTaskState(null); UpdateTaskStateCommand = new RelayCommand(UpdateTaskState); @@ -299,9 +331,40 @@ namespace BBWY.Client.ViewModels.PackTask CompletedPackTaskCommand = new RelayCommand(CompletedPackTask); + SetWareTypeCommand = new RelayCommand(s => + { + PageIndex = 1; + SelectWareType = s; + Task.Factory.StartNew(() => SearchTaskList()); + }); + + CompeteWaitTransportCommand = new RelayCommand(CompeteWaitTransport); + } + private void CompeteWaitTransport(object obj) + { + var model = (WareWaitTransport)obj; + + + if (System.Windows.MessageBox.Show("是否完成转运?", "提示", + MessageBoxButton.YesNo, + MessageBoxImage.Warning) != MessageBoxResult.Yes) + return; + var res = sealBoxService.WareCompeteTransport(model.SealBoxId); + if (res == null) + { + return; + } + if (!res.Success) + { + System.Windows.MessageBox.Show(res.Msg); + return; + } + Task.Factory.StartNew(() => SearchTaskList()); + } + private void CompletedPackTask(object obj) { var model = (PackTaskModel)obj; @@ -315,7 +378,7 @@ namespace BBWY.Client.ViewModels.PackTask MessageBoxButton.YesNo, MessageBoxImage.Warning) != MessageBoxResult.Yes) return; - var res = packTaskService.CompletedPackTask(model.TaskId); + var res = packTaskService.CompletedPackTask(model.TaskId); if (res == null) { return; @@ -408,25 +471,22 @@ namespace BBWY.Client.ViewModels.PackTask PrewOrder = fallware.BoxConfigureData.PrewOrder, ProductTitle = fallware.BoxConfigureData.ProductTitle, PurchaseOrder = fallware.BoxConfigureData.PurchaseOrder, - WaybillNo = fallware.BoxConfigureData.WaybillNo + WaybillNo = fallware.BoxConfigureData.WaybillNo, + ProviderName = fallware.BoxConfigureData.ProviderName }; if (fallware.WareType == WareType.京仓) { - //SetJDWareBoxWindow window = new SetJDWareBoxWindow(model, sealBoxService, fallware.WareType, ReflashTask,false); - //window.Show(); - var w = new SetJDWareBoxWindow2(model, sealBoxService, fallware.WareType, ReflashTask, false); - w.ShowDialog(); + SetJDWareBoxWindow window = new SetJDWareBoxWindow(model, sealBoxService, fallware.WareType, ReflashTask, false); + window.Show(); + //var w = new SetJDWareBoxWindow2(model, sealBoxService, fallware.WareType, ReflashTask, false); + //w.ShowDialog(); } - if (fallware.WareType == WareType.云仓) + if (fallware.WareType == WareType.云仓 || fallware.WareType == WareType.聚水潭齐越仓) { SetCloudWareBoxWindow window = new SetCloudWareBoxWindow(model, sealBoxService, fallware.WareType, ReflashTask, false); window.Show(); } - if (fallware.WareType == WareType.聚水潭齐越仓) - { - - } } public PositionState PositionState { get; set; } @@ -461,7 +521,7 @@ namespace BBWY.Client.ViewModels.PackTask { var model = (SealBoxModel)obj; - if (model.SealBoxSkus.Any(s => s.TaskState == Models.TaskState.待质检 || s.TaskState == Models.TaskState.待打包)) + if (model.SealBoxSkus.Any(s => s.TaskState == Models.TaskState.待验收 || s.TaskState == Models.TaskState.待打包)) { System.Windows.MessageBox.Show("无法封箱,存在未打包完成的任务"); return; @@ -478,6 +538,8 @@ namespace BBWY.Client.ViewModels.PackTask #region 事件绑定 + public ICommand CompeteWaitTransportCommand { get; set; } + public ICommand SetWareTypeCommand { get; set; } public ICommand LookBoxConfigureCommand { get; set; } /// /// 待配置 /已配置 @@ -591,9 +653,9 @@ namespace BBWY.Client.ViewModels.PackTask MessageBoxImage.Warning) != MessageBoxResult.Yes) return; - res = packTaskService.SetPackTaskState(taskId, Models.TaskState.待质检); + res = packTaskService.SetPackTaskState(taskId, Models.TaskState.待验收); break; - case Models.TaskState.待质检: + case Models.TaskState.待验收: break; case Models.TaskState.待打包: @@ -670,7 +732,77 @@ namespace BBWY.Client.ViewModels.PackTask } IsLoading = true; - if (TaskState == Models.TaskState.待落仓) + + if (TaskState == Models.TaskState.待转运) + { + Task.Factory.StartNew(() => + { + WaitTransportList = new ObservableCollection(); + + var datas = sealBoxService.GetWareWaitTransportList(SelectWareType, PageSize, PageIndex); + if (datas != null && datas.Data != null && datas.Success) + { + var dataModel = datas.Data; + OrderCount = dataModel.TotalCount; + foreach (var item in dataModel.WareWaitTransports) + { + + App.Current.Dispatcher.BeginInvoke(new Action(() => + { + WaitTransportList.Add(item); + })); + + } + Thread.Sleep(500); + var sealboxTasks = WaitTransportList.Where(p => p.TransportOverTime != null).ToList(); + if (sealboxTasks.Count() > 0 && TaskState == Models.TaskState.待转运) + { + + + sealboxOverTimeThread = new Thread(() => + { + IsStartThread = true; + while (IsStartThread) + { + App.Current.Dispatcher.BeginInvoke(new Action(() => + { + foreach (var item in sealboxTasks) + { + var datetime = item.TransportOverTime.Value.Subtract(DateTime.Now); + if (datetime.TotalMilliseconds > 0) + { + item.IsWaitTransportOverTime = false; + item.WaitTransportRemainTime = $"{datetime.Hours}小时{datetime.Minutes}分"; + } + else + { + item.IsWaitTransportOverTime = true; + item.WaitTransportRemainTime = datetime.Days == 0 ? $"{-datetime.Hours}小时{-datetime.Minutes}分" : $"{-datetime.Days}天{-datetime.Hours}小时{-datetime.Minutes}分"; + } + + } + })); + Thread.Sleep(1000); + } + + }); + //任务倒计时数据 + sealboxOverTimeThread.IsBackground = true; + sealboxOverTimeThread.Start(); + + + } + } + else + { + if (datas != null) System.Windows.MessageBox.Show(datas.Msg); + } + IsLoadCount(); + IsLoadWaitTransportCount(); + IsLoading = false; + }); + } + else if (TaskState == Models.TaskState.待落仓) Task.Factory.StartNew(() => { @@ -749,7 +881,7 @@ namespace BBWY.Client.ViewModels.PackTask WareId = item.WareId, WareName = item.WareName, SealBoxId = item.SealBoxId, - SealBoxPackOverTime= item .SealBoxPackOverTime + SealBoxPackOverTime = item.SealBoxPackOverTime }); })); @@ -758,7 +890,7 @@ namespace BBWY.Client.ViewModels.PackTask var sealboxTasks = WaitSealBoxModels.Where(p => p.SealBoxPackOverTime != null).ToList(); if (sealboxTasks.Count() > 0 && TaskState == Models.TaskState.待封箱) { - + sealboxOverTimeThread = new Thread(() => { @@ -778,7 +910,7 @@ namespace BBWY.Client.ViewModels.PackTask else { item.IsSealBoxOverTime = true; - item.SealBoxRemainTime = datetime.Days==0? $"{-datetime.Hours}小时{-datetime.Minutes}分" :$"{-datetime.Days}天{-datetime.Hours}小时{-datetime.Minutes}分"; + item.SealBoxRemainTime = datetime.Days == 0 ? $"{-datetime.Hours}小时{-datetime.Minutes}分" : $"{-datetime.Days}天{-datetime.Hours}小时{-datetime.Minutes}分"; } } @@ -847,7 +979,7 @@ namespace BBWY.Client.ViewModels.PackTask PackTaskList = new ObservableCollection();//初始化数据 - var datas = packTaskService.GetWareHouseList(SearchWayBillNo, SearchExpressName, IsWorry, SearchDepartment, SearchSkuId, SearchTaskId, StartTime, EndTime, (this.TaskState), SearchShopName, + var datas = packTaskService.GetWareHouseList(SearchWayBillNo, SearchExpressName, IsWorry, SearchDepartment, SearchSkuId, SearchTaskId, this.TaskState, SearchShopName, PageIndex, PageSize); if (datas != null && datas.Data != null && datas.Success) { @@ -929,9 +1061,9 @@ namespace BBWY.Client.ViewModels.PackTask } Thread.Sleep(500); - //任务状态为待质检 - var packtasks = PackTaskList.Where(p => p.TaskState == Models.TaskState.待质检 && p.QualityCompletionOverTime != null).ToList(); - if (packtasks.Count() > 0&& TaskState == Models.TaskState.待质检) + //任务状态为待验收 + var packtasks = PackTaskList.Where(p => p.TaskState == Models.TaskState.待验收 && p.QualityCompletionOverTime != null).ToList(); + if (packtasks.Count() > 0 && TaskState == Models.TaskState.待验收) { //if (qualityOverTimeThread!=null) //{ @@ -974,7 +1106,7 @@ namespace BBWY.Client.ViewModels.PackTask } var packCompletedTasks = PackTaskList.Where(p => p.TaskState == Models.TaskState.待打包 && p.PackCompletionOverTime != null).ToList(); - if (packCompletedTasks.Count() > 0&& TaskState== Models.TaskState.待打包) + if (packCompletedTasks.Count() > 0 && TaskState == Models.TaskState.待打包) { //if (packOverTimeThread!=null) //{ @@ -1026,6 +1158,17 @@ namespace BBWY.Client.ViewModels.PackTask }); } + private void IsLoadWaitTransportCount() + { + var res = sealBoxService.GetWareTransportCounts(); + if (res != null && res.Success && res.Data != null) + { + WaitTransportCloudWareCount = res.Data.WaitTransportCloudWareCount; + WaitTransportJuShuiTanCount = res.Data.WaitTransportJuShuiTanCount; + WaitTransportStoreWareCount= res.Data.WaitTransportStoreWareCount; + WaitTransportJDWareCount = res.Data.WaitTransportJDWareCount; + } + } private void IsLoadSealBoxCount() { @@ -1062,6 +1205,7 @@ namespace BBWY.Client.ViewModels.PackTask WaitSealBoxCount = packTaskResult.Data.WaitSealBox?.ToString(); WaitFallWareCount = packTaskResult.Data.WaitFallWareCount?.ToString(); WaitCompleted = packTaskResult.Data.WaitCompleted?.ToString(); + WaitTransportCount = packTaskResult.Data.WaitTransportCount?.ToString(); })); } } diff --git a/BBWY.Client/Views/BatchPurchase/BatchPurchaseOrderList.xaml b/BBWY.Client/Views/BatchPurchase/BatchPurchaseOrderList.xaml index d8b78a8d..bae9a179 100644 --- a/BBWY.Client/Views/BatchPurchase/BatchPurchaseOrderList.xaml +++ b/BBWY.Client/Views/BatchPurchase/BatchPurchaseOrderList.xaml @@ -128,10 +128,10 @@ Background="{Binding PurchaseOrderState,Converter={StaticResource objConverter},ConverterParameter=待收货:#8080FF:#F2F2F2}" Foreground="{Binding PurchaseOrderState,Converter={StaticResource objConverter},ConverterParameter=待收货:White:#4A4A4A}" Command="{Binding SetPurchaseOrderStateCommand}" CommandParameter="{x:Static cmodel:PurchaseOrderState.待收货}"/> - + diff --git a/BBWY.Client/Views/FallWare/SetCloudWareBoxWindow.xaml.cs b/BBWY.Client/Views/FallWare/SetCloudWareBoxWindow.xaml.cs index e357fde1..cc441b07 100644 --- a/BBWY.Client/Views/FallWare/SetCloudWareBoxWindow.xaml.cs +++ b/BBWY.Client/Views/FallWare/SetCloudWareBoxWindow.xaml.cs @@ -30,11 +30,11 @@ namespace BBWY.Client.Views.FallWare JDWareBoxModel = model; InitializeComponent(); - this.DataContext = JDWareBoxModel; + this.DataContext =this ; if (!isEnabled) { - this.jd_box.IsEnabled = isEnabled; - this.btn_save.Visibility = Visibility.Collapsed; + //this.jd_box.IsEnabled = isEnabled; + //this.btn_save.Visibility = Visibility.Collapsed; } } public JDWareBoxModel JDWareBoxModel { get; set; } @@ -43,7 +43,7 @@ namespace BBWY.Client.Views.FallWare private Action ReflashWindow { get; set; } - private WareType WareType { get; set; } + public WareType WareType { get; set; } private void BButton_Click(object sender, RoutedEventArgs e) { diff --git a/BBWY.Client/Views/FallWare/SetJDWareBoxWindow.xaml b/BBWY.Client/Views/FallWare/SetJDWareBoxWindow.xaml index 960e1124..eb41b156 100644 --- a/BBWY.Client/Views/FallWare/SetJDWareBoxWindow.xaml +++ b/BBWY.Client/Views/FallWare/SetJDWareBoxWindow.xaml @@ -39,7 +39,7 @@ - + @@ -50,7 +50,7 @@ - + @@ -78,23 +78,23 @@ - + - + - + - - + - + @@ -107,7 +107,7 @@ - + diff --git a/BBWY.Client/Views/FallWare/SetJDWareBoxWindow.xaml.cs b/BBWY.Client/Views/FallWare/SetJDWareBoxWindow.xaml.cs index 6803449e..1102aee2 100644 --- a/BBWY.Client/Views/FallWare/SetJDWareBoxWindow.xaml.cs +++ b/BBWY.Client/Views/FallWare/SetJDWareBoxWindow.xaml.cs @@ -33,8 +33,8 @@ namespace BBWY.Client.Views.FallWare this.DataContext = JDWareBoxModel; if (!isEnabled) { - this.jd_box.IsEnabled = isEnabled; - this.btn_save.Visibility = Visibility.Collapsed; + //this.jd_box.IsEnabled = isEnabled; + //this.btn_save.Visibility = Visibility.Collapsed; } diff --git a/BBWY.Client/Views/PackTask/TaskList.xaml b/BBWY.Client/Views/PackTask/TaskList.xaml index a4c225d1..43cd76c7 100644 --- a/BBWY.Client/Views/PackTask/TaskList.xaml +++ b/BBWY.Client/Views/PackTask/TaskList.xaml @@ -84,9 +84,9 @@ - + @@ -120,8 +120,8 @@ /> - diff --git a/BBWY.Client/Views/PackTask/WaitPackageControl.xaml b/BBWY.Client/Views/PackTask/WaitPackageControl.xaml index 3e1f824f..fe05e0d4 100644 --- a/BBWY.Client/Views/PackTask/WaitPackageControl.xaml +++ b/BBWY.Client/Views/PackTask/WaitPackageControl.xaml @@ -114,7 +114,7 @@ CommandParameter="{Binding TaskId}" Margin=" 5,0,7,0"/> - --> @@ -118,7 +119,7 @@ - + @@ -156,8 +157,8 @@ /> - - @@ -203,11 +204,13 @@ /> - + - + + + -