同步金蝶,改成异步
This commit is contained in:
@@ -5970,6 +5970,11 @@
|
||||
审核失败
|
||||
</summary>
|
||||
</member>
|
||||
<member name="F:WMS.Web.Domain.Values.SyncStatus.SyncIng">
|
||||
<summary>
|
||||
同步中
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:WMS.Web.Domain.Values.TakeStockType">
|
||||
<summary>
|
||||
盘点单类型
|
||||
|
||||
@@ -34,7 +34,7 @@ namespace WMS.Web.Core.Dto
|
||||
/// <summary>
|
||||
/// 同步成功或者失败 null 就是未同步
|
||||
/// </summary>
|
||||
public bool? SuccessSync { get; set; }
|
||||
public int? SuccessSync { get; set; }
|
||||
/// <summary>
|
||||
/// 供应商ID
|
||||
/// </summary>
|
||||
|
||||
@@ -42,7 +42,7 @@ namespace WMS.Web.Domain.Entitys
|
||||
/// <summary>
|
||||
/// 同步成功或者失败
|
||||
/// </summary>
|
||||
public SyncStatus SuccessSync { get; set; } = SyncStatus.Fail;
|
||||
public SyncStatus SuccessSync { get; set; } = SyncStatus.SyncIng;
|
||||
|
||||
/// <summary>
|
||||
/// 操作人
|
||||
|
||||
@@ -46,7 +46,7 @@ namespace WMS.Web.Domain.Entitys
|
||||
/// <summary>
|
||||
/// 同步成功或者失败 默认是失败状态
|
||||
/// </summary>
|
||||
public SyncStatus SuccessSync { get; set; } = SyncStatus.Fail;
|
||||
public SyncStatus SuccessSync { get; set; } = SyncStatus.SyncIng;
|
||||
|
||||
/// <summary>
|
||||
/// 同步到金蝶后金蝶的单据Id
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user