From a2b539607f46a48d5b984b39ecc924d0f06c0a62 Mon Sep 17 00:00:00 2001
From: "506583276@qq.com" <506583276@qq.com>
Date: Mon, 5 Jun 2023 20:39:21 +0800
Subject: [PATCH] 10121

---
 BBWY.Client/GlobalContext.cs                      |  2 +-
 .../ViewModels/QualityTask/QualityViewModel.cs    | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs
index 2c8e5a47..70ffd36f 100644
--- a/BBWY.Client/GlobalContext.cs
+++ b/BBWY.Client/GlobalContext.cs
@@ -9,7 +9,7 @@ namespace BBWY.Client
         {
             ShopServiceGroupList = new List<string>();
             ShopServiceGroupLowerList = new List<string>();
-            ClientVersion = "10120";
+            ClientVersion = "10121";
         }
 
         private User user;
diff --git a/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs b/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs
index 506ce3c0..d10dab7a 100644
--- a/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs
+++ b/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs
@@ -115,7 +115,7 @@ namespace BBWY.Client.ViewModels
 
 
         private ObservableCollection<string> preCompeteTimeHourList = new ObservableCollection<string> {
-                 "12点前","18点前","21点前"
+                 "12点前","18点前","22点前"
              };
         public ObservableCollection<string> PreCompeteTimeHourList { get => preCompeteTimeHourList; set { Set(ref preCompeteTimeHourList, value); } }
 
@@ -445,7 +445,7 @@ namespace BBWY.Client.ViewModels
             };
             if (IsNeedBarCode == Need.需要)
             {
-                if (BarCodeModel.Id <= 0)
+                if (BarCodeModel==null|| BarCodeModel.Id <= 0)
                 {
                     MessageBox.Show("条形码不能为空");
                     return;
@@ -464,6 +464,12 @@ namespace BBWY.Client.ViewModels
                     MessageBox.Show("存在未确认的合格证,请先完成确认！");
                     return;
                 }
+
+                if (purchaseSkuList.Any(p => p.IsNeedCer && p.CerDTO == null))
+                {
+                    MessageBox.Show("有未设置的合格证,请设置完所有的合格证再保存");
+                    return;
+                }
                 if (PurchaseSkuList.Where(p => p.IsNeedCer && p.CerDTO.Id > 0).Count() <= 0)
                 {
                     MessageBox.Show("无可选的合格证打印！");
@@ -543,10 +549,6 @@ namespace BBWY.Client.ViewModels
                 }
             }
 
-
-
-
-
             request.PreCompeteTime = competeTime;
 
 
@@ -824,6 +826,7 @@ namespace BBWY.Client.ViewModels
             {
                 PreCompeteTimeDayList.Add("今天");
                 PreCompeteTimeDayList.Add("明天");
+                PreCompeteTimeDay = "今天";
                 PreCompeteTimeHour = "22点前";
             }
             else