修复bug
This commit is contained in:
@@ -230,7 +230,9 @@ namespace WMS.Web.Domain.Services
|
||||
var sourcNos = entity.Details.SelectMany(s => s.ErpDetails).GroupBy(s => s.SourceBillNo).Select(s => s.Key);
|
||||
foreach (var s in failList)
|
||||
{
|
||||
var erp_details = entity.Details.SelectMany(s => s.ErpDetails).Select(s => s.Erp_DetailId).ToList();
|
||||
var erp_details = entity.Details
|
||||
.SelectMany(s => s.ErpDetails)
|
||||
.Where(w=>w.SourceBillNo.Equals(s)).Select(s => s.Erp_DetailId).ToList();
|
||||
var erpDto = new ErpPushDto()
|
||||
{
|
||||
RuleId = "DeliveryNotice-OutStock",//转换规则内码 发货通知单下推销售出库单
|
||||
@@ -242,7 +244,7 @@ namespace WMS.Web.Domain.Services
|
||||
//下推金蝶
|
||||
var res = await this.Push(erpDto, entity);
|
||||
if (res.result.IsSuccess)
|
||||
entity.SyncSuccess(s, loginInfo?.UserInfo?.StaffId ?? 0, res.erpId);
|
||||
entity.SyncSuccess(s, loginInfo?.UserInfo?.StaffId ?? 0, res.erpBillNo);
|
||||
else
|
||||
entity.SyncFail(res.result.Message, loginInfo?.UserInfo?.StaffId ?? 0, res.syncStatus);
|
||||
}
|
||||
@@ -258,7 +260,7 @@ namespace WMS.Web.Domain.Services
|
||||
/// </summary>
|
||||
/// <param name="dto"></param>
|
||||
/// <returns></returns>
|
||||
private async Task<(Result result, SyncStatus syncStatus, string erpId)> Push(ErpPushDto dto, OutStock entity)
|
||||
private async Task<(Result result, SyncStatus syncStatus, string erpBillNo)> Push(ErpPushDto dto, OutStock entity)
|
||||
{
|
||||
var res = await _erpService.Push(dto);
|
||||
if (!res.IsSuccess)
|
||||
@@ -287,7 +289,7 @@ namespace WMS.Web.Domain.Services
|
||||
if (!resSubmit.IsSuccess)
|
||||
{
|
||||
_logger.LogInformation($"出库单->提交失败 单号:{entity.BillNo} 错误:{resSubmit.Message}");
|
||||
return (resSubmit, SyncStatus.SubmitFail, o_dto.Ids);
|
||||
return (resSubmit, SyncStatus.SubmitFail, o_dto.Numbers.First());
|
||||
}
|
||||
//审核
|
||||
_logger.LogInformation($"出库单->提交成功 开始审核 单号:{entity.BillNo}");
|
||||
@@ -295,10 +297,10 @@ namespace WMS.Web.Domain.Services
|
||||
if (!resSubmit.IsSuccess)
|
||||
{
|
||||
_logger.LogInformation($"出库单->审核失败 单号:{entity.BillNo} 错误:{resSubmit.Message}");
|
||||
return (resSubmit, SyncStatus.CheckFail, o_dto.Ids);
|
||||
return (resSubmit, SyncStatus.CheckFail, o_dto.Numbers.First());
|
||||
}
|
||||
_logger.LogInformation($"同步金蝶成功");
|
||||
return (Result.ReSuccess(), SyncStatus.Success, o_dto.Ids);
|
||||
return (Result.ReSuccess(), SyncStatus.Success, o_dto.Numbers.First());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user