diff --git a/BBWY.Client/BBWYAppSettings.json b/BBWY.Client/BBWYAppSettings.json index 9622efaf..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/Models/BatchPurchase/BatchPublishTask.cs b/BBWY.Client/Models/BatchPurchase/BatchPublishTask.cs index 6f572728..c4576a9b 100644 --- a/BBWY.Client/Models/BatchPurchase/BatchPublishTask.cs +++ b/BBWY.Client/Models/BatchPurchase/BatchPublishTask.cs @@ -60,10 +60,10 @@ namespace BBWY.Client.Models }; public ObservableCollection CertificatePositionList { get => certificatePositionList; set { Set(ref certificatePositionList, value); } } - private ObservableCollection availabilityList = new ObservableCollection { - "已到货","部分到货","未到货" - }; - public ObservableCollection AvailabilityList { get => availabilityList; set { Set(ref availabilityList, value); } } + //private ObservableCollection availabilityList = new ObservableCollection { + // "已到货","部分到货","未到货" + // }; + //public ObservableCollection AvailabilityList { get => availabilityList; set { Set(ref availabilityList, value); } } private int skuCount; /// @@ -120,11 +120,11 @@ namespace BBWY.Client.Models ///// //public Worry IsWorry { get => isWorry; set { Set(ref isWorry, value); } } - private Availability availability; - /// - /// 到货情况(待收货=0,部分收货=1,已到货=2) - /// - public Availability Availability { get => availability; set { Set(ref availability, value); } } + //private Availability availability; + ///// + ///// 到货情况(待收货=0,部分收货=1,已到货=2) + ///// + //public Availability Availability { get => availability; set { Set(ref availability, value); } } private PackType packType; /// diff --git a/BBWY.Client/Models/Product/ProductSku.cs b/BBWY.Client/Models/Product/ProductSku.cs index ab10cce1..c1015cea 100644 --- a/BBWY.Client/Models/Product/ProductSku.cs +++ b/BBWY.Client/Models/Product/ProductSku.cs @@ -26,7 +26,6 @@ namespace BBWY.Client.Models /// 采购方案 /// public IList PurchaseSchemeList { get; set; } - /// /// 采购订单 /// diff --git a/BBWY.Client/ViewModels/BatchPurchase/BatchPublishTaskViewModel.cs b/BBWY.Client/ViewModels/BatchPurchase/BatchPublishTaskViewModel.cs index fdfd6fd1..53f61bbb 100644 --- a/BBWY.Client/ViewModels/BatchPurchase/BatchPublishTaskViewModel.cs +++ b/BBWY.Client/ViewModels/BatchPurchase/BatchPublishTaskViewModel.cs @@ -83,14 +83,14 @@ namespace BBWY.Client.ViewModels Logo = task.Logo, SkuName = task.SkuName, BrandName = task.BrandName, - Availability = (int)task.Availability, + //Availability = (int)task.Availability, BasicPack = (int)task.BasicPack, SkuId = task.SkuId, CreateTime = DateTime.Now, Increment1 = increateStr, CertificatePosition = (int)task.CertificatePosition, PackType = (int)task.PackType, - MarkMessage = task.MarkMessage, + //MarkMessage = task.MarkMessage, PositionType = (int)task.PositionType, GoodsNumber = task.GoodsNumber, SkuGoodsTitle = task.SkuTitle, diff --git a/BBWY.Client/Views/StorePickSelf/StorePickSelfControl.xaml b/BBWY.Client/Views/StorePickSelf/StorePickSelfControl.xaml index 19f67e76..038e86bf 100644 --- a/BBWY.Client/Views/StorePickSelf/StorePickSelfControl.xaml +++ b/BBWY.Client/Views/StorePickSelf/StorePickSelfControl.xaml @@ -115,49 +115,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - -