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 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; /// /// 设置显示(条形码) @@ -586,7 +590,17 @@ namespace BBWY.Client.ViewModels model.CerDTO.BrandName = BrandName; - QualitySetCerWindow setCerWindow = new QualitySetCerWindow(model.IsSetCertificate); + bool isNeedClick = true; + if (CreateTime { @@ -636,7 +650,7 @@ namespace BBWY.Client.ViewModels /// public void SearchSku(PackTaskModel model) { - + CreateTime = model.EndTime; OriginShopName = model.ShopName;