10129

BBWYB.Client/APIServices/PurchaseProductAPIService.cs

@@ -195,6 +195,7 @@ namespace BBWYB.Client.APIServices
                 var purchaser = new Purchaser()
                 {
                     Id = jobject["globalData"]["tempModel"]["sellerUserId"].ToString(),
+                    Id2 = jobject["globalData"]["tempModel"]["sellerLoginId"]?.ToString(),
                     Name = jobject["globalData"]["tempModel"]["companyName"].ToString(),
                     Location = jobject["data"]["1081181309101"] != null ?
                                jobject["data"]["1081181309101"]["data"]["location"].ToString() :

BBWYB.Client/GlobalContext.cs

@@ -20,7 +20,7 @@ namespace BBWYB.Client
     {
         public GlobalContext()
         {
-            BBWYBApiVersion = "10028";
+            BBWYBApiVersion = "10029";
         }
 
         private User user;

BBWYB.Client/Models/APIModel/Response/PurchaseSchemeResponse.cs

@@ -15,6 +15,11 @@ namespace BBWYB.Client.Models
         /// 采购商Id
         /// </summary>
         public string PurchaserId { get; set; }
+
+        /// <summary>
+        /// 采购商Id
+        /// </summary>
+        public string PurchaserId2 { get; set; }
         public string PurchaserName { get; set; }
         /// <summary>
         /// 发货地

BBWYB.Client/Models/Product/Purchaser.cs

@@ -11,6 +11,8 @@ namespace BBWYB.Client.Models
 
         public string Id { get; set; }
 
+        public string Id2 { get; set; }
+
         public string Name { get; set; }
 
         /// <summary>

BBWYB.Client/Models/PurchaseScheme/PurchaseScheme.cs

@@ -22,6 +22,7 @@ namespace BBWYB.Client.Models
         public decimal RealCost { get => realCost; set { SetProperty(ref realCost, value); } }
 
         public string PurchaserId { get; set; }
+        public string PurchaserId2 { get; set; }
         public string PurchaserName { get; set; }
         public string PurchaserLocation { get; set; }
         public string PurchaseProductId1 { get; set; }

BBWYB.Client/ViewModels/Ware/BindingPurchaseProductViewModel.cs

@@ -35,6 +35,9 @@ namespace BBWYB.Client.ViewModels
         public IList<ProductSku> ProductSkuList { get; set; }
 
         public string PurchaserId { get; set; }
+
+        public string PurchaserId2 { get; set; }
+
         public string PurchaserName { get => purchaserName; set { SetProperty(ref purchaserName, value); } }
         public string PurchaserLocation { get; set; }
         public bool IsLoading { get => isLoading; set { SetProperty(ref isLoading, value); } }
@@ -85,11 +88,12 @@ namespace BBWYB.Client.ViewModels
             };
         }
 
-        public void SetData(IList<ProductSku> productSkuList, string purchaserId, string purchaserName, Platform purchasePlatform)
+        public void SetData(IList<ProductSku> productSkuList, string purchaserId, string purchaserId2, string purchaserName, Platform purchasePlatform)
         {
             this.ProductSkuList = productSkuList;
             //this.Product = product;
             this.PurchaserId = purchaserId;
+            this.PurchaserId2 = purchaserId2;
             this.PurchaserName = purchaserName;
             this.PurchasePlatform = purchasePlatform;
         }
@@ -177,6 +181,7 @@ namespace BBWYB.Client.ViewModels
                 }
 
                 PurchaserId = data.Value.purchaser.Id;
+                PurchaserId2 = data.Value.purchaser.Id2;
                 PurchaserName = data.Value.purchaser.Name;
                 PurchaserLocation = data.Value.purchaser.Location;
 
@@ -315,6 +320,7 @@ namespace BBWYB.Client.ViewModels
 
             var productSku = ProductSkuList.FirstOrDefault(sku => sku.Id == purchaseSchemeProduct.SkuId);
             productSku.SelectedPurchaseScheme.PurchaserId = PurchaserId;
+            productSku.SelectedPurchaseScheme.PurchaserId2 = PurchaserId2;
             productSku.SelectedPurchaseScheme.PurchaserName = PurchaserName;
             productSku.SelectedPurchaseScheme.PurchaserLocation = PurchaserLocation;
             productSku.SelectedPurchaseScheme.DefaultCost = productSku.SelectedPurchaseScheme.PurchaseSchemeProductList.Sum(p => p.PurchaseSchemeProductSkuList.Count() == 0 ? 0 : p.PurchaseSchemeProductSkuList.Sum(s => s.Price));

BBWYB.Client/ViewModels/Ware/WareManagerViewModel.cs

@@ -242,7 +242,13 @@ namespace BBWYB.Client.ViewModels
                             var purchaser = product.PurchaserList.FirstOrDefault(purchaser => purchaser.Id == pscheme.PurchaserId);
                             if (purchaser == null)
                             {
-                                purchaser = new Purchaser() { Id = pscheme.PurchaserId, Name = pscheme.PurchaserName, ProductId = product.Id };
+                                purchaser = new Purchaser()
+                                {
+                                    Id = pscheme.PurchaserId,
+                                    Id2 = pscheme.PurchaserId2,
+                                    Name = pscheme.PurchaserName,
+                                    ProductId = product.Id
+                                };
                                 product.PurchaserList.Add(purchaser);
                             }
                             purchaser.SkuUseCount++;
@@ -260,13 +266,13 @@ namespace BBWYB.Client.ViewModels
                 return;
             }
 
-            OpenBindingView(product, string.Empty, string.Empty);
+            OpenBindingView(product, string.Empty, string.Empty, string.Empty);
         }
 
         private void EditPurchaser(Purchaser purchaser)
         {
             var product = ProductList.FirstOrDefault(p => p.Id == purchaser.ProductId);
-            OpenBindingView(product, purchaser.Id, purchaser.Name);
+            OpenBindingView(product, purchaser.Id, purchaser.Id2, purchaser.Name);
         }
 
         private void DeletePurchaser(Purchaser purchaser)
@@ -306,10 +312,10 @@ namespace BBWYB.Client.ViewModels
             });
         }
 
-        private void OpenBindingView(Product product, string purchaserId, string purchaserName)
+        private void OpenBindingView(Product product, string purchaserId, string purchaserId2, string purchaserName)
         {
             var skuList = product.SkuList;
-            bindingPurchaseProduct.SetData(skuList, purchaserId, purchaserName, product.SelectedPurchasePlatformModel);
+            bindingPurchaseProduct.SetData(skuList, purchaserId, purchaserId2, purchaserName, product.SelectedPurchasePlatformModel);
             var bindingView = new BindingPurchaseProduct();
             var r = bindingView.ShowDialog();
             if (r == true)