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

调整同步

Browse Source
This commit is contained in:
18942506660
2023-12-15 10:24:04 +08:00
parent 9273c9d06a
commit 61323e930a
3 changed files with 39 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
View File

@@ -1185,13 +1185,13 @@
</summary> </summary>
<param name="creatorId"></param> <param name="creatorId"></param>
</member> </member>
<member name="M:WMS.Web.Domain.Entitys.OutStock.SyncSuccess(System.String,System.Int32,System.String)"> <member name="M:WMS.Web.Domain.Entitys.OutStock.SyncSuccess(System.Int32,System.Int32,System.String)">
<summary> <summary>
同步金蝶(成功) 同步金蝶(成功)
</summary> </summary>
<param name="operateId"></param> <param name="operateId"></param>
</member> </member>
<member name="M:WMS.Web.Domain.Entitys.OutStock.SyncFail(System.String,System.Int32,WMS.Web.Domain.Values.SyncStatus)"> <member name="M:WMS.Web.Domain.Entitys.OutStock.SyncFail(System.String,System.Int32,System.Int32,WMS.Web.Domain.Values.SyncStatus)">
<summary> <summary>
同步金蝶(失败) 同步金蝶(失败)
</summary> </summary>
@@ -3978,7 +3978,7 @@
</summary> </summary>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:WMS.Web.Domain.Services.OutStockService.Push(WMS.Web.Core.Dto.Erp.ErpPushDto,WMS.Web.Domain.Entitys.OutStock)"> <member name="M:WMS.Web.Domain.Services.OutStockService.Push(WMS.Web.Core.Dto.Erp.ErpPushDto,WMS.Web.Domain.Entitys.OutStockErpDetails,System.String)">
<summary> <summary>
下推 下推
</summary> </summary>

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

@@ -133,16 +133,18 @@ namespace WMS.Web.Domain.Entitys
/// 同步金蝶(成功) /// 同步金蝶(成功)
/// </summary> /// </summary>
/// <param name="operateId"></param> /// <param name="operateId"></param>
public void SyncSuccess(string sourcBillNo, int operateId,string erpBillNo) public void SyncSuccess(int erpDetailId, int operateId,string erpBillNo)
{ {
//foreach (var e in erpDetailIds) //foreach (var e in erpDetailIds)
// this.SuccessSyncFail.Remove(e); // this.SuccessSyncFail.Remove(e);
var erpd = this.Details.SelectMany(s => s.ErpDetails).Where(w => w.SourceBillNo.Equals(sourcBillNo)).ToList(); var erpd = this.Details.SelectMany(s => s.ErpDetails).FirstOrDefault(w => w.Erp_DetailId==erpDetailId);
foreach (var e in erpd) erpd.SuccessSync = SyncStatus.Success;
{ erpd.ErpSyncBillNo = erpBillNo;
e.SuccessSync = SyncStatus.Success; //foreach (var e in erpd)
e.ErpSyncBillNo = erpBillNo; //{
} //e.SuccessSync = SyncStatus.Success;
//e.ErpSyncBillNo = erpBillNo;
//}
//所有erp明细同步成功才是整个单据成功 //所有erp明细同步成功才是整个单据成功
var erpDetails = this.Details.SelectMany(s => s.ErpDetails); var erpDetails = this.Details.SelectMany(s => s.ErpDetails);
if (erpDetails.Where(w => w.SuccessSync == SyncStatus.Success).Count()== erpDetails.Count()) if (erpDetails.Where(w => w.SuccessSync == SyncStatus.Success).Count()== erpDetails.Count())
@@ -157,9 +159,11 @@ namespace WMS.Web.Domain.Entitys
/// 同步金蝶(失败) /// 同步金蝶(失败)
/// </summary> /// </summary>
/// <param name="operateId"></param> /// <param name="operateId"></param>
public void SyncFail(string remark, int operateId, SyncStatus syncStatus) public void SyncFail(string remark, int erpDetailId, int operateId, SyncStatus syncStatus)
{ {
this.SuccessSync = syncStatus; var erpd = this.Details.SelectMany(s => s.ErpDetails).FirstOrDefault(w => w.Erp_DetailId == erpDetailId);
erpd.SuccessSync = syncStatus;
this.SuccessSync = SyncStatus.Fail;
this.Remark = remark; this.Remark = remark;
this.OperateId = operateId; this.OperateId = operateId;
this.SyncTime = DateTime.Now; this.SyncTime = DateTime.Now;

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

@@ -220,33 +220,34 @@ namespace WMS.Web.Domain.Services
/// <returns></returns> /// <returns></returns>
private async Task<Result> SalOutStock(OutStock entity, LoginInDto loginInfo) private async Task<Result> SalOutStock(OutStock entity, LoginInDto loginInfo)
{ {
if (entity.Details.Count() != 1) return Result.ReSuccess();
if (entity.Type != OutStockType.Sal) return Result.ReSuccess(); if (entity.Type != OutStockType.Sal) return Result.ReSuccess();
if (entity.SuccessSync != SyncStatus.Fail) return Result.ReSuccess(); if (entity.SuccessSync == SyncStatus.Success) return Result.ReSuccess();
List<string> failList = entity.Details.SelectMany(s => s.ErpDetails) //List<string> failList = entity.Details.SelectMany(s => s.ErpDetails)
.Where(w => w.SuccessSync == SyncStatus.Fail).GroupBy(g => g.SourceBillNo) // .Where(w => w.SuccessSync == SyncStatus.Fail).GroupBy(g => g.SourceBillNo)
.Select(s => s.Key).ToList();//同步失败的来源单号 // .Select(s => s.Key).ToList();//同步失败的来源单号
//找到单据里需要同步的单据 // //找到单据里需要同步的单据
var sourcNos = entity.Details.SelectMany(s => s.ErpDetails).GroupBy(s => s.SourceBillNo).Select(s => s.Key); //var sourcNos = entity.Details.SelectMany(s => s.ErpDetails).GroupBy(s => s.SourceBillNo).Select(s => s.Key);
foreach (var s in failList) var erpDetails = entity.Details.SelectMany(s => s.ErpDetails).Where(w => w.SuccessSync == SyncStatus.Fail).ToList();
foreach (var s in erpDetails)
{ {
var erp_details = entity.Details var erp_details = entity.Details
.SelectMany(s => s.ErpDetails) .SelectMany(s => s.ErpDetails)
.Where(w=>w.SourceBillNo.Equals(s)).Select(s => s.Erp_DetailId).ToList(); .Where(w => w.SourceBillNo.Equals(s)).Select(s => s.Erp_DetailId).ToList();
var erpDto = new ErpPushDto() var erpDto = new ErpPushDto()
{ {
RuleId = "DeliveryNotice-OutStock",//转换规则内码 发货通知单下推销售出库单 RuleId = "DeliveryNotice-OutStock",//转换规则内码 发货通知单下推销售出库单
FormId = FormIdParam.SAL_DELIVERYNOTICE.ToString(), FormId = FormIdParam.SAL_DELIVERYNOTICE.ToString(),
//Numbers = new List<string>() { s }, //Numbers = new List<string>() { s },
TargetFormId = FormIdParam.SAL_OUTSTOCK.ToString(), TargetFormId = FormIdParam.SAL_OUTSTOCK.ToString(),
DetailsId = string.Join(",", erp_details) DetailsId = s.Erp_DetailId.ToString()
//DetailsId = string.Join(",", erp_details)
}; };
//下推金蝶 //下推金蝶
var res = await this.Push(erpDto, entity); var res = await this.Push(erpDto, s, entity.BillNo);
if (res.result.IsSuccess) if (res.result.IsSuccess)
entity.SyncSuccess(s, loginInfo?.UserInfo?.StaffId ?? 0, res.erpBillNo); entity.SyncSuccess(s.Erp_DetailId, loginInfo?.UserInfo?.StaffId ?? 0, res.erpBillNo);
else else
entity.SyncFail(res.result.Message, loginInfo?.UserInfo?.StaffId ?? 0, res.syncStatus); entity.SyncFail(res.result.Message, s.Erp_DetailId, loginInfo?.UserInfo?.StaffId ?? 0, res.syncStatus);
} }
//entity.SuccessSync = entity.SuccessSyncFail.Count() > 0 ? false : true; //entity.SuccessSync = entity.SuccessSyncFail.Count() > 0 ? false : true;
//最好一条一条执行,否则执行失败 但是金蝶那边又同步成功 就会造成数据比价乱 //最好一条一条执行,否则执行失败 但是金蝶那边又同步成功 就会造成数据比价乱
@@ -260,43 +261,43 @@ namespace WMS.Web.Domain.Services
/// </summary> /// </summary>
/// <param name="dto"></param> /// <param name="dto"></param>
/// <returns></returns> /// <returns></returns>
private async Task<(Result result, SyncStatus syncStatus, string erpBillNo)> Push(ErpPushDto dto, OutStock entity) private async Task<(Result result, SyncStatus syncStatus, string erpBillNo)> Push(ErpPushDto dto, OutStockErpDetails erpDetail, string billNo)
{ {
var res = await _erpService.Push(dto); var res = await _erpService.Push(dto);
if (!res.IsSuccess) if (!res.IsSuccess)
{ {
_logger.LogInformation($"出库单->下推失败 单号:{entity.BillNo} 错误:{res.Message}"); _logger.LogInformation($"出库单->下推失败 单号:{billNo} 错误:{res.Message}");
return (Result.ReFailure(res.Message, res.Status), SyncStatus.Fail, ""); return (Result.ReFailure(res.Message, res.Status), SyncStatus.Fail, "");
} }
string id = res.Data; string id = res.Data;
var resSalOutStock = await _erpService.BillQueryForSalOutStock(id); var resSalOutStock = await _erpService.BillQueryForSalOutStock(id);
var salOutStock = resSalOutStock.Data; var salOutStock = resSalOutStock.Data;
salOutStock.Details[0].Qty = entity.Details[0].Qty; salOutStock.Details[0].Qty = erpDetail.Qty;
//{"Id":12709885,"Number":"XSCKD10629570","DIndex":0} //{"Id":12709885,"Number":"XSCKD10629570","DIndex":0}
string formId = dto.TargetFormId.ToString(); string formId = dto.TargetFormId.ToString();
_logger.LogInformation($"出库单->开始同步金蝶 单号:{entity.BillNo} 数据: {JsonConvert.SerializeObject(dto)}"); _logger.LogInformation($"出库单->开始同步金蝶 单号:{billNo} 数据: {JsonConvert.SerializeObject(dto)}");
var res_s = await _erpService.Save<ErpSalOutStockSaveDto>(salOutStock, formId); var res_s = await _erpService.Save<ErpSalOutStockSaveDto>(salOutStock, formId);
if (!res_s.IsSuccess) if (!res_s.IsSuccess)
{ {
_logger.LogInformation($"出库单->修改数量失败 单号:{entity.BillNo} 错误:{res_s.Message}"); _logger.LogInformation($"出库单->修改数量失败 单号:{billNo} 错误:{res_s.Message}");
return (Result.ReFailure(res_s.Message, res_s.Status), SyncStatus.SubmitFail, id); return (Result.ReFailure(res_s.Message, res_s.Status), SyncStatus.SubmitFail, id);
} }
//提交 //提交
_logger.LogInformation($"出库单->保存成功 开始提交 单号:{entity.BillNo}"); _logger.LogInformation($"出库单->保存成功 开始提交 单号:{billNo}");
ErpOperateDto o_dto = new ErpOperateDto(formId, res_s.Data);//res_s.Data ErpOperateDto o_dto = new ErpOperateDto(formId, res_s.Data);//res_s.Data
var resSubmit = await _erpService.Submit(o_dto, formId); var resSubmit = await _erpService.Submit(o_dto, formId);
if (!resSubmit.IsSuccess) if (!resSubmit.IsSuccess)
{ {
_logger.LogInformation($"出库单->提交失败 单号:{entity.BillNo} 错误:{resSubmit.Message}"); _logger.LogInformation($"出库单->提交失败 单号:{billNo} 错误:{resSubmit.Message}");
return (resSubmit, SyncStatus.SubmitFail, o_dto.Numbers.First()); return (resSubmit, SyncStatus.SubmitFail, o_dto.Numbers.First());
} }
//审核 //审核
_logger.LogInformation($"出库单->提交成功 开始审核 单号:{entity.BillNo}"); _logger.LogInformation($"出库单->提交成功 开始审核 单号:{billNo}");
resSubmit = await _erpService.Audit(o_dto, formId); resSubmit = await _erpService.Audit(o_dto, formId);
if (!resSubmit.IsSuccess) if (!resSubmit.IsSuccess)
{ {
_logger.LogInformation($"出库单->审核失败 单号:{entity.BillNo} 错误:{resSubmit.Message}"); _logger.LogInformation($"出库单->审核失败 单号:{billNo} 错误:{resSubmit.Message}");
return (resSubmit, SyncStatus.CheckFail, o_dto.Numbers.First()); return (resSubmit, SyncStatus.CheckFail, o_dto.Numbers.First());
} }
_logger.LogInformation($"同步金蝶成功"); _logger.LogInformation($"同步金蝶成功");