diff --git a/BBWYB.Client/ViewModels/PackPurchaseTask/UpdatePurchaseTaskViewModel.cs b/BBWYB.Client/ViewModels/PackPurchaseTask/UpdatePurchaseTaskViewModel.cs index 04763d1..beed8bb 100644 --- a/BBWYB.Client/ViewModels/PackPurchaseTask/UpdatePurchaseTaskViewModel.cs +++ b/BBWYB.Client/ViewModels/PackPurchaseTask/UpdatePurchaseTaskViewModel.cs @@ -304,7 +304,7 @@ namespace BBWYB.Client.ViewModels SetCertificateCommand = new RelayCommand(SetCertificate); LookBarCommand = new RelayCommand(LookBar); LookCerCommand = new RelayCommand(LookCer); - + IncreateList = new ObservableCollection(); foreach (var item in increates) { @@ -501,12 +501,17 @@ namespace BBWYB.Client.ViewModels var list = purchaseService.GetPurchaseSkuBasicInfo(item.PurchaseProductId); if (list == null) continue; var skuItem = list.Data.ItemList.FirstOrDefault(f => f.PurchaseSkuId == item.PurchaseSkuId); + if (skuItem == null) + { + MessageBox.Show($"{item.PurchaseProductId}采购商品列表不存在skuid:{item.PurchaseSkuId},sku商品可能被下架了."); + //return false; + } App.Current.Dispatcher.Invoke(new Action(() => { PurchaseSkuList.Add(new Models.PackPurchaseTask.PurchaseSku { - Logo = skuItem.Logo, - Title = skuItem.Title, + Logo = skuItem?.Logo, + Title = skuItem?.Title, IsNeedCer = item.IsNeedCer, PurchaseSkuId = item.PurchaseSkuId, CerDTO = item.CerDTO, @@ -530,13 +535,13 @@ namespace BBWYB.Client.ViewModels //MarkMessage = config.MarkMessage; CertificatePosition = config.CertificatePosition == null ? CertificatePosition.无 : (CertificatePosition)config.CertificatePosition.Value; // Increment1 = config.Increment1; - + IsNeedBarCode = config.NeedBar ? Need.需要 : Need.不需要; IsNeedCertificateModel = config.NeedCer ? Need.需要 : Need.不需要; IsSetBarCode = !config.NeedBar; IsSetCertificate = !config.NeedCer; - + string[] increateDatas = config.Increment1?.Split(','); bool isSelected = false; @@ -618,7 +623,7 @@ namespace BBWYB.Client.ViewModels BasicPack = BasicPack.快递袋; SkuPurchaseSchemeId = ""; SkuTitle = ""; - BarCodeModel= null; + BarCodeModel = null; OriginShopName = ""; // Availability = (TaskState.)config.Availability; @@ -716,7 +721,14 @@ namespace BBWYB.Client.ViewModels } if (IsNeedCertificateModel == Need.需要) { - var cerList = purchaseSkuList.Where(p => p.IsNeedCer&&p.CerDTO!=null).Select(p => p.CerDTO).Select(c => c.Id).Where(c => c > 0).ToList(); + + if (purchaseSkuList.Any(p => p.IsNeedCer && p.CerDTO == null)) + { + MessageBox.Show("有未设置的合格证,请设置完所有的合格证再保存"); + return; + } + + var cerList = purchaseSkuList.Where(p => p.IsNeedCer).Select(p => p.CerDTO).Select(c => c.Id).Where(c => c > 0).ToList(); if (purchaseSkuList.Count() <= 0 || cerList.Count <= 0) { MessageBox.Show("请设置合格证模板"); diff --git a/BBWYB.Client/appsettings.json b/BBWYB.Client/appsettings.json index 80bdfe4..cd45795 100644 --- a/BBWYB.Client/appsettings.json +++ b/BBWYB.Client/appsettings.json @@ -3,6 +3,6 @@ "BBWYApiHost": "http://bbwyb.qiyue666.com", "MDSApiHost": "http://mdsapi.qiyue666.com", "BBWYCApiHost": "http://bbwytest.qiyue666.com", - //"QKApiHost": "http://localhost:8080" - "QKApiHost": "http://qiku.qiyue666.com" + "QKApiHost": "http://localhost:8080" + // "QKApiHost": "http://qiku.qiyue666.com" } \ No newline at end of file