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

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;

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;