diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index 5aa75012..0d5e5243 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -532,11 +532,11 @@ - + 同步金蝶 - + diff --git a/src/WMS.Web.Core/Dto/InStock/InStockQueryResponse.cs b/src/WMS.Web.Core/Dto/InStock/InStockQueryResponse.cs index ba4c1a66..f63be9d6 100644 --- a/src/WMS.Web.Core/Dto/InStock/InStockQueryResponse.cs +++ b/src/WMS.Web.Core/Dto/InStock/InStockQueryResponse.cs @@ -73,6 +73,6 @@ namespace WMS.Web.Core.Dto /// /// 同步成功或者失败 /// - public bool? SuccessSync { get; set; } + public string SuccessSync { get; set; } } } diff --git a/src/WMS.Web.Domain/Entitys/InStock.cs b/src/WMS.Web.Domain/Entitys/InStock.cs index a5642d1d..ee8d05dd 100644 --- a/src/WMS.Web.Domain/Entitys/InStock.cs +++ b/src/WMS.Web.Domain/Entitys/InStock.cs @@ -41,7 +41,7 @@ namespace WMS.Web.Domain.Entitys /// /// 同步成功或者失败 /// - public int? SuccessSync { get; set; } + public SyncStatus SuccessSync { get; set; } = SyncStatus.Fail; /// /// 操作人 @@ -77,12 +77,12 @@ namespace WMS.Web.Domain.Entitys /// /// 同步金蝶 /// - /// + /// /// /// - public void Sync(bool isSuccess, int operateId, string remark) + public void Sync(SyncStatus syncStatus, int operateId, string remark) { - this.SuccessSync = isSuccess; + this.SuccessSync = syncStatus; this.Remark = remark; this.OperateId = operateId; this.SyncTime = DateTime.Now; diff --git a/src/WMS.Web.Repositories/InStockRepositories.cs b/src/WMS.Web.Repositories/InStockRepositories.cs index 7bc155d3..081c515b 100644 --- a/src/WMS.Web.Repositories/InStockRepositories.cs +++ b/src/WMS.Web.Repositories/InStockRepositories.cs @@ -14,6 +14,7 @@ using WMS.Web.Core.Internal.Results; using WMS.Web.Domain.Entitys; using WMS.Web.Domain.Infrastructure; using WMS.Web.Domain.IService.Public; +using WMS.Web.Domain.Values; using WMS.Web.Domain.Values.Single; using WMS.Web.Repositories.Configuration; @@ -130,7 +131,7 @@ namespace WMS.Web.Repositories Qty =s.detail.Qty, Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.CreatorId), CreateTime =s.order.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"), - SuccessSync=s.order.SuccessSync + SuccessSync = s.order.SuccessSync == SyncStatus.Success ? "成功" : "失败", }).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync(); return (list, total);