|
|
@ -101,6 +101,10 @@ namespace SettleAccount.Job.Services.Report |
|
|
|
pubSaSeCompareDiffs = ThreeCompare(pubSaSeCompareDiffs); |
|
|
|
#endregion
|
|
|
|
|
|
|
|
#region 对比Edi
|
|
|
|
pubSaSeCompareDiffs = EdiCompare(pubSaSeCompareDiffs); |
|
|
|
#endregion
|
|
|
|
|
|
|
|
#region 结算数据处理
|
|
|
|
HandleSaDetails<BBAC_CAN_SA_DETAIL, BBAC_NOT_SA_DETAIL>(pubSaSeCompareDiffs, businessType, version); |
|
|
|
HandleSaDetailsMain<BBAC_SA_DETAIL>(pubSaSeCompareDiffs, businessType, version); |
|
|
@ -353,5 +357,24 @@ namespace SettleAccount.Job.Services.Report |
|
|
|
|
|
|
|
return saSeCompareDiffs; |
|
|
|
} |
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
/// 对比Edi
|
|
|
|
/// </summary>
|
|
|
|
/// <remarks>
|
|
|
|
/// *有结算无发运数据对比Edi
|
|
|
|
/// </remarks>
|
|
|
|
public List<SaSeCompareDiff> EdiCompare(List<SaSeCompareDiff> saSeCompareDiffs) |
|
|
|
{ |
|
|
|
//有结算无发运
|
|
|
|
var haveSaNotHaveSes = saSeCompareDiffs.FindAll(t => t.Category == EnumPubSaSeCompareCategory.HaveSaNotHaveSe); |
|
|
|
var keyCodes = haveSaNotHaveSes.Select(t => t.PN + t.CustomerPartCode).ToList(); |
|
|
|
var edis = _settleAccountDbContext.Set<BBAC_SE_EDI>().Where(t => keyCodes.Contains(t.KeyCode)); |
|
|
|
saSeCompareDiffs.FindAll(t => t.Category == EnumPubSaSeCompareCategory.HaveSaNotHaveSe).ForEach(saSeCompareDiff => |
|
|
|
{ |
|
|
|
saSeCompareDiff.Remark = "有Edi"; |
|
|
|
}); |
|
|
|
return null; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|