diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index 076fcf85..f69e1fe0 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -4817,6 +4817,11 @@ 单据编号 + + + 同步成功或者失败 null 就是未同步 + + 盘点日期-开始 diff --git a/src/WMS.Web.Core/Dto/TakeStock/TakeStockQueryRequest.cs b/src/WMS.Web.Core/Dto/TakeStock/TakeStockQueryRequest.cs index 5626eea9..973d2371 100644 --- a/src/WMS.Web.Core/Dto/TakeStock/TakeStockQueryRequest.cs +++ b/src/WMS.Web.Core/Dto/TakeStock/TakeStockQueryRequest.cs @@ -22,6 +22,10 @@ namespace WMS.Web.Core.Dto.TakeStock /// public string BillNo { get; set; } /// + /// 同步成功或者失败 null 就是未同步 + /// + public int? SuccessSync { get; set; } + /// /// 盘点日期-开始 /// public DateTime? DateBeginDate { get; set; } = null; diff --git a/src/WMS.Web.Repositories/TakeStockRepositories.cs b/src/WMS.Web.Repositories/TakeStockRepositories.cs index 8ed5beac..d1478da0 100644 --- a/src/WMS.Web.Repositories/TakeStockRepositories.cs +++ b/src/WMS.Web.Repositories/TakeStockRepositories.cs @@ -188,6 +188,17 @@ namespace WMS.Web.Repositories var split = dto.StockCode.Split("_$"); query = query.Where(w => w.detail.StockCode == split[0] && w.detail.OrgCode == split[1]); } + if (dto.SuccessSync != null) + { + if ((SyncStatus)dto.SuccessSync == SyncStatus.Success) + query = query.Where(w => w.order.SuccessSync == SyncStatus.Success); + else if ((SyncStatus)dto.SuccessSync == SyncStatus.SyncIng) + query = query.Where(w => w.order.SuccessSync == SyncStatus.SyncIng); + else if ((SyncStatus)dto.SuccessSync == SyncStatus.Fail) + query = query.Where(w => w.order.SuccessSync == SyncStatus.Fail + || w.order.SuccessSync == SyncStatus.SubmitFail + || w.order.SuccessSync == SyncStatus.CheckFail); + } if (dto.DateBeginDate != null) query = query.Where(w => w.order.Date >= dto.DateBeginDate); if (dto.DateEndDate != null)