修复bug
This commit is contained in:
@@ -8,6 +8,7 @@ using System;
|
|||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.ServiceModel;
|
using System.ServiceModel;
|
||||||
|
using System.Threading;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using WMS.Web.Core.Dto;
|
using WMS.Web.Core.Dto;
|
||||||
using WMS.Web.Core.Dto.Erp.Customer;
|
using WMS.Web.Core.Dto.Erp.Customer;
|
||||||
|
|||||||
@@ -197,10 +197,7 @@ namespace WMS.Web.Domain.Services
|
|||||||
|
|
||||||
if (entity.Type == OutStockType.Sal)
|
if (entity.Type == OutStockType.Sal)
|
||||||
{
|
{
|
||||||
Task.Run(async () =>
|
await Sync(entity, loginInfo);
|
||||||
{
|
|
||||||
await SalOutStock(entity, loginInfo);
|
|
||||||
}).GetAwaiter().GetResult();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return Result.ReSuccess();
|
return Result.ReSuccess();
|
||||||
@@ -215,13 +212,22 @@ namespace WMS.Web.Domain.Services
|
|||||||
var list = await _outStockRepositories.GetEntityList(dto.Ids);
|
var list = await _outStockRepositories.GetEntityList(dto.Ids);
|
||||||
foreach (var entity in list)
|
foreach (var entity in list)
|
||||||
{
|
{
|
||||||
Task.Run(async () =>
|
await Sync(entity, loginInfo);
|
||||||
{
|
|
||||||
await SalOutStock(entity, loginInfo);
|
|
||||||
}).GetAwaiter().GetResult();
|
|
||||||
}
|
}
|
||||||
return Result.ReSuccess();
|
return Result.ReSuccess();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private Task Sync(OutStock entity, LoginInDto loginInfo)
|
||||||
|
{
|
||||||
|
Task.Run(async () =>
|
||||||
|
{
|
||||||
|
var res = await SalOutStock(entity, loginInfo);
|
||||||
|
if (!res.IsSuccess)
|
||||||
|
_logger.LogError($"出库单同步失败:{res.Message}");
|
||||||
|
});
|
||||||
|
return Task.CompletedTask;
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 同步金蝶销售出库
|
/// 同步金蝶销售出库
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@@ -137,12 +137,7 @@ namespace WMS.Web.Domain.Services
|
|||||||
//同步金蝶
|
//同步金蝶
|
||||||
foreach (var entity in list)
|
foreach (var entity in list)
|
||||||
{
|
{
|
||||||
Task.Run(async () =>
|
await Sync(entity);
|
||||||
{
|
|
||||||
var res = await Loss_Profit(entity);
|
|
||||||
if (!res.IsSuccess)
|
|
||||||
_logger.LogError($"盘点同步失败:{res.Message}");
|
|
||||||
}).GetAwaiter().GetResult();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return Result.ReSuccess();
|
return Result.ReSuccess();
|
||||||
@@ -155,19 +150,24 @@ namespace WMS.Web.Domain.Services
|
|||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public async Task<Result> Sync(OperateRequest dto)
|
public async Task<Result> Sync(OperateRequest dto)
|
||||||
{
|
{
|
||||||
var list = await _takeStockRepositories.GetEntityList(dto.Ids);
|
var list = _takeStockRepositories.GetEntityList(dto.Ids).GetAwaiter().GetResult();
|
||||||
list = list.Where(w => w.SuccessSync == SyncStatus.Fail || w.SuccessSync == SyncStatus.SyncIng).ToList();
|
list = list.Where(w => w.SuccessSync == SyncStatus.Fail || w.SuccessSync == SyncStatus.SyncIng).ToList();
|
||||||
foreach (var entity in list)
|
foreach (var entity in list)
|
||||||
|
{
|
||||||
|
await Sync(entity);
|
||||||
|
}
|
||||||
|
return Result.ReSuccess();
|
||||||
|
}
|
||||||
|
|
||||||
|
private Task Sync(TakeStock entity)
|
||||||
{
|
{
|
||||||
Task.Run(async () =>
|
Task.Run(async () =>
|
||||||
{
|
{
|
||||||
var res = await Loss_Profit(entity);
|
var res = await Loss_Profit(entity);
|
||||||
if (!res.IsSuccess)
|
if (!res.IsSuccess)
|
||||||
_logger.LogError($"盘点同步失败:{res.Message}");
|
_logger.LogError($"盘点同步失败:{res.Message}");
|
||||||
}).GetAwaiter().GetResult();
|
});
|
||||||
}
|
return Task.CompletedTask;
|
||||||
|
|
||||||
return Result.ReSuccess();
|
|
||||||
}
|
}
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 盘盈盘亏同步金蝶
|
/// 盘盈盘亏同步金蝶
|
||||||
|
|||||||
Reference in New Issue
Block a user