Browse Source

10175

AddValidOverTime
506583276@qq.com 2 years ago
parent
commit
87b9827491
  1. 2
      BBWY.Client/GlobalContext.cs
  2. 8
      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 = "10174"; ClientVersion = "10175";
} }
private User user; private User user;

8
BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs

@ -451,6 +451,10 @@ namespace BBWY.Client.ViewModels
TaskId = TaskId, TaskId = TaskId,
FloorDragNumber = FloorDragNumber FloorDragNumber = FloorDragNumber
}; };
if (CreateTime>Convert.ToDateTime("2023-08-21"))
{
if (IsNeedBarCode == Need.) if (IsNeedBarCode == Need.)
{ {
if (BarCodeModel == null || BarCodeModel.Id <= 0) if (BarCodeModel == null || BarCodeModel.Id <= 0)
@ -486,6 +490,8 @@ namespace BBWY.Client.ViewModels
request.CerId = string.Join(",", PurchaseSkuList.Where(p => p.IsNeedCer && p.CerDTO.Id > 0).Select(p => p.CerDTO.Id)); request.CerId = string.Join(",", PurchaseSkuList.Where(p => p.IsNeedCer && p.CerDTO.Id > 0).Select(p => p.CerDTO.Id));
} }
}
try try
{ {
var competeRes = packPurchaseTaskService.CompeteQualityTask(request); var competeRes = packPurchaseTaskService.CompeteQualityTask(request);
@ -507,7 +513,7 @@ namespace BBWY.Client.ViewModels
// BarCodeModel.ShopName = OriginShopName; // BarCodeModel.ShopName = OriginShopName;
//} //}
batchPrint.SetData(GoodProductQuantity.Value, batchPrint.SetData(GoodProductQuantity.Value,
PurchaseSkuList.Where(p => p.IsNeedCer && p.CerDTO.Id > 0).Select(p => p.CerDTO).ToArray() PurchaseSkuList.Where(p => p.IsNeedCer&& p.CerDTO!=null && p.CerDTO.Id > 0).Select(p => p.CerDTO).ToArray()
, BarCodeModel); , BarCodeModel);
batchPrint.ShowDialog(); batchPrint.ShowDialog();

Loading…
Cancel
Save