diff --git a/BBWY.Client/BBWYAppSettings.json b/BBWY.Client/BBWYAppSettings.json index ef760e08..34888905 100644 --- a/BBWY.Client/BBWYAppSettings.json +++ b/BBWY.Client/BBWYAppSettings.json @@ -4,6 +4,6 @@ "MDSApiHost": "http://mdsapi.qiyue666.com", "JOSApiHost": "", "1688ApiHost": "", - // "QKApiHost": "http://localhost:8080" - "QKApiHost": "http://qiku.qiyue666.com" + "QKApiHost": "http://localhost:8080" + // "QKApiHost": "http://qiku.qiyue666.com" } \ No newline at end of file diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs index 484ab05e..e397dc40 100644 --- a/BBWY.Client/GlobalContext.cs +++ b/BBWY.Client/GlobalContext.cs @@ -13,7 +13,7 @@ namespace BBWY.Client { ShopServiceGroupList = new List(); ShopServiceGroupLowerList = new List(); - ClientVersion = "10165"; + ClientVersion = "10166"; } private User user; diff --git a/BBWY.Client/ViewModels/SealBox/SealBoxConfigureViewModel.cs b/BBWY.Client/ViewModels/SealBox/SealBoxConfigureViewModel.cs index 714cbaf7..07a495ef 100644 --- a/BBWY.Client/ViewModels/SealBox/SealBoxConfigureViewModel.cs +++ b/BBWY.Client/ViewModels/SealBox/SealBoxConfigureViewModel.cs @@ -93,9 +93,34 @@ namespace BBWY.Client.ViewModels.SealBox public ObservableCollection StoreWareHourseHeaderList { get => storeWareHourseHeaderList; set { Set(ref storeWareHourseHeaderList, value); } } + + private string jDWareTaskCount; + /// + /// 京仓任务数 + /// + public string JDWareTaskCount { get => jDWareTaskCount; set { Set(ref jDWareTaskCount, value); } } + + + private string cloudWareTaskCount; + /// + /// 京仓任务数 + /// + public string CloudWareTaskCount { get => cloudWareTaskCount; set { Set(ref cloudWareTaskCount, value); } } + private string jSTWareTaskCount; + /// + /// 京仓任务数 + /// + public string JSTWareTaskCount { get => jSTWareTaskCount; set { Set(ref jSTWareTaskCount, value); } } + + + private string storeWareTaskCount; + /// + /// 京仓任务数 + /// + public string StoreWareTaskCount { get => storeWareTaskCount; set { Set(ref storeWareTaskCount, value); } } @@ -123,6 +148,21 @@ namespace BBWY.Client.ViewModels.SealBox SetWareMaxCountCommand = new RelayCommand(SetWareMaxCount); } + public void LoadCount() + { + App.Current.Dispatcher.Invoke(new Action(() => { + + JDWareTaskCount= SealBoxConfigureModelList.Where(s=>s.SkuCount>0 &&s.WareType== WareType.京仓).Count().ToString(); + + CloudWareTaskCount = SealBoxConfigureModelList.Where(s => s.SkuCount > 0 && s.WareType == WareType.云仓).Count().ToString(); + JSTWareTaskCount = SealBoxConfigureModelList.Where(s => s.SkuCount > 0 && s.WareType == WareType.聚水潭).Count().ToString(); + StoreWareTaskCount = SealBoxConfigureModelList.Where(s => s.SkuCount > 0 && s.WareType == WareType.商家仓).Count().ToString(); + })); + } + + + + private void SetWareMaxCount(SealBoxConfigureWareHourseModel model) { SealBoxConfigureModelList.Where(s => s.WareType == SelectWareType && s.TaskId == model.TaskId) @@ -341,7 +381,7 @@ namespace BBWY.Client.ViewModels.SealBox - + LoadCount(); } private void AddWare() { @@ -358,9 +398,6 @@ namespace BBWY.Client.ViewModels.SealBox var addList = newList.Except(oldList).ToList(); var deletedList = oldList.Except(newList).ToList(); - - - sealBoxConfigureModelList.Where(s => s.WareType == wareType).ForAll(s => { diff --git a/BBWY.Client/Views/PackTask/TaskListControl.xaml b/BBWY.Client/Views/PackTask/TaskListControl.xaml index ca684cce..b5278bfe 100644 --- a/BBWY.Client/Views/PackTask/TaskListControl.xaml +++ b/BBWY.Client/Views/PackTask/TaskListControl.xaml @@ -398,7 +398,7 @@ - + diff --git a/BBWY.Client/Views/SealBox/SetSealBoxPolicyWindow.xaml b/BBWY.Client/Views/SealBox/SetSealBoxPolicyWindow.xaml index eecddbc1..8b8e20fc 100644 --- a/BBWY.Client/Views/SealBox/SetSealBoxPolicyWindow.xaml +++ b/BBWY.Client/Views/SealBox/SetSealBoxPolicyWindow.xaml @@ -63,10 +63,10 @@ - - - - + + + + diff --git a/BBWY.Client/Views/SealBox/SetSealBoxPolicyWindow.xaml.cs b/BBWY.Client/Views/SealBox/SetSealBoxPolicyWindow.xaml.cs index dff5b20b..3e0e47f9 100644 --- a/BBWY.Client/Views/SealBox/SetSealBoxPolicyWindow.xaml.cs +++ b/BBWY.Client/Views/SealBox/SetSealBoxPolicyWindow.xaml.cs @@ -36,6 +36,7 @@ namespace BBWY.Client.Views.SealBox sealBoxConfigureVM.ReflashWindow = ReflashWindow; LoadData(sealBoxWaitConfigureModels, sealboxId, sealBoxConfigureVM); + sealBoxConfigureVM.LoadCount(); } ///