Merge branch 'master' of http://code.qiyue666.com/pengcong001/bbwyb

BBWYB.Client/ViewModels/PackPurchaseTask/UpdatePurchaseTaskViewModel.cs

@@ -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,
@@ -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("请设置合格证模板");

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