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 16:29:32 +08:00
parent dcba2aa380
commit 428257d1e7
8 changed files with 37 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,7 +80,7 @@ namespace WMS.Web.Domain.Entitys
/// 同步成功或者失败 默认是失败状态
/// </summary>
[Column("SuccessSync")]
public SyncStatus SuccessSync { get; set; } = SyncStatus.Fail;
public SyncStatus SuccessSync { get; set; } = SyncStatus.SyncIng;
///// <summary>
///// 同步失败的源订单号(默认就包含所有来源单号)
///// </summary>

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

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

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

@@ -39,7 +39,7 @@ namespace WMS.Web.Domain.Entitys
/// 同步状态
/// </summary>
[Column("SuccessSync")]
public SyncStatus SuccessSync { get; set; } = SyncStatus.Fail;
public SyncStatus SuccessSync { get; set; } = SyncStatus.SyncIng;
/// <summary>
/// 盘点结果类型：1为盘盈，2位盘亏
/// 盘点数量-系统库存 大于0为盘盈 小于0为盘亏

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

@@ -196,7 +196,12 @@ namespace WMS.Web.Domain.Services
return Result.ReFailure(ResultCodes.DateWriteError);
if (entity.Type == OutStockType.Sal)
await SalOutStock(entity, loginInfo);
{
Task.Run(async () =>
{
await SalOutStock(entity, loginInfo);
}).GetAwaiter().GetResult();
}
return Result.ReSuccess();
}
@@ -210,7 +215,10 @@ namespace WMS.Web.Domain.Services
var list = await _outStockRepositories.GetEntityList(dto.Ids);
foreach (var entity in list)
{
await SalOutStock(entity, loginInfo);
Task.Run(async () =>
{
await SalOutStock(entity, loginInfo);
}).GetAwaiter().GetResult();
}
return Result.ReSuccess();
}

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

@@ -136,8 +136,12 @@ namespace WMS.Web.Domain.Services
//同步金蝶
foreach (var entity in list)
{
var res = await Loss_Profit(entity);
if (!res.IsSuccess) return res;
Task.Run(async () =>
{
var res = await Loss_Profit(entity);
if (!res.IsSuccess)
_logger.LogError($"盘点同步失败:{res.Message}");
}).GetAwaiter().GetResult();
}
return Result.ReSuccess();
@@ -151,11 +155,15 @@ namespace WMS.Web.Domain.Services
public async Task<Result> Sync(OperateRequest dto)
{
var list = await _takeStockRepositories.GetEntityList(dto.Ids);
list = list.Where(w => w.SuccessSync == SyncStatus.Fail).ToList();
list = list.Where(w => w.SuccessSync == SyncStatus.Fail|| w.SuccessSync == SyncStatus.SyncIng).ToList();
foreach (var entity in list)
{
var res = await Loss_Profit(entity);
if (!res.IsSuccess) return res;
Task.Run(async () =>
{
var res = await Loss_Profit(entity);
if (!res.IsSuccess)
_logger.LogError($"盘点同步失败:{res.Message}");
}).GetAwaiter().GetResult();
}
return Result.ReSuccess();

13
src/WMS.Web.Domain/Values/SyncStatus.cs
View File

@@ -8,18 +8,18 @@ namespace WMS.Web.Domain.Values
/// <summary>
/// 同步金蝶状态
/// </summary>
public enum SyncStatus
public enum SyncStatus
{
/// <summary>
/// 失败(保存失败 未保存)
/// </summary>
[EnumRemark("失败")]
Fail =0,
Fail = 0,
/// <summary>
/// 成功
/// </summary>
[EnumRemark("成功")]
Success =1,
Success = 1,
/// <summary>
/// 提交失败
/// </summary>
@@ -29,6 +29,11 @@ namespace WMS.Web.Domain.Values
/// 审核失败
/// </summary>
[EnumRemark("审核失败")]
CheckFail = 3
CheckFail = 3,
/// <summary>
/// 同步中
/// </summary>
[EnumRemark("同步中")]
SyncIng = 4
}
}

2
src/WMS.Web.Repositories/OutStockRepositories.cs
View File

@@ -165,7 +165,7 @@ namespace WMS.Web.Repositories
Type = s.order.Type.GetRemark(),
Creator = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, s.order.CreatorId),
CreateTime = s.order.CreateTime.DateToStringSeconds(),
SuccessSync = s.order.SuccessSync == SyncStatus.Success ? "成功" : "失败",
SuccessSync = s.order.SuccessSync == SyncStatus.Success ? "成功" : (s.order.SuccessSync == SyncStatus.SyncIng ? "同步中" : "失败"),
Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, companyId, s.order.StockCode + s.order.OrgCode),
SourceBillNoList = s.detail.ErpDetails.Select(s => s.SourceBillNo).ToList(),
SaleBillNoList = s.detail.ErpDetails.Select(s => s.SaleBillNo).ToList(),

2
src/WMS.Web.Repositories/TakeStockRepositories.cs
View File

@@ -214,7 +214,7 @@ namespace WMS.Web.Repositories
FailRemark=s.order.FailRemark,
Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.CreatorId),
Date = s.order.Date.DateToStringSeconds(),
SuccessSync = s.order.SuccessSync== SyncStatus.Success ? "成功":"失败",
SuccessSync = s.order.SuccessSync == SyncStatus.Success ? "成功" : (s.order.SuccessSync == SyncStatus.SyncIng ? "同步中" : "失败"),
#endregion
}).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();