From 5ea23a1dd595265ebc2bf983ccb0afe639185671 Mon Sep 17 00:00:00 2001
From: "506583276@qq.com" <506583276@qq.com>
Date: Tue, 29 Aug 2023 14:44:24 +0800
Subject: [PATCH] =?UTF-8?q?8.21=E5=8F=B7=E4=B9=8B=E5=89=8D=20=E9=AA=8C?=
 =?UTF-8?q?=E6=94=B6=E4=B8=8D=E9=9C=80=E8=A6=81=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWY.Client/GlobalContext.cs                   |  2 +-
 .../PackTask/PublishTaskViewModel.cs           |  4 +---
 .../ViewModels/QualityTask/QualityViewModel.cs | 18 ++++++++++++++++--
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs
index 8facce1c..eafd54fd 100644
--- a/BBWY.Client/GlobalContext.cs
+++ b/BBWY.Client/GlobalContext.cs
@@ -13,7 +13,7 @@ namespace BBWY.Client
         {
             ShopServiceGroupList = new List<string>();
             ShopServiceGroupLowerList = new List<string>();
-            ClientVersion = "10173";
+            ClientVersion = "10174";
         }
 
         private User user;
diff --git a/BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs b/BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs
index 12b059d0..24d15111 100644
--- a/BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs
+++ b/BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs
@@ -468,8 +468,6 @@ namespace BBWY.Client.ViewModels.PackTask
                 return;
 
             SkuId = skuid;
-
-
             ApiResponse<ProductListResponse> productApiResponse = null;
             var skuResponse = productService.GetProductSkuList(string.Empty, skuid);
             if (skuResponse.Success)
@@ -584,7 +582,7 @@ namespace BBWY.Client.ViewModels.PackTask
 
         public void SearSpuCer()
         {
-            if (string.IsNullOrEmpty(SpuId))
+            if (string.IsNullOrEmpty(SpuId)&&globalContext.User.Shop!=null)
             {
                 SearchSku(SkuId);
                 return;
diff --git a/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs b/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs
index fd37402b..7a6f5cf5 100644
--- a/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs
+++ b/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs
@@ -225,6 +225,10 @@ namespace BBWY.Client.ViewModels
         public BarCodeModel BarCodeModel { get => barCodeModel; set { Set(ref barCodeModel, value); } }
 
 
+        public DateTime CreateTime { get; set; }
+
+
+
         private bool isSetBarCode;
         /// <summary>
         /// 设置显示(条形码)
@@ -586,7 +590,17 @@ namespace BBWY.Client.ViewModels
                 model.CerDTO.BrandName = BrandName;
 
 
-            QualitySetCerWindow setCerWindow = new QualitySetCerWindow(model.IsSetCertificate);
+            bool isNeedClick = true;
+            if (CreateTime<Convert.ToDateTime("2023-08-21"))
+            {
+                isNeedClick=false;
+            }
+            else
+            {
+                isNeedClick = model.IsSetCertificate;
+            }
+
+            QualitySetCerWindow setCerWindow = new QualitySetCerWindow(isNeedClick);
             setCerWindow.LoadData(model.IsNeedCer, model.CerDTO, packPurchaseTaskService, spuCertificateModel, IsSetSpuCertificate, saveType);
             setCerWindow.SaveResult = (s, PackCerState) =>
             {
@@ -636,7 +650,7 @@ namespace BBWY.Client.ViewModels
         /// </summary>
         public void SearchSku(PackTaskModel model)
         {
-
+            CreateTime = model.EndTime;
 
             OriginShopName = model.ShopName;