18923810322/WMS-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

同步金蝶，改成异步

Browse Source
This commit is contained in:
tongfei
2023-12-20 16:48:59 +08:00
parent 428257d1e7
commit 0870962bc4
6 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
View File

@@ -5970,6 +5970,11 @@
审核失败 审核失败
</summary> </summary>
</member> </member>
<member name="F:WMS.Web.Domain.Values.SyncStatus.SyncIng">
<summary>
同步中
</summary>
</member>
<member name="T:WMS.Web.Domain.Values.TakeStockType"> <member name="T:WMS.Web.Domain.Values.TakeStockType">
<summary> <summary>
盘点单类型 盘点单类型

2
src/WMS.Web.Core/Dto/InStock/InStockQueryRequest.cs
View File

@@ -34,7 +34,7 @@ namespace WMS.Web.Core.Dto
/// <summary> /// <summary>
/// 同步成功或者失败 null 就是未同步 /// 同步成功或者失败 null 就是未同步
/// </summary> /// </summary>
public bool? SuccessSync { get; set; } public int? SuccessSync { get; set; }
/// <summary> /// <summary>
/// 供应商ID /// 供应商ID
/// </summary> /// </summary>

2
src/WMS.Web.Domain/Entitys/InStock.cs
View File

@@ -42,7 +42,7 @@ namespace WMS.Web.Domain.Entitys
/// <summary> /// <summary>
/// 同步成功或者失败 /// 同步成功或者失败
/// </summary> /// </summary>
public SyncStatus SuccessSync { get; set; } = SyncStatus.Fail; public SyncStatus SuccessSync { get; set; } = SyncStatus.SyncIng;
/// <summary> /// <summary>
/// 操作人 /// 操作人

2
src/WMS.Web.Domain/Entitys/InStockErpDetails.cs
View File

@@ -46,7 +46,7 @@ namespace WMS.Web.Domain.Entitys
/// <summary> /// <summary>
/// 同步成功或者失败 默认是失败状态 /// 同步成功或者失败 默认是失败状态
/// </summary> /// </summary>
public SyncStatus SuccessSync { get; set; } = SyncStatus.Fail; public SyncStatus SuccessSync { get; set; } = SyncStatus.SyncIng;
/// <summary> /// <summary>
/// 同步到金蝶后金蝶的单据Id /// 同步到金蝶后金蝶的单据Id

7
src/WMS.Web.Domain/Services/InStockService.cs
View File

@@ -131,7 +131,12 @@ namespace WMS.Web.Domain.Services
//同步金蝶 //同步金蝶
if (entity.Type == InstockType.Purchase) if (entity.Type == InstockType.Purchase)
await this.PurchaseInStock(entity, loginInfo); {
Task.Run(async () =>
{
await this.PurchaseInStock(entity, loginInfo);
}).GetAwaiter().GetResult();
}
return Result.ReSuccess(); return Result.ReSuccess();
} }

5
src/WMS.Web.Repositories/InStockRepositories.cs
View File

@@ -283,6 +283,9 @@ namespace WMS.Web.Repositories
if (dto.CreateEndDate != null) if (dto.CreateEndDate != null)
query = query.Where(w => w.order.CreateTime <= dto.CreateEndDate.Value); 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(); int total = await query.CountAsync();
var list = await query.Select(s => new InStockQueryResponse() var list = await query.Select(s => new InStockQueryResponse()
{ {
@@ -300,7 +303,7 @@ namespace WMS.Web.Repositories
Qty = s.detail.Qty, Qty = s.detail.Qty,
Creator = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, s.order.CreatorId), Creator = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, s.order.CreatorId),
CreateTime = s.order.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"), 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(); }).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
return (list, total); return (list, total);