Browse Source

8.21号之前 验收不需要验证

AddValidOverTime
506583276@qq.com 2 years ago
parent
commit
5ea23a1dd5
  1. 2
      BBWY.Client/GlobalContext.cs
  2. 4
      BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs
  3. 18
      BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs

2
BBWY.Client/GlobalContext.cs

@ -13,7 +13,7 @@ namespace BBWY.Client
{ {
ShopServiceGroupList = new List<string>(); ShopServiceGroupList = new List<string>();
ShopServiceGroupLowerList = new List<string>(); ShopServiceGroupLowerList = new List<string>();
ClientVersion = "10173"; ClientVersion = "10174";
} }
private User user; private User user;

4
BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs

@ -468,8 +468,6 @@ namespace BBWY.Client.ViewModels.PackTask
return; return;
SkuId = skuid; SkuId = skuid;
ApiResponse<ProductListResponse> productApiResponse = null; ApiResponse<ProductListResponse> productApiResponse = null;
var skuResponse = productService.GetProductSkuList(string.Empty, skuid); var skuResponse = productService.GetProductSkuList(string.Empty, skuid);
if (skuResponse.Success) if (skuResponse.Success)
@ -584,7 +582,7 @@ namespace BBWY.Client.ViewModels.PackTask
public void SearSpuCer() public void SearSpuCer()
{ {
if (string.IsNullOrEmpty(SpuId)) if (string.IsNullOrEmpty(SpuId)&&globalContext.User.Shop!=null)
{ {
SearchSku(SkuId); SearchSku(SkuId);
return; return;

18
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 BarCodeModel BarCodeModel { get => barCodeModel; set { Set(ref barCodeModel, value); } }
public DateTime CreateTime { get; set; }
private bool isSetBarCode; private bool isSetBarCode;
/// <summary> /// <summary>
/// 设置显示(条形码) /// 设置显示(条形码)
@ -586,7 +590,17 @@ namespace BBWY.Client.ViewModels
model.CerDTO.BrandName = BrandName; 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.LoadData(model.IsNeedCer, model.CerDTO, packPurchaseTaskService, spuCertificateModel, IsSetSpuCertificate, saveType);
setCerWindow.SaveResult = (s, PackCerState) => setCerWindow.SaveResult = (s, PackCerState) =>
{ {
@ -636,7 +650,7 @@ namespace BBWY.Client.ViewModels
/// </summary> /// </summary>
public void SearchSku(PackTaskModel model) public void SearchSku(PackTaskModel model)
{ {
CreateTime = model.EndTime;
OriginShopName = model.ShopName; OriginShopName = model.ShopName;

Loading…
Cancel
Save