修复切换web页面bug

BBWY.Client/GlobalContext.cs

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

BBWY.Client/Views/Web/Web.xaml.cs

@@ -14,14 +14,23 @@ namespace BBWY.Client.Views.Web
 
 #if DEBUG
         private string url = "http://192.168.1.4:8881/";
+        private string registerName = "webTestContext";
 #else
         private string url= "http://bbwyweb.qiyue666.com";
+        private string registerName = "webContext";
 #endif
 
         public Web()
         {
             InitializeComponent();
             this.Loaded += Web_Loaded;
+            this.Unloaded += Web_Unloaded;
+        }
+
+        private void Web_Unloaded(object sender, System.Windows.RoutedEventArgs e)
+        {
+            if (w2m.wb2 != null)
+                grid.Children.Remove(w2m.wb2);
         }
 
         private void Web_Loaded(object sender, System.Windows.RoutedEventArgs e)
@@ -41,11 +50,11 @@ namespace BBWY.Client.Views.Web
             w2m.CoreWebView2InitializationCompleted = (e) =>
             {
                 isNavigated = true;
-                w2m.wb2.CoreWebView2.AddHostObjectToScript("webContext", this.globalContext);
+                w2m.wb2.CoreWebView2.AddHostObjectToScript(registerName, this.globalContext);
                 // w2m.wb2.CoreWebView2.Navigate($"https://neworder.shop.jd.com/order/orderDetail?orderId={orderId}");
                 w2m.wb2.CoreWebView2.Navigate(url);
             };
-            if(w2m.IsInitializationCompleted && !isNavigated)
+            if (w2m.IsInitializationCompleted && !isNavigated)
             {
                 w2m.wb2.CoreWebView2.Navigate(url);
                 isNavigated = true;

BBWY.Server.Business/PlatformSDK/JDBusiness.cs

@@ -672,6 +672,12 @@ namespace BBWY.Server.Business
             return (JArray)res.Json["jingdong_store_findPartitionWhByIdAndStatus_responce"]["find_Partition_Warehouse_Result"]["result"];
         }
 
+        public override JArray JDQueryWareHouse(JDQueryWareHouseRequest request)
+        {
+
+            return base.JDQueryWareHouse(request);
+        }
+
         public override JArray GetStockNumBySku(SearchProductSkuRequest request)
         {
             var jdClient = GetJdClient(request.AppKey, request.AppSecret);

BBWY.Server.Business/PlatformSDK/PlatformSDKBusiness.cs

@@ -153,6 +153,11 @@ namespace BBWY.Server.Business
             throw new NotImplementedException();
         }
 
+        public virtual JArray JDQueryWareHouse(JDQueryWareHouseRequest request)
+        {
+            throw new NotImplementedException();
+        }
+
         public virtual JArray GetStockNumBySku(SearchProductSkuRequest request)
         {
             throw new NotImplementedException();

BBWY.Server.Business/QiKu/QiKuBusiness.cs

@@ -51,7 +51,7 @@ namespace BBWY.Server.Business.QiKu
             var supplierName = supplierJToken["jingdong_eclp_master_querySupplier_responce"]["querysupplier_result"].Children().FirstOrDefault().Value<string>("supplierName");
             #endregion
 
-            #region 查询仓库信息
+            #region 查询仓库列表
             var storeList = venderBusiness.GetStoreHouseList(request);
             var store = storeList.FirstOrDefault(s => s.Id == whNo);
             #endregion

BBWY.Server.Model/Dto/Request/JD/JDQueryWareHouseRequest.cs

@@ -0,0 +1,15 @@
+namespace BBWY.Server.Model.Dto
+{
+    public class JDQueryWareHouseRequest : PlatformRequest
+    {
+        /// <summary>
+        /// 开放平台事业部编号
+        /// </summary>
+        public string deptNo { get; set; }
+
+        /// <summary>
+        /// 仓库编号, 逗号间隔
+        /// </summary>
+        public string wareHouseNos { get; set; }
+    }
+}

BBWY.Server.Model/Dto/Response/QK/GetJDSupplierNameAndStoreNameResponse.cs

@@ -7,5 +7,7 @@
         public string StoreId { get; set; }
 
         public string StoreName { get; set; }
+
+        public string City { get; set; }
     }
 }