10166

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"
 }

BBWY.Client/GlobalContext.cs

@@ -13,7 +13,7 @@ namespace BBWY.Client
         {
             ShopServiceGroupList = new List<string>();
             ShopServiceGroupLowerList = new List<string>();
-            ClientVersion = "10165";
+            ClientVersion = "10166";
         }
 
         private User user;

BBWY.Client/ViewModels/SealBox/SealBoxConfigureViewModel.cs

@@ -93,9 +93,34 @@ namespace BBWY.Client.ViewModels.SealBox
         public ObservableCollection<SealBoxConfigureWareHourseModel> StoreWareHourseHeaderList { get => storeWareHourseHeaderList; set { Set(ref storeWareHourseHeaderList, value); } }
 
 
+        
 
+        private string jDWareTaskCount;
+        /// <summary>
+        /// 京仓任务数
+        /// </summary>
+        public string JDWareTaskCount { get => jDWareTaskCount; set { Set(ref jDWareTaskCount, value); } }
+
+
+        private string cloudWareTaskCount;
+        /// <summary>
+        /// 京仓任务数
+        /// </summary>
+        public string CloudWareTaskCount { get => cloudWareTaskCount; set { Set(ref cloudWareTaskCount, value); } }
 
 
+        private string jSTWareTaskCount;
+        /// <summary>
+        /// 京仓任务数
+        /// </summary>
+        public string JSTWareTaskCount { get => jSTWareTaskCount; set { Set(ref jSTWareTaskCount, value); } }
+
+
+        private string storeWareTaskCount;
+        /// <summary>
+        /// 京仓任务数
+        /// </summary>
+        public string StoreWareTaskCount { get => storeWareTaskCount; set { Set(ref storeWareTaskCount, value); } }
 
 
 
@@ -123,6 +148,21 @@ namespace BBWY.Client.ViewModels.SealBox
             SetWareMaxCountCommand = new RelayCommand<SealBoxConfigureWareHourseModel>(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 =>
             {
 

BBWY.Client/Views/PackTask/TaskListControl.xaml

@@ -398,7 +398,7 @@
                                             </Path.ToolTip>
                                         </Path>
                                     </StackPanel>
-                                   
+
                                 </Grid>
                             </Grid>
                             <Grid Grid.Column="9" >

BBWY.Client/Views/SealBox/SetSealBoxPolicyWindow.xaml

@@ -63,10 +63,10 @@
         </Border>
 
         <StackPanel Orientation="Horizontal" Height="35" Grid.Row="1"  >
-            <RadioButton Content="京仓" Width="116" Margin="20 0 0 0"  IsChecked="{Binding SelectWareType,Converter={StaticResource objConverter}, ConverterParameter=京仓:True:false}"  Command="{Binding SelectWareTypeCommand}"/>
-            <RadioButton Content="云仓" Width="116" Margin="-1 0 0 0"   IsChecked="{Binding SelectWareType,Converter={StaticResource objConverter}, ConverterParameter=云仓:True:false}" Command="{Binding SelectWareTypeCommand}"/>
-            <RadioButton Content="聚水潭" Width="116" Margin="-1 0 0 0"  IsChecked="{Binding SelectWareType,Converter={StaticResource objConverter}, ConverterParameter=聚水潭:True:false}" Command="{Binding SelectWareTypeCommand}"/>
-            <RadioButton Content="商家仓" Width="116" Margin="-1 0 0 0"  IsChecked="{Binding SelectWareType,Converter={StaticResource objConverter}, ConverterParameter=商家仓:True:false}" Command="{Binding SelectWareTypeCommand}"/>
+            <RadioButton Content="京仓" Tag="{Binding JDWareTaskCount,Mode=TwoWay}"  Width="116" Margin="20 0 0 0"  IsChecked="{Binding SelectWareType,Converter={StaticResource objConverter}, ConverterParameter=京仓:True:false}"  Command="{Binding SelectWareTypeCommand}"/>
+            <RadioButton Content="云仓" Tag="{Binding CloudWareTaskCount,Mode=TwoWay}" Width="116" Margin="-1 0 0 0"   IsChecked="{Binding SelectWareType,Converter={StaticResource objConverter}, ConverterParameter=云仓:True:false}" Command="{Binding SelectWareTypeCommand}"/>
+            <RadioButton Content="聚水潭" Tag="{Binding JSTWareTaskCount,Mode=TwoWay}" Width="116" Margin="-1 0 0 0"  IsChecked="{Binding SelectWareType,Converter={StaticResource objConverter}, ConverterParameter=聚水潭:True:false}" Command="{Binding SelectWareTypeCommand}"/>
+            <RadioButton Content="商家仓" Tag="{Binding StoreWareTaskCount,Mode=TwoWay}" Width="116" Margin="-1 0 0 0"  IsChecked="{Binding SelectWareType,Converter={StaticResource objConverter}, ConverterParameter=商家仓:True:false}" Command="{Binding SelectWareTypeCommand}"/>
         </StackPanel>
 
         <StackPanel Orientation="Horizontal" Grid.Row="2" Height="30">

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();
         }
 
         /// <summary>