diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index 6354fca0..c00ebab3 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -5970,6 +5970,11 @@ 审核失败 + + + 同步中 + + 盘点单类型 diff --git a/src/WMS.Web.Core/Dto/InStock/InStockQueryRequest.cs b/src/WMS.Web.Core/Dto/InStock/InStockQueryRequest.cs index be1cf5ec..a0a317bf 100644 --- a/src/WMS.Web.Core/Dto/InStock/InStockQueryRequest.cs +++ b/src/WMS.Web.Core/Dto/InStock/InStockQueryRequest.cs @@ -34,7 +34,7 @@ namespace WMS.Web.Core.Dto /// /// 同步成功或者失败 null 就是未同步 /// - public bool? SuccessSync { get; set; } + public int? SuccessSync { get; set; } /// /// 供应商ID /// diff --git a/src/WMS.Web.Domain/Entitys/InStock.cs b/src/WMS.Web.Domain/Entitys/InStock.cs index 630bc971..65c2029c 100644 --- a/src/WMS.Web.Domain/Entitys/InStock.cs +++ b/src/WMS.Web.Domain/Entitys/InStock.cs @@ -42,7 +42,7 @@ namespace WMS.Web.Domain.Entitys /// /// 同步成功或者失败 /// - public SyncStatus SuccessSync { get; set; } = SyncStatus.Fail; + public SyncStatus SuccessSync { get; set; } = SyncStatus.SyncIng; /// /// 操作人 diff --git a/src/WMS.Web.Domain/Entitys/InStockErpDetails.cs b/src/WMS.Web.Domain/Entitys/InStockErpDetails.cs index 2616a1b4..ed9b6dfe 100644 --- a/src/WMS.Web.Domain/Entitys/InStockErpDetails.cs +++ b/src/WMS.Web.Domain/Entitys/InStockErpDetails.cs @@ -46,7 +46,7 @@ namespace WMS.Web.Domain.Entitys /// /// 同步成功或者失败 默认是失败状态 /// - public SyncStatus SuccessSync { get; set; } = SyncStatus.Fail; + public SyncStatus SuccessSync { get; set; } = SyncStatus.SyncIng; /// /// 同步到金蝶后金蝶的单据Id diff --git a/src/WMS.Web.Domain/Services/InStockService.cs b/src/WMS.Web.Domain/Services/InStockService.cs index a565fb55..545e6ba6 100644 --- a/src/WMS.Web.Domain/Services/InStockService.cs +++ b/src/WMS.Web.Domain/Services/InStockService.cs @@ -131,7 +131,12 @@ namespace WMS.Web.Domain.Services //同步金蝶 if (entity.Type == InstockType.Purchase) - await this.PurchaseInStock(entity, loginInfo); + { + Task.Run(async () => + { + await this.PurchaseInStock(entity, loginInfo); + }).GetAwaiter().GetResult(); + } return Result.ReSuccess(); } diff --git a/src/WMS.Web.Repositories/InStockRepositories.cs b/src/WMS.Web.Repositories/InStockRepositories.cs index 5cabe1af..ba8ff384 100644 --- a/src/WMS.Web.Repositories/InStockRepositories.cs +++ b/src/WMS.Web.Repositories/InStockRepositories.cs @@ -283,6 +283,9 @@ namespace WMS.Web.Repositories if (dto.CreateEndDate != null) query = query.Where(w => w.order.CreateTime <= dto.CreateEndDate.Value); + if(dto.SuccessSync.HasValue) + query = query.Where(w => (int)w.order.SuccessSync == dto.SuccessSync.Value); + int total = await query.CountAsync(); var list = await query.Select(s => new InStockQueryResponse() { @@ -300,7 +303,7 @@ namespace WMS.Web.Repositories Qty = s.detail.Qty, Creator = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, s.order.CreatorId), CreateTime = s.order.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"), - SuccessSync = s.order.SuccessSync == SyncStatus.Success ? "成功" : "失败", + SuccessSync = s.order.SuccessSync == SyncStatus.Success ? "成功" : (s.order.SuccessSync == SyncStatus.SyncIng ? "同步中" : "失败"), }).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync(); return (list, total);