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

修复bug

Browse Source
This commit is contained in:
18942506660
2023-12-20 17:20:39 +08:00
parent 0ba210b62a
commit c71b06ca3a
3 changed files with 33 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/WMS.Web.Api/Controllers/TestController.cs
View File

@@ -8,6 +8,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.ServiceModel;
using System.Threading;
using System.Threading.Tasks;
using WMS.Web.Core.Dto;
using WMS.Web.Core.Dto.Erp.Customer;
@@ -56,10 +57,10 @@ namespace WMS.Web.Api.Controllers
[Route("hj")]
public async Task<string> TestHJ()
{
// OperateRequest dto = new OperateRequest();
// dto.Ids.Add(71);
// var result = await this._erpService.BillQueryForSubStock();
//var ss= result.Data.Where(w => w.Name.Equals("Fares")).ToList();
// OperateRequest dto = new OperateRequest();
// dto.Ids.Add(71);
// var result = await this._erpService.BillQueryForSubStock();
//var ss= result.Data.Where(w => w.Name.Equals("Fares")).ToList();
//await _outStockService.Sync(dto, null);
//var b = await _takeStockService.Sync(dto);
// List<ErpCustomerDto> list = null;

22
src/WMS.Web.Domain/Services/OutStockService.cs
View File

@@ -197,10 +197,7 @@ namespace WMS.Web.Domain.Services
if (entity.Type == OutStockType.Sal)
{
Task.Run(async () =>
{
await SalOutStock(entity, loginInfo);
}).GetAwaiter().GetResult();
await Sync(entity, loginInfo);
}
return Result.ReSuccess();
@@ -215,13 +212,22 @@ namespace WMS.Web.Domain.Services
var list = await _outStockRepositories.GetEntityList(dto.Ids);
foreach (var entity in list)
{
Task.Run(async () =>
{
await SalOutStock(entity, loginInfo);
}).GetAwaiter().GetResult();
await Sync(entity, loginInfo);
}
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>

28
src/WMS.Web.Domain/Services/TakeStockService.cs
View File

@@ -137,12 +137,7 @@ namespace WMS.Web.Domain.Services
//同步金蝶
foreach (var entity in list)
{
Task.Run(async () =>
{
var res = await Loss_Profit(entity);
if (!res.IsSuccess)
_logger.LogError($"盘点同步失败:{res.Message}");
}).GetAwaiter().GetResult();
await Sync(entity);
}
return Result.ReSuccess();
@@ -155,20 +150,25 @@ namespace WMS.Web.Domain.Services
/// <returns></returns>
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();
foreach (var entity in list)
{
Task.Run(async () =>
{
var res = await Loss_Profit(entity);
if (!res.IsSuccess)
_logger.LogError($"盘点同步失败:{res.Message}");
}).GetAwaiter().GetResult();
await Sync(entity);
}
return Result.ReSuccess();
}
private Task Sync(TakeStock entity)
{
Task.Run(async () =>
{
var res = await Loss_Profit(entity);
if (!res.IsSuccess)
_logger.LogError($"盘点同步失败:{res.Message}");
});
return Task.CompletedTask;
}
/// <summary>
/// 盘盈盘亏同步金蝶
/// </summary>