diff --git a/BBWY.Client/APIServices/QiKu/PackTaskService.cs b/BBWY.Client/APIServices/QiKu/PackTaskService.cs index 4afc9182..9d06354d 100644 --- a/BBWY.Client/APIServices/QiKu/PackTaskService.cs +++ b/BBWY.Client/APIServices/QiKu/PackTaskService.cs @@ -178,6 +178,8 @@ namespace BBWY.Client.APIServices , null, HttpMethod.Post); } + + public ApiResponse SaveBarCode(BarCodeRequest barCodeModel) { return SendRequest(globalContext.QKApiHost, "api/PackTask/CommitBarCode", barCodeModel @@ -283,6 +285,11 @@ namespace BBWY.Client.APIServices return SendRequest(globalContext.QKApiHost, $"api/PackTask/StoreGetBySelf?TaskId={taskId}", null, null, HttpMethod.Post); } + public ApiResponse CompletedPackTask(long taskId) + { + return SendRequest(globalContext.QKApiHost, $"api/PackTask/CompletedPackTask?taskId={taskId}", null, null, HttpMethod.Post); + } + } public class CompeteSealBox diff --git a/BBWY.Client/Models/APIModel/Request/QualityTaskRequest.cs b/BBWY.Client/Models/APIModel/Request/QualityTaskRequest.cs index 8bc501e2..9dfb4894 100644 --- a/BBWY.Client/Models/APIModel/Request/QualityTaskRequest.cs +++ b/BBWY.Client/Models/APIModel/Request/QualityTaskRequest.cs @@ -88,10 +88,10 @@ namespace BBWY.Client.Models.APIModel.Request /// public int GoodProductQuantity { get; set; } - /// - /// 预计完成时间 - /// - public DateTime? PreCompeteTime { get; set; } + ///// + ///// 预计完成时间 + ///// + //public DateTime? PreCompeteTime { get; set; } /// /// 地拖摆放编号 diff --git a/BBWY.Client/Models/APIModel/Response/BatchPurchase/PurchaseOrderV2Response.cs b/BBWY.Client/Models/APIModel/Response/BatchPurchase/PurchaseOrderV2Response.cs index 29d69414..4f475be3 100644 --- a/BBWY.Client/Models/APIModel/Response/BatchPurchase/PurchaseOrderV2Response.cs +++ b/BBWY.Client/Models/APIModel/Response/BatchPurchase/PurchaseOrderV2Response.cs @@ -5,6 +5,11 @@ namespace BBWY.Client.Models { public class PurchaseOrderV2Response { + + /// + /// 拳探订单独有Sn号 + /// + public string OrderSn { get; set; } /// /// 采购单号 /// diff --git a/BBWY.Client/Models/APIModel/Response/PackTask/SearchTaskListResponse.cs b/BBWY.Client/Models/APIModel/Response/PackTask/SearchTaskListResponse.cs index f76bb8b0..6031094d 100644 --- a/BBWY.Client/Models/APIModel/Response/PackTask/SearchTaskListResponse.cs +++ b/BBWY.Client/Models/APIModel/Response/PackTask/SearchTaskListResponse.cs @@ -169,5 +169,48 @@ namespace BBWY.Client.Models.APIModel /// 地托编号 /// public int? FloorDragNumber { get; set; } + + /// + /// 质检超时时间 + /// + public DateTime? QualityCompletionOverTime { get; set; } + + /// + /// 打包完成时间(超时时间) + /// + public DateTime? PackCompletionOverTime { get; set; } + + + /// + /// 物流信息 + /// + public List ExpressOrderList { get; set; } + } + public class ExpressOrderResponse + { + /// + /// 快递单号 + /// + public string WaybillNo { get; set; } + + /// + /// 物流状态 (ZaiTu,LanShou,QianShou,PaiJian,Unknow) + /// + public string ExpressState { get; set; } + + /// + /// 物流内容 + /// + public string ExpressContent { get; set; } + + /// + /// 目标快递公司名称(kuaidi100) + /// + public string TargetExpressName { get; set; } + + /// + /// 变更时间 + /// + public DateTime? ExpressChangedTime { get; set; } } } diff --git a/BBWY.Client/Models/APIModel/Response/SealBox/GetWareSealBoxResponse.cs b/BBWY.Client/Models/APIModel/Response/SealBox/GetWareSealBoxResponse.cs index 2e78c144..092cb437 100644 --- a/BBWY.Client/Models/APIModel/Response/SealBox/GetWareSealBoxResponse.cs +++ b/BBWY.Client/Models/APIModel/Response/SealBox/GetWareSealBoxResponse.cs @@ -19,6 +19,11 @@ namespace BBWY.Client.Models.APIModel public class WareSealBoxData { + /// + /// 过期时间 + /// + public DateTime? SealBoxPackOverTime { get; set; } + public long SealBoxId { get; set; } /// /// 店铺Id diff --git a/BBWY.Client/Models/Enums.cs b/BBWY.Client/Models/Enums.cs index ecb2ce73..2de89d87 100644 --- a/BBWY.Client/Models/Enums.cs +++ b/BBWY.Client/Models/Enums.cs @@ -243,7 +243,9 @@ 已取消 = 7, 待落仓 = 8, 待完结 = 9, - 商家自取 = 10 + 商家自取 = 10, + 待转运=11 + } diff --git a/BBWY.Client/Models/FallWare/FallWareConfiguredModel.cs b/BBWY.Client/Models/FallWare/FallWareConfiguredModel.cs index 8e2631d0..27948b13 100644 --- a/BBWY.Client/Models/FallWare/FallWareConfiguredModel.cs +++ b/BBWY.Client/Models/FallWare/FallWareConfiguredModel.cs @@ -5,7 +5,7 @@ using System.Text; namespace BBWY.Client.Models.FallWare { - public class FallWareConfiguredModel + public class FallWareConfiguredModel:NotifyObject { /// /// 商品名称 /// @@ -48,10 +48,23 @@ namespace BBWY.Client.Models.FallWare /// public int SealBoxTotalCount { get; set; } + /// + /// 提交采购单过期时间 + /// + public DateTime? SetPurchaseOrderOverTime { get; set; } /// /// 仓库任务列表 /// public IList SealBoxConfigureTasks { 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 FallWareConfigureTask : SealBoxConfigureTask { diff --git a/BBWY.Client/Models/PackTask/PackTaskModel.cs b/BBWY.Client/Models/PackTask/PackTaskModel.cs index 9d46cf3b..96416289 100644 --- a/BBWY.Client/Models/PackTask/PackTaskModel.cs +++ b/BBWY.Client/Models/PackTask/PackTaskModel.cs @@ -1,4 +1,5 @@ using BBWY.Client.APIServices; +using BBWY.Client.Models.APIModel; using BBWY.Client.Models.APIModel.Response.PackTask; using BBWY.Client.ViewModels; using BBWY.Client.ViewModels.PackTask; @@ -26,14 +27,9 @@ namespace BBWY.Client.Models private bool isShowFees; public bool IsShowFees { get => isShowFees; set { Set(ref isShowFees, value); } } - private long id; - public long Id { get => id; set { Set(ref id, value); } } - - public ICommand PrintBarcodeCommand { get; set; } - public ICommand PrintCerCommand { get; set; } public ICommand LookCerCommand { get; set; } public ICommand LookBarCommand { get; set; } @@ -42,15 +38,8 @@ namespace BBWY.Client.Models /// 修改任务 /// public ICommand UpdateTaskCommand { get; set; } - public ICommand QualityTaskCommand { get; set; } - - - public Action ReflashTask { get; set; } - - - private void UpdateTask() { @@ -64,19 +53,6 @@ namespace BBWY.Client.Models PublishTaskWindow publish = new PublishTaskWindow(ReflashTask, this); publish.Show(); - - //CreatePackTask create = new CreatePackTask(); - - //ViewModelLocator viewModel = new ViewModelLocator(); - //var createViewModel = viewModel.CreateTaskView; - //if (createViewModel.ReflashWindow == null) - //{ - // createViewModel.ReflashWindow = ReflashTask; - //} - //create.SendData(this);//初始化数据 - //create.ShowDialog(); - - } @@ -408,13 +384,49 @@ namespace BBWY.Client.Models public string OrderId { get; set; } private int? floorDragNumber; public int? FloorDragNumber { get => floorDragNumber; set { Set(ref floorDragNumber, value); } } + + private string qualityRemainTime; + /// + /// 质检剩余时间 + /// + public string QualityRemainTime { get => qualityRemainTime; set { Set(ref qualityRemainTime, value); } } + + private bool isQualityOverTime; + public bool IsQualityOverTime { get => isQualityOverTime; set { Set(ref isQualityOverTime, value); } } + + /// + /// 质检超时时间 + /// + public DateTime? QualityCompletionOverTime { get; set; } + + + + + private string packRemainTime; + /// + /// 打包剩余时间 + /// + public string PackRemainTime { get => packRemainTime; set { Set(ref packRemainTime, value); } } + + /// + /// 打包完成时间(超时时间) + /// + public DateTime? PackCompletionOverTime { get; set; } + + private bool isPackOverTime; + public bool IsPackOverTime { get => isPackOverTime; set { Set(ref isPackOverTime, value); } } + /// + /// 物流信息 + /// + public List ExpressOrderList { get; set; } + } public class SkuMessage : NotifyObject { - private string id; + private string skuId; - public string Id { get => id; set { Set(ref id, value); } } + public string SkuId { get => skuId; set { Set(ref skuId, value); } } /// /// 店铺Sku图链接 diff --git a/BBWY.Client/Models/PackTask/SealBoxModel.cs b/BBWY.Client/Models/PackTask/SealBoxModel.cs index d9afe1e1..075d2c6e 100644 --- a/BBWY.Client/Models/PackTask/SealBoxModel.cs +++ b/BBWY.Client/Models/PackTask/SealBoxModel.cs @@ -5,8 +5,11 @@ using System.Text; namespace BBWY.Client.Models.PackTask { - public class SealBoxModel - { + public class SealBoxModel : NotifyObject + { /// + /// 过期时间 + /// + public DateTime? SealBoxPackOverTime { get; set; } /// /// /封箱id /// @@ -43,10 +46,19 @@ namespace BBWY.Client.Models.PackTask /// public List SealBoxSkus { get; set; } - /// /// 封箱数 /// - public int? SealBoxCount{ get; set; } + private int? sealBoxCount; + /// + /// 封箱数 + /// + public int? SealBoxCount { get => sealBoxCount; set { Set(ref sealBoxCount, value); } } + + private string sealBoxRemainTime; + public string SealBoxRemainTime { get => sealBoxRemainTime; set { Set(ref sealBoxRemainTime, value); } } + + private bool isSealBoxOverTime; + public bool IsSealBoxOverTime { get => isSealBoxOverTime; set { Set(ref isSealBoxOverTime, value); } } } } diff --git a/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs b/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs index 1e1c5dea..c9f6eaa9 100644 --- a/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs +++ b/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs @@ -278,20 +278,20 @@ namespace BBWY.Client.ViewModels.PackTask PurchaseOrder = fallware.PurchaseOrder, WaybillNo = fallware.WaybillNo }; - if (fallware.WareType== WareType.京仓) - { + //if (fallware.WareType== WareType.京仓) + //{ //SetJDWareBoxWindow window = new SetJDWareBoxWindow(model,sealBoxService,fallware.WareType.Value,ReflashTask); //window.Show(); var w = new SetJDWareBoxWindow2(model, sealBoxService, fallware.WareType.Value, ReflashTask); w.ShowDialog(); - } - if (fallware.WareType == WareType.云仓) - { + //} + //if (fallware.WareType == WareType.云仓) + //{ - SetCloudWareBoxWindow window = new SetCloudWareBoxWindow(model, sealBoxService, fallware.WareType.Value, ReflashTask); - window.Show(); - } + // SetCloudWareBoxWindow window = new SetCloudWareBoxWindow(model, sealBoxService, fallware.WareType.Value, ReflashTask); + // window.Show(); + //} } private void UpdateSealBoxConfigured(SealBoxConfiguredModel model) @@ -469,11 +469,21 @@ namespace BBWY.Client.ViewModels.PackTask private List waitSealBoxTaskStates = new List { Models.TaskState.待落仓, Models.TaskState.待封箱 };//配置封箱的任务状态范围 + + + + + + + + private bool IsStartThread = false; + private Thread fallwareOverTimeThread = null; /// /// 搜索任务列表 /// public void SearchTaskList() { + IsStartThread = false; long? taskId = null; try { @@ -520,7 +530,7 @@ namespace BBWY.Client.ViewModels.PackTask { BrandName = item.BrandName, GoodsNo = item.ProductItemNum, Logo= item.Logo, ShopName = item.ShopName, SkuName = item.SkuName, - Id = item.SkuId + SkuId = item.SkuId } }, MarkMessage = item.MarkMessage, @@ -696,6 +706,50 @@ namespace BBWY.Client.ViewModels.PackTask FallWareWaitConfigureList.Add(item); })); } + + Thread.Sleep(100); + var fallWareTasks = FallWareWaitConfigureList.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(); + + + } + } if (SealBoxConfigureType == SealBoxConfigureType.已配置) { diff --git a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs index 9f917b6b..39b80534 100644 --- a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs +++ b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs @@ -25,13 +25,14 @@ using BBWY.Client.Views.SealBox; using BBWY.Client.Views.FallWare; using BBWY.Client.Models.FallWare; using WebSocketSharp; +using System.Threading; namespace BBWY.Client.ViewModels.PackTask { public partial class WareHouseListViewModel : BaseVM, IDenpendency//注入服务 { - + //public RelayCommand SelectCmd => new RelayCommand(str => Growl.Info(str)); #region 属性绑定 private string searchWayBillNo; @@ -294,17 +295,51 @@ namespace BBWY.Client.ViewModels.PackTask DeletedTaskCommand = new RelayCommand(DeletedTask); - StoreGetBySelfCommand = new RelayCommand(StoreGetBySelf); + StoreGetBySelfCommand = new RelayCommand(StoreGetBySelf); + + CompletedPackTaskCommand = new RelayCommand(CompletedPackTask); + + } - private void StoreGetBySelf(object obj) + private void CompletedPackTask(object obj) { - var packTaskmodel = (PackTaskModel)obj; - MessageBoxResult result = System.Windows.MessageBox.Show($"确定商家自取,任务id:{packTaskmodel.TaskId}?", "提示", + var model = (PackTaskModel)obj; + + if (model == null || model.FeesItemResponse == null || model.FeesItemResponse.DiscountAllFees == 0) + { + System.Windows.MessageBox.Show("请先设置打包费用!"); + return; + } + if (System.Windows.MessageBox.Show("是否完成打包?", "提示", + MessageBoxButton.YesNo, + MessageBoxImage.Warning) != MessageBoxResult.Yes) + return; + var res = packTaskService.CompletedPackTask(model.TaskId); + if (res == null) + { + return; + } + if (!res.Success) + { + System.Windows.MessageBox.Show(res.Msg); + return; + } + Task.Factory.StartNew(() => SearchTaskList()); + } + + private void StoreGetBySelf(long taskId) + { + + MessageBoxResult result = System.Windows.MessageBox.Show($"确定商家自取,任务id:{taskId}?", "提示", MessageBoxButton.YesNo, MessageBoxImage.Warning); if (result != MessageBoxResult.Yes) return; - var res = packTaskService.StoreGetBySelf(packTaskmodel.TaskId); + var res = packTaskService.StoreGetBySelf(taskId); + if (res == null) + { + return; + } if (!res.Success) { System.Windows.MessageBox.Show(res.Msg, "错误信息"); @@ -446,6 +481,8 @@ namespace BBWY.Client.ViewModels.PackTask public ICommand CompeteFallWareCommand { get; set; } public ICommand CompeteSealBoxCommand { get; set; } + public ICommand CompletedPackTaskCommand { get; set; } + public ICommand SetTaskStatusCommand { get; set; } /// /// 打开图片链接 @@ -570,8 +607,6 @@ namespace BBWY.Client.ViewModels.PackTask case Models.TaskState.待封箱: break; case Models.TaskState.待出库: - - break; case Models.TaskState.已完成: break; @@ -608,13 +643,16 @@ namespace BBWY.Client.ViewModels.PackTask } - - + private bool IsStartThread = false; + private Thread qualityOverTimeThread = null; + private Thread packOverTimeThread = null; + private Thread sealboxOverTimeThread = null; /// /// 搜索任务列表 /// public void SearchTaskList() { + IsStartThread = false; long? taskId = null; try { @@ -706,9 +744,49 @@ namespace BBWY.Client.ViewModels.PackTask WareId = item.WareId, WareName = item.WareName, SealBoxId = item.SealBoxId, + SealBoxPackOverTime= item .SealBoxPackOverTime }); })); + } + Thread.Sleep(500); + var sealboxTasks = WaitSealBoxModels.Where(p => p.SealBoxPackOverTime != 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.SealBoxPackOverTime.Value.Subtract(DateTime.Now); + if (datetime.TotalMilliseconds > 0) + { + item.IsSealBoxOverTime = false; + item.SealBoxRemainTime = $"{datetime.Hours}小时{datetime.Minutes}分"; + } + else + { + item.IsSealBoxOverTime = true; + item.SealBoxRemainTime = datetime.Days==0? $"{-datetime.Hours}小时{-datetime.Minutes}分" :$"{-datetime.Days}天{-datetime.Hours}小时{-datetime.Minutes}分"; + } + + } + })); + Thread.Sleep(1000); + } + + }); + //任务倒计时数据 + sealboxOverTimeThread.IsBackground = true; + sealboxOverTimeThread.Start(); + + } } else @@ -761,6 +839,7 @@ namespace BBWY.Client.ViewModels.PackTask else Task.Factory.StartNew(() => { + PackTaskList = new ObservableCollection();//初始化数据 var datas = packTaskService.GetWareHouseList(SearchWayBillNo, SearchExpressName, IsWorry, SearchDepartment, SearchSkuId, SearchTaskId, StartTime, EndTime, (this.TaskState), SearchShopName, @@ -785,7 +864,7 @@ namespace BBWY.Client.ViewModels.PackTask { BrandName = item.BrandName, GoodsNo = item.ProductItemNum, Logo= item.Logo, ShopName = item.ShopName, SkuName = item.SkuName, - Id = item.SkuId + SkuId = item.SkuId } }, MarkMessage = item.MarkMessage, @@ -800,8 +879,9 @@ namespace BBWY.Client.ViewModels.PackTask SkuId = item.SkuId, SkuName = item.SkuName, FloorDragNumber = item.FloorDragNumber, - - + QualityCompletionOverTime = item.QualityCompletionOverTime, + PackCompletionOverTime = item.PackCompletionOverTime, + ExpressOrderList = item.ExpressOrderList, }; if (item.BarCodeDTO != null && item.BarCodeDTO.Id > 0) { @@ -814,7 +894,6 @@ namespace BBWY.Client.ViewModels.PackTask data.CertificateModel = item.Cers; } - data.ReflashTask = ReflashTask; if (item.FeesItemResponse != null) @@ -842,7 +921,97 @@ namespace BBWY.Client.ViewModels.PackTask 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(); + //} + + qualityOverTimeThread = new Thread(() => + { + IsStartThread = true; + while (IsStartThread) + { + App.Current.Dispatcher.BeginInvoke(new Action(() => + { + foreach (var item in packtasks) + { + var datetime = item.QualityCompletionOverTime.Value.Subtract(DateTime.Now); + if (datetime.TotalMilliseconds > 0) + { + item.IsQualityOverTime = false; + //item.QualityRemainTime = $"{datetime.Days}天{datetime.Hours}小时{datetime.Minutes}分{datetime.Seconds}秒"; + item.QualityRemainTime = $"{datetime.Days}天{datetime.Hours}小时{datetime.Minutes}分"; + } + else + { + item.IsQualityOverTime = true; + //item.QualityRemainTime = $"{-datetime.Days}天{-datetime.Hours}小时{-datetime.Minutes}分{-datetime.Seconds}秒"; + item.QualityRemainTime = $"{-datetime.Days}天{-datetime.Hours}小时{-datetime.Minutes}分"; + } + + } + })); + Thread.Sleep(1000); + } + + }); + //任务倒计时数据 + qualityOverTimeThread.IsBackground = true; + 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(() => + { + IsStartThread = true; + while (IsStartThread) + { + App.Current.Dispatcher.BeginInvoke(new Action(() => + { + foreach (var item in packCompletedTasks) + { + var datetime = item.PackCompletionOverTime.Value.Subtract(DateTime.Now); + 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); + } + + }); + //任务倒计时数据 + packOverTimeThread.IsBackground = true; + packOverTimeThread.Start(); + + + } + + //任务状态为待打包 + } else { @@ -852,6 +1021,7 @@ namespace BBWY.Client.ViewModels.PackTask }); } + private void IsLoadSealBoxCount() { var res = sealBoxService.GetWareSealBoxConfigureCounts(); diff --git a/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs b/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs index 6af8f472..4742911a 100644 --- a/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs +++ b/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs @@ -42,10 +42,10 @@ namespace BBWY.Client.ViewModels /// public int GoodProductQuantity { get => goodProductQuantity; set { Set(ref goodProductQuantity, value); } } - /// - /// 预计完成时间 - /// - public DateTime? PreCompeteTime { get; set; } + ///// + ///// 预计完成时间 + ///// + //public DateTime? PreCompeteTime { get; set; } private ObservableCollection purchaseSkuList; public ObservableCollection PurchaseSkuList { get => purchaseSkuList; set { Set(ref purchaseSkuList, value); } } @@ -108,42 +108,42 @@ namespace BBWY.Client.ViewModels - private ObservableCollection preCompeteTimeDayList = new ObservableCollection - { + //private ObservableCollection preCompeteTimeDayList = new ObservableCollection + //{ - }; - public ObservableCollection PreCompeteTimeDayList - { - get => preCompeteTimeDayList; set - { + //}; + //public ObservableCollection PreCompeteTimeDayList + //{ + // get => preCompeteTimeDayList; set + // { - Set(ref preCompeteTimeDayList, value); + // Set(ref preCompeteTimeDayList, value); - } - } + // } + //} - private ObservableCollection preCompeteTimeHourList = new ObservableCollection { + //private ObservableCollection preCompeteTimeHourList = new ObservableCollection { - }; - public ObservableCollection PreCompeteTimeHourList { get => preCompeteTimeHourList; set { Set(ref preCompeteTimeHourList, value); } } + // }; + //public ObservableCollection PreCompeteTimeHourList { get => preCompeteTimeHourList; set { Set(ref preCompeteTimeHourList, value); } } - // - public string preCompeteTimeDay; - public string PreCompeteTimeDay - { - get => preCompeteTimeDay; set - { + //// + //public string preCompeteTimeDay; + //public string PreCompeteTimeDay + //{ + // get => preCompeteTimeDay; set + // { - Set(ref preCompeteTimeDay, value); - PreCompeteTimeDayOnChanged();// - } - } + // Set(ref preCompeteTimeDay, value); + // PreCompeteTimeDayOnChanged();// + // } + //} - public string preCompeteTimeHour; - public string PreCompeteTimeHour { get => preCompeteTimeHour; set { Set(ref preCompeteTimeHour, value); } } + //public string preCompeteTimeHour; + //public string PreCompeteTimeHour { get => preCompeteTimeHour; set { Set(ref preCompeteTimeHour, value); } } private ObservableCollection wareHourseList = new ObservableCollection { }; @@ -499,77 +499,77 @@ namespace BBWY.Client.ViewModels } - int hour = Convert.ToInt32(PreCompeteTimeHour.Replace("点前", "")); - - - DateTime date = DateTime.Now; - - switch (preCompeteTimeDay) - { - case "今天": - date = DateTime.Now; - break; - case "明天": - date = DateTime.Now.AddDays(1); - break; - case "后天": - date = DateTime.Now.AddDays(2); - break; - default: - break; - } - - //date = Convert.ToDateTime(PreCompeteTimeDay); - - - var competeTime = date.Date.AddHours(hour); - - - - if (competeTime < DateTime.Now) - { - MessageBox.Show($"预计完成时间不能小于当前时间,请重新选择预计完成时间"); - return; - } - - - var now = DateTime.Now; - if (now.Hour < 12) - { - if (competeTime > now.AddDays(1).Date.AddHours(12)) - { - MessageBox.Show($"预计完成时间不能超过明天12点,请重新选择预计完成时间"); - return; - } - - - } - else if (now.Hour < 18) - { - if (competeTime > now.AddDays(1).Date.AddHours(18)) - { - MessageBox.Show($"预计完成时间不能超过明天18点,请重新选择预计完成时间"); - return; - } - } - else if (now.Hour < 22) - { - if (competeTime > now.AddDays(1).Date.AddHours(22)) - { - MessageBox.Show($"预计完成时间不能超过明天22点,请重新选择预计完成时间"); - return; - } - } - else - { - if (competeTime > now.AddDays(2).Date.AddHours(12)) - { - MessageBox.Show($"预计完成时间不能超过后天12点,请重新选择预计完成时间"); - return; - } - } - - request.PreCompeteTime = competeTime; + //int hour = Convert.ToInt32(PreCompeteTimeHour.Replace("点前", "")); + + + //DateTime date = DateTime.Now; + + //switch (preCompeteTimeDay) + //{ + // case "今天": + // date = DateTime.Now; + // break; + // case "明天": + // date = DateTime.Now.AddDays(1); + // break; + // case "后天": + // date = DateTime.Now.AddDays(2); + // break; + // default: + // break; + //} + + ////date = Convert.ToDateTime(PreCompeteTimeDay); + + + //var competeTime = date.Date.AddHours(hour); + + + + //if (competeTime < DateTime.Now) + //{ + // MessageBox.Show($"预计完成时间不能小于当前时间,请重新选择预计完成时间"); + // return; + //} + + + //var now = DateTime.Now; + //if (now.Hour < 12) + //{ + // if (competeTime > now.AddDays(1).Date.AddHours(12)) + // { + // MessageBox.Show($"预计完成时间不能超过明天12点,请重新选择预计完成时间"); + // return; + // } + + + //} + //else if (now.Hour < 18) + //{ + // if (competeTime > now.AddDays(1).Date.AddHours(18)) + // { + // MessageBox.Show($"预计完成时间不能超过明天18点,请重新选择预计完成时间"); + // return; + // } + //} + //else if (now.Hour < 22) + //{ + // if (competeTime > now.AddDays(1).Date.AddHours(22)) + // { + // MessageBox.Show($"预计完成时间不能超过明天22点,请重新选择预计完成时间"); + // return; + // } + //} + //else + //{ + // if (competeTime > now.AddDays(2).Date.AddHours(12)) + // { + // MessageBox.Show($"预计完成时间不能超过后天12点,请重新选择预计完成时间"); + // return; + // } + //} + + //request.PreCompeteTime = competeTime; try @@ -610,94 +610,94 @@ namespace BBWY.Client.ViewModels } - // "12点前","18点前","22点前" - private void PreCompeteTimeDayOnChanged() - { - var now = DateTime.Now; - if (now.Hour < 12) - { - if (PreCompeteTimeDay=="今天") - { - PreCompeteTimeHourList.Clear(); - PreCompeteTimeHourList.Add("12点前"); - PreCompeteTimeHourList.Add("18点前"); - PreCompeteTimeHourList.Add("22点前"); - PreCompeteTimeHour = "12点前"; - } - - - if (PreCompeteTimeDay == "明天") - { - PreCompeteTimeHourList.Clear(); - PreCompeteTimeHourList.Add("12点前"); - PreCompeteTimeHour = "12点前"; - } - - - } - else if (now.Hour < 18) - { - if (PreCompeteTimeDay == "今天") - { - PreCompeteTimeHourList.Clear(); - PreCompeteTimeHourList.Add("18点前"); - PreCompeteTimeHourList.Add("22点前"); - - PreCompeteTimeHour = "18点前"; - } - - - if (PreCompeteTimeDay == "明天") - { - PreCompeteTimeHourList.Clear(); - PreCompeteTimeHourList.Add("12点前"); - PreCompeteTimeHourList.Add("18点前"); - PreCompeteTimeHour = "12点前"; - } - } - else if (now.Hour < 22) - { - if (PreCompeteTimeDay == "今天") - { - PreCompeteTimeHourList.Clear(); - PreCompeteTimeHourList.Add("22点前"); - PreCompeteTimeHour = "22点前"; - } - - - if (PreCompeteTimeDay == "明天") - { - PreCompeteTimeHourList.Clear(); - PreCompeteTimeHourList.Add("12点前"); - PreCompeteTimeHourList.Add("18点前"); - PreCompeteTimeHourList.Add("22点前"); - PreCompeteTimeHour = "12点前"; - } - } - else - { - if (PreCompeteTimeDay == "明天") - { - PreCompeteTimeHourList.Clear(); - PreCompeteTimeHourList.Add("12点前"); - PreCompeteTimeHourList.Add("18点前"); - PreCompeteTimeHourList.Add("22点前"); - PreCompeteTimeHour = "12点前"; - } - - if (PreCompeteTimeDay == "后天") - { - PreCompeteTimeHourList.Clear(); - PreCompeteTimeHourList.Add("12点前"); - PreCompeteTimeHour = "12点前"; - } - } - - - - - - } + //// "12点前","18点前","22点前" + //private void PreCompeteTimeDayOnChanged() + //{ + // var now = DateTime.Now; + // if (now.Hour < 12) + // { + // if (PreCompeteTimeDay=="今天") + // { + // PreCompeteTimeHourList.Clear(); + // PreCompeteTimeHourList.Add("12点前"); + // PreCompeteTimeHourList.Add("18点前"); + // PreCompeteTimeHourList.Add("22点前"); + // PreCompeteTimeHour = "12点前"; + // } + + + // if (PreCompeteTimeDay == "明天") + // { + // PreCompeteTimeHourList.Clear(); + // PreCompeteTimeHourList.Add("12点前"); + // PreCompeteTimeHour = "12点前"; + // } + + + // } + // else if (now.Hour < 18) + // { + // if (PreCompeteTimeDay == "今天") + // { + // PreCompeteTimeHourList.Clear(); + // PreCompeteTimeHourList.Add("18点前"); + // PreCompeteTimeHourList.Add("22点前"); + + // PreCompeteTimeHour = "18点前"; + // } + + + // if (PreCompeteTimeDay == "明天") + // { + // PreCompeteTimeHourList.Clear(); + // PreCompeteTimeHourList.Add("12点前"); + // PreCompeteTimeHourList.Add("18点前"); + // PreCompeteTimeHour = "12点前"; + // } + // } + // else if (now.Hour < 22) + // { + // if (PreCompeteTimeDay == "今天") + // { + // PreCompeteTimeHourList.Clear(); + // PreCompeteTimeHourList.Add("22点前"); + // PreCompeteTimeHour = "22点前"; + // } + + + // if (PreCompeteTimeDay == "明天") + // { + // PreCompeteTimeHourList.Clear(); + // PreCompeteTimeHourList.Add("12点前"); + // PreCompeteTimeHourList.Add("18点前"); + // PreCompeteTimeHourList.Add("22点前"); + // PreCompeteTimeHour = "12点前"; + // } + // } + // else + // { + // if (PreCompeteTimeDay == "明天") + // { + // PreCompeteTimeHourList.Clear(); + // PreCompeteTimeHourList.Add("12点前"); + // PreCompeteTimeHourList.Add("18点前"); + // PreCompeteTimeHourList.Add("22点前"); + // PreCompeteTimeHour = "12点前"; + // } + + // if (PreCompeteTimeDay == "后天") + // { + // PreCompeteTimeHourList.Clear(); + // PreCompeteTimeHourList.Add("12点前"); + // PreCompeteTimeHour = "12点前"; + // } + // } + + + + + + //} private void SetBarCode() @@ -936,7 +936,7 @@ namespace BBWY.Client.ViewModels FloorDragNumber = 0; PurchaseSkuList = new ObservableCollection(); WareHourseList = new ObservableCollection(); - PreCompeteTimeDayList = new ObservableCollection(); + //PreCompeteTimeDayList = new ObservableCollection(); FloorDragNumberList = new ObservableCollection(); for (int i = 0; i < 30; i++) @@ -949,40 +949,40 @@ namespace BBWY.Client.ViewModels } - var nowTime = DateTime.Now; - var hour = nowTime.Hour; + //var nowTime = DateTime.Now; + //var hour = nowTime.Hour; - if (hour < 12) - { - PreCompeteTimeDayList.Add("今天"); - PreCompeteTimeDayList.Add("明天"); + //if (hour < 12) + //{ + // PreCompeteTimeDayList.Add("今天"); + // PreCompeteTimeDayList.Add("明天"); - PreCompeteTimeDay = "今天"; + // PreCompeteTimeDay = "今天"; - } - else if (hour < 18) - { - PreCompeteTimeDayList.Add("今天"); - PreCompeteTimeDayList.Add("明天"); - PreCompeteTimeDay = "今天"; + //} + //else if (hour < 18) + //{ + // PreCompeteTimeDayList.Add("今天"); + // PreCompeteTimeDayList.Add("明天"); + // PreCompeteTimeDay = "今天"; - } - else if (hour < 22) - { - PreCompeteTimeDayList.Add("今天"); - PreCompeteTimeDayList.Add("明天"); - PreCompeteTimeDay = "今天"; + //} + //else if (hour < 22) + //{ + // PreCompeteTimeDayList.Add("今天"); + // PreCompeteTimeDayList.Add("明天"); + // PreCompeteTimeDay = "今天"; - } - else - { - PreCompeteTimeDayList.Add("明天"); - PreCompeteTimeDayList.Add("后天"); - PreCompeteTimeDay = "明天"; - } + //} + //else + //{ + // PreCompeteTimeDayList.Add("明天"); + // PreCompeteTimeDayList.Add("后天"); + // PreCompeteTimeDay = "明天"; + //} diff --git a/BBWY.Client/Views/BatchPurchase/BatchPurchaseOrderList.xaml b/BBWY.Client/Views/BatchPurchase/BatchPurchaseOrderList.xaml index 4349e0ca..d8b78a8d 100644 --- a/BBWY.Client/Views/BatchPurchase/BatchPurchaseOrderList.xaml +++ b/BBWY.Client/Views/BatchPurchase/BatchPurchaseOrderList.xaml @@ -199,9 +199,9 @@ - + CommandParameter="{Binding OrderSn}" Margin="5,0,0,0"/> diff --git a/BBWY.Client/Views/FallWare/FallWareWaitConfigureControl.xaml b/BBWY.Client/Views/FallWare/FallWareWaitConfigureControl.xaml index f3e85233..65f655e6 100644 --- a/BBWY.Client/Views/FallWare/FallWareWaitConfigureControl.xaml +++ b/BBWY.Client/Views/FallWare/FallWareWaitConfigureControl.xaml @@ -37,15 +37,16 @@ + - - - + + + @@ -84,6 +85,7 @@ + @@ -112,6 +114,7 @@ + @@ -207,13 +210,36 @@ - + + + + + + + + + + + + + + + + + + - + diff --git a/BBWY.Client/Views/FallWare/SetCloudWareBoxWindow.xaml b/BBWY.Client/Views/FallWare/SetCloudWareBoxWindow.xaml index 0fe85193..55f5f3c7 100644 --- a/BBWY.Client/Views/FallWare/SetCloudWareBoxWindow.xaml +++ b/BBWY.Client/Views/FallWare/SetCloudWareBoxWindow.xaml @@ -75,7 +75,7 @@ - + diff --git a/BBWY.Client/Views/FallWare/SetJDWareBoxWindow2.xaml b/BBWY.Client/Views/FallWare/SetJDWareBoxWindow2.xaml index 1fe03ced..ccf7177f 100644 --- a/BBWY.Client/Views/FallWare/SetJDWareBoxWindow2.xaml +++ b/BBWY.Client/Views/FallWare/SetJDWareBoxWindow2.xaml @@ -5,12 +5,53 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:BBWY.Client.Views.FallWare" mc:Ignorable="d" + xmlns:cmodel="clr-namespace:BBWY.Client.Models" xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls" - Title="SetJDWareBoxWindow2" Height="250" Width="250" + Title="SetJDWareBoxWindow2" Height="250" Width="300" MinButtonVisibility="Collapsed" MaxButtonVisibility="Collapsed" CloseButtonVisibility="Visible" Style="{StaticResource bwstyle}"> + + + @@ -23,10 +64,18 @@ - - + + + + - + @@ -56,6 +105,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/BBWY.Client/Views/FallWare/SetJDWareBoxWindow2.xaml.cs b/BBWY.Client/Views/FallWare/SetJDWareBoxWindow2.xaml.cs index eef4c4d6..4d6bb273 100644 --- a/BBWY.Client/Views/FallWare/SetJDWareBoxWindow2.xaml.cs +++ b/BBWY.Client/Views/FallWare/SetJDWareBoxWindow2.xaml.cs @@ -5,6 +5,8 @@ using BBWY.Controls; using System; using System.Threading.Tasks; using System.Windows; +using System.Windows.Media; +using WebSocketSharp; namespace BBWY.Client.Views.FallWare { @@ -19,7 +21,7 @@ namespace BBWY.Client.Views.FallWare private Action reflashWindow; - private WareType wareType; + public WareType wareType { get; set; } public bool IsEnabled { get; set; } public bool IsLoading { get => isLoading; set { Set(ref isLoading, value); } } @@ -36,42 +38,108 @@ namespace BBWY.Client.Views.FallWare JDWareBoxModel = model; this.IsEnabled = isEnabled; this.DataContext = this; + + switch (wareType) + { + case WareType.京仓: + btn_yuncang.IsEnabled = false; + btn_jushuitang.IsEnabled = false; + panel_jingcang.Visibility= Visibility.Visible; + panel_yuncang.Visibility= Visibility.Collapsed; + panel_jst.Visibility= Visibility.Collapsed; + break; + case WareType.云仓: + btn_jingcang.IsEnabled = false; + btn_jushuitang.IsEnabled = false; + panel_jingcang.Visibility = Visibility.Collapsed; + panel_yuncang.Visibility = Visibility.Visible; + panel_jst.Visibility = Visibility.Collapsed; + break; + case WareType.商家仓: + break; + case WareType.聚水潭齐越仓: + btn_yuncang.IsEnabled = false; + btn_jingcang.IsEnabled = false; + panel_jingcang.Visibility = Visibility.Collapsed; + panel_yuncang.Visibility = Visibility.Collapsed; + panel_jst.Visibility = Visibility.Visible; + break; + default: + break; + } + + } private void btn_save_Click(object sender, System.Windows.RoutedEventArgs e) { - if (string.IsNullOrEmpty(JDWareBoxModel.ProductTitle) || - string.IsNullOrEmpty(JDWareBoxModel.PrewOrder) || - string.IsNullOrEmpty(JDWareBoxModel.PurchaseOrder)) + + + if (wareType == WareType.京仓) { - MessageBox.Show("信息不完整", "提示"); - return; - } - IsLoading = true; - Task.Factory.StartNew(() => - { - var getDetailResponse = sealBoxService.GetJDSupplierNameAndStoreName(JDWareBoxModel.PurchaseOrder); - if (!getDetailResponse.Success) + if (string.IsNullOrEmpty(JDWareBoxModel.ProductTitle) || + string.IsNullOrEmpty(JDWareBoxModel.PrewOrder) || + string.IsNullOrEmpty(JDWareBoxModel.PurchaseOrder)) { - IsLoading = false; - this.Dispatcher.Invoke(() => MessageBox.Show(getDetailResponse.Msg, "提示")); + MessageBox.Show("信息不完整", "提示"); return; } - - var res = sealBoxService.SetFallWareConfigure(JDWareBoxModel.SealBoxId, JDWareBoxModel.ProductTitle, JDWareBoxModel.PurchaseOrder, JDWareBoxModel.PrewOrder, JDWareBoxModel.WaybillNo, getDetailResponse.Data.SupplierName, getDetailResponse.Data.StoreName); - if (!res.Success) + IsLoading = true; + Task.Factory.StartNew(() => { + var getDetailResponse = sealBoxService.GetJDSupplierNameAndStoreName(JDWareBoxModel.PurchaseOrder); + if (!getDetailResponse.Success) + { + IsLoading = false; + this.Dispatcher.Invoke(() => MessageBox.Show(getDetailResponse.Msg, "提示")); + return; + } + + var res = sealBoxService.SetFallWareConfigure(JDWareBoxModel.SealBoxId, JDWareBoxModel.ProductTitle, JDWareBoxModel.PurchaseOrder, JDWareBoxModel.PrewOrder, JDWareBoxModel.WaybillNo, getDetailResponse.Data.SupplierName, getDetailResponse.Data.StoreName); + if (!res.Success) + { + IsLoading = false; + this.Dispatcher.Invoke(() => MessageBox.Show(res.Msg, "提示")); + return; + } IsLoading = false; - this.Dispatcher.Invoke(() => MessageBox.Show(res.Msg, "提示")); + this.Dispatcher.Invoke(() => + { + reflashWindow?.Invoke(); + this.Close(); + }); + }); + return; + } + if (wareType == WareType.云仓|| wareType == WareType.聚水潭齐越仓) + { + + if (JDWareBoxModel.PurchaseOrder.IsNullOrEmpty()) + { + MessageBox.Show("采购单号不能为空"); return; } - IsLoading = false; - this.Dispatcher.Invoke(() => + Task.Factory.StartNew(() => { - reflashWindow?.Invoke(); - this.Close(); + + var res = sealBoxService.SetFallWareConfigure(JDWareBoxModel.SealBoxId, JDWareBoxModel.ProductTitle, JDWareBoxModel.PurchaseOrder, JDWareBoxModel.PrewOrder, JDWareBoxModel.WaybillNo, null, null); + if (!res.Success) + { + IsLoading = false; + this.Dispatcher.Invoke(() => MessageBox.Show(res.Msg, "提示")); + return; + } + IsLoading = false; + this.Dispatcher.Invoke(() => + { + reflashWindow?.Invoke(); + this.Close(); + }); }); - }); + } + + + } } } diff --git a/BBWY.Client/Views/PackTask/PublishTaskWindow.xaml b/BBWY.Client/Views/PackTask/PublishTaskWindow.xaml index 33d817be..61300bf2 100644 --- a/BBWY.Client/Views/PackTask/PublishTaskWindow.xaml +++ b/BBWY.Client/Views/PackTask/PublishTaskWindow.xaml @@ -129,12 +129,12 @@ - + diff --git a/BBWY.Client/Views/PackTask/SetBarCode.xaml.cs b/BBWY.Client/Views/PackTask/SetBarCode.xaml.cs index 0da7c4ab..cea59e15 100644 --- a/BBWY.Client/Views/PackTask/SetBarCode.xaml.cs +++ b/BBWY.Client/Views/PackTask/SetBarCode.xaml.cs @@ -82,7 +82,7 @@ namespace BBWY.Client.Views.PackTask public ICommand BarLabelCheckCommand { get; set; } public void BarLabelCheck(BarcodeLabelModel labelModel) { - if (labelModel == BarcodeLabelModel.标准模板)//标准版 判断数据是否异常 + if (BarCodeModel != null && labelModel == BarcodeLabelModel.标准模板)//标准版 判断数据是否异常 { if (string.IsNullOrEmpty(BarCodeModel.ProductNo) || BarCodeModel.ProductNo == "待填写") { diff --git a/BBWY.Client/Views/PackTask/TaskListControl.xaml b/BBWY.Client/Views/PackTask/TaskListControl.xaml index 0df60ddc..58ec5b1a 100644 --- a/BBWY.Client/Views/PackTask/TaskListControl.xaml +++ b/BBWY.Client/Views/PackTask/TaskListControl.xaml @@ -98,7 +98,7 @@ - + @@ -115,6 +115,12 @@ @@ -176,7 +182,17 @@ + + + + + + + @@ -190,21 +206,16 @@ - - - - - - - - - + + + + - + - diff --git a/BBWY.Client/Views/PackTask/WaitPackageControl.xaml b/BBWY.Client/Views/PackTask/WaitPackageControl.xaml new file mode 100644 index 00000000..9e659d1a --- /dev/null +++ b/BBWY.Client/Views/PackTask/WaitPackageControl.xaml @@ -0,0 +1,556 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/BBWY.Client/Views/PackTask/WaitPackageControl.xaml.cs b/BBWY.Client/Views/PackTask/WaitPackageControl.xaml.cs new file mode 100644 index 00000000..48a5a2de --- /dev/null +++ b/BBWY.Client/Views/PackTask/WaitPackageControl.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 +{ + /// + /// WaitPackageControl.xaml 的交互逻辑 + /// + public partial class WaitPackageControl : UserControl + { + public WaitPackageControl() + { + InitializeComponent(); + } + } +} diff --git a/BBWY.Client/Views/PackTask/WareHouseList.xaml b/BBWY.Client/Views/PackTask/WareHouseList.xaml index 5b5992c3..a5ec2c83 100644 --- a/BBWY.Client/Views/PackTask/WareHouseList.xaml +++ b/BBWY.Client/Views/PackTask/WareHouseList.xaml @@ -5,6 +5,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:BBWY.Client.Views.PackTask" xmlns:fallware="clr-namespace:BBWY.Client.Views.FallWare" + xmlns:waitquality="clr-namespace:BBWY.Client.Views.QualityTask" xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls" xmlns:ctr="clr-namespace:BBWY.Client.Converters" xmlns:cmodel="clr-namespace:BBWY.Client.Models" @@ -155,7 +156,7 @@ /> - @@ -167,6 +168,10 @@ IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待封箱:True:False}" /> + + @@ -198,10 +203,11 @@ /> - + - + + - - - - + + + - - - - + + - - - - - - - - - - - + + + + + + + + @@ -96,17 +90,15 @@ - - - - + + + - - - - + + + @@ -124,37 +116,54 @@ Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" CommandParameter="{Binding DepartmentName}" Margin=" 5,0,0,0"/> + + + + - + + + + + - - - - + + + - - - - + + + + + + + + + @@ -203,17 +222,10 @@ - - - - - + @@ -236,16 +248,8 @@ /> - - - - - + + @@ -261,7 +265,7 @@ - + - + @@ -287,18 +291,54 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + - + + - + @@ -420,7 +460,7 @@ - + - + @@ -472,7 +512,7 @@ > diff --git a/BBWY.Client/Views/QualityTask/QualityWindow.xaml b/BBWY.Client/Views/QualityTask/QualityWindow.xaml index c857ffb4..2c07a5e1 100644 --- a/BBWY.Client/Views/QualityTask/QualityWindow.xaml +++ b/BBWY.Client/Views/QualityTask/QualityWindow.xaml @@ -136,7 +136,7 @@ - + diff --git a/BBWY.Client/Views/QualityTask/WaitQualityControl.xaml b/BBWY.Client/Views/QualityTask/WaitQualityControl.xaml new file mode 100644 index 00000000..aad3ae01 --- /dev/null +++ b/BBWY.Client/Views/QualityTask/WaitQualityControl.xaml @@ -0,0 +1,563 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/BBWY.Client/Views/QualityTask/WaitQualityControl.xaml.cs b/BBWY.Client/Views/QualityTask/WaitQualityControl.xaml.cs new file mode 100644 index 00000000..4d8c52de --- /dev/null +++ b/BBWY.Client/Views/QualityTask/WaitQualityControl.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.QualityTask +{ + /// + /// WaitQualityControl.xaml 的交互逻辑 + /// + public partial class WaitQualityControl : UserControl + { + public WaitQualityControl() + { + InitializeComponent(); + } + } +} diff --git a/BBWY.Client/Views/SealBox/WaitSealBoxControl.xaml b/BBWY.Client/Views/SealBox/WaitSealBoxControl.xaml index 0c58bbfd..963e12f7 100644 --- a/BBWY.Client/Views/SealBox/WaitSealBoxControl.xaml +++ b/BBWY.Client/Views/SealBox/WaitSealBoxControl.xaml @@ -38,14 +38,16 @@ + - - + + + @@ -85,6 +87,7 @@ + @@ -124,6 +127,7 @@ + @@ -248,25 +252,42 @@ - - - + - + + + + + + + + + + + - + - + + + - - + +