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

优化同步金蝶

Browse Source
This commit is contained in:
tongfei
2024-04-24 14:06:14 +08:00
parent 4a33a37bc4
commit 6ce2e55507
2 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -212,7 +212,7 @@ namespace WMS.Web.Domain.Entitys
if (this.SuccessSync != SyncStatus.Fail) return; if (this.SuccessSync != SyncStatus.Fail) return;
this.SuccessSync = SyncStatus.SyncIng; this.SuccessSync = SyncStatus.SyncIng;
var erpDetails = this.ErpDetails var erpDetails = this.ErpDetails
.Where(w => w.SuccessSync == SyncStatus.Fail) .Where(w => w.SuccessSync == SyncStatus.Fail || w.SuccessSync==SyncStatus.SubmitFail || w.SuccessSync == SyncStatus.CheckFail)
.ToList(); .ToList();
foreach (var e in erpDetails) foreach (var e in erpDetails)
{ {

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

@@ -877,7 +877,7 @@ namespace WMS.Web.Domain.Services
var currentDet = details.Where(x => x.Qty == det.Qty).FirstOrDefault(); var currentDet = details.Where(x => x.Qty == det.Qty).FirstOrDefault();
if (currentDet != null) if (currentDet != null)
{ {
var res = await this.QueryFirst(currentDet, erpDto.FormId, entity.BillNo, det, sc_erpService); var res = await this.QueryFirst(currentDet, erpDto.TargetFormId, entity.BillNo, det, sc_erpService);
if (res.result.IsSuccess) if (res.result.IsSuccess)
entity.SyncSuccess(det.ErpDetailId, loginInfo?.UserInfo?.StaffId ?? 0, res.erpBillNo); entity.SyncSuccess(det.ErpDetailId, loginInfo?.UserInfo?.StaffId ?? 0, res.erpBillNo);
else else
@@ -894,12 +894,6 @@ namespace WMS.Web.Domain.Services
} }
} }
//else
//{
// erpDetails_tags.ForEach(x => { x.SuccessSync = SyncStatus.Fail; });
// entity.SyncFailAll("同步金蝶失败，该采购单已存在采购入库单", loginInfo?.UserInfo?.StaffId ?? 0);
//}
//最好一条一条执行,否则执行失败 但是金蝶那边又同步成功 就会造成数据比价乱 //最好一条一条执行,否则执行失败 但是金蝶那边又同步成功 就会造成数据比价乱
var isSuccess = await sc_InStockRepositories.Update(entity, true); var isSuccess = await sc_InStockRepositories.Update(entity, true);
if (!isSuccess) return Result.ReFailure(ResultCodes.DateWriteError); if (!isSuccess) return Result.ReFailure(ResultCodes.DateWriteError);
@@ -1073,6 +1067,26 @@ namespace WMS.Web.Domain.Services
return (resSubmit, SyncStatus.CheckFail, o_dto.Numbers.First()); return (resSubmit, SyncStatus.CheckFail, o_dto.Numbers.First());
} }
} }
else if (currentDet.DocumentStatus == ErpOrderStatus.D.ToString())
{
//提交
_logger.LogInformation($"入库单->查询到已有重新审核的入库单 开始提交 单号:{billNo} erp明细Id:{erpDetail.ErpDetailId}");
var resSubmit = await sc_erpService.Submit(o_dto, formId);
if (!resSubmit.IsSuccess)
{
_logger.LogInformation($"入库单->提交失败 单号:{billNo} erp明细Id:{erpDetail.ErpDetailId} 错误:{resSubmit.Message}");
return (resSubmit, SyncStatus.SubmitFail, o_dto.Numbers.First());
}
//审核
_logger.LogInformation($"入库单->提交成功 开始审核 单号:{billNo} erp明细Id:{erpDetail.ErpDetailId}");
resSubmit = await sc_erpService.Audit(o_dto, formId);
if (!resSubmit.IsSuccess)
{
_logger.LogInformation($"入库单->审核失败 单号:{billNo} erp明细Id:{erpDetail.ErpDetailId} 错误:{resSubmit.Message}");
return (resSubmit, SyncStatus.CheckFail, o_dto.Numbers.First());
}
}
else if (currentDet.DocumentStatus == ErpOrderStatus.C.ToString()) else if (currentDet.DocumentStatus == ErpOrderStatus.C.ToString())
{ {
_logger.LogInformation($"入库单->存在已审核的ERP入库单 单号:{billNo} erp明细Id:{erpDetail.ErpDetailId} 错误:存在已审核的ERP入库单"); _logger.LogInformation($"入库单->存在已审核的ERP入库单 单号:{billNo} erp明细Id:{erpDetail.ErpDetailId} 错误:存在已审核的ERP入库单");