From f690661994dc4f3e59fded8e31d944cb422c80e9 Mon Sep 17 00:00:00 2001 From: mahao Date: Fri, 3 Nov 2023 10:23:44 +0800 Subject: [PATCH] up --- .../Report/JisBBACSaSeEdiCompareExportService.cs | 4 +++- .../Report/JisHBPOSaSeEdiCompareExportService.cs | 4 +++- .../Report/MaiDanBBACSaSeCompareExportService.cs | 4 +++- .../Services/Report/PubSaSeCompareExportService.cs | 12 +++++++++--- .../Services/Report/SaSeCompareExportBaseService.cs | 4 +++- 5 files changed, 21 insertions(+), 7 deletions(-) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisBBACSaSeEdiCompareExportService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisBBACSaSeEdiCompareExportService.cs index e6bca8ea..483045f9 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisBBACSaSeEdiCompareExportService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisBBACSaSeEdiCompareExportService.cs @@ -240,7 +240,9 @@ namespace SettleAccount.Job.Services.Report SaCustomerPartCode = sa.CustomerPartCodeNoSpace, SaFactoryPartCode = sa.PartCode, EdiCustomerPartCode = seEdi.EdiCustomerPartCode, - CustomerPartCode = sa.LU ?? seEdi.LU + CustomerPartCode = sa.LU ?? seEdi.LU, + Site = sa.Site, + Price = sa.Price }; var saSeCompareFullJoin = saSeCompareLeft.Union(saSeCompareRight).ToList(); return saSeCompareFullJoin; diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisHBPOSaSeEdiCompareExportService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisHBPOSaSeEdiCompareExportService.cs index 86754735..01631d91 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisHBPOSaSeEdiCompareExportService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisHBPOSaSeEdiCompareExportService.cs @@ -235,7 +235,9 @@ namespace SettleAccount.Job.Services.Report SaCustomerPartCode = sa.CustomerPartCodeNoSpace, SaFactoryPartCode = sa.PartCode, EdiCustomerPartCode = seEdi.EdiCustomerPartCode, - CustomerPartCode = sa.LU ?? seEdi.LU + CustomerPartCode = sa.LU ?? seEdi.LU, + Site = sa.Site, + Price = sa.Price }; var saSeCompareFullJoin = saSeCompareLeft.Union(saSeCompareRight).ToList(); return saSeCompareFullJoin; diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/MaiDanBBACSaSeCompareExportService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/MaiDanBBACSaSeCompareExportService.cs index ce3b810b..d689d65b 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/MaiDanBBACSaSeCompareExportService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/MaiDanBBACSaSeCompareExportService.cs @@ -247,7 +247,9 @@ namespace SettleAccount.Job.Services.Report SeCustomerPartCode = se.CustomerPartCodeNoSpace, SeFactoryPartCode = se.FactoryPartCode, CustomerPartCode = se.LU, - CodeType = se.CodeType + CodeType = se.CodeType, + Site = sa.Site, + Price = sa.Price }).ToList(); //有结算有发运 diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/PubSaSeCompareExportService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/PubSaSeCompareExportService.cs index bfe5584b..49100def 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/PubSaSeCompareExportService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/PubSaSeCompareExportService.cs @@ -280,7 +280,9 @@ namespace SettleAccount.Job.Services.Report ToErpLocCode = se.ToErpLocCode, SeCustomerPartCode = se.CustomerPartCodeNoSpace, SeFactoryPartCode = se.FactoryPartCode, - CustomerPartCode = se.LU + CustomerPartCode = se.LU, + Site = sa.Site, + Price = sa.Price }).ToList(); //有结算有发运 @@ -410,7 +412,9 @@ namespace SettleAccount.Job.Services.Report ToErpLocCode = se.ToErpLocCode, SeCustomerPartCode = se.CustomerPartCodeNoSpace, SeFactoryPartCode = se.FactoryPartCode, - CustomerPartCode = se.LU + CustomerPartCode = se.LU, + Site = sa.Site, + Price = sa.Price }).ToList(); //有结算有发运 @@ -541,7 +545,9 @@ namespace SettleAccount.Job.Services.Report ToErpLocCode = se.ToErpLocCode, SeCustomerPartCode = se.LU, SeFactoryPartCode = se.FactoryPartCode, - CustomerPartCode = se.LU + CustomerPartCode = se.LU, + Site = sa.Site, + Price = sa.Price }).ToList(); //有结算有发运 diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SaSeCompareExportBaseService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SaSeCompareExportBaseService.cs index a0c145c6..970ebe6f 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SaSeCompareExportBaseService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SaSeCompareExportBaseService.cs @@ -146,7 +146,9 @@ namespace SettleAccount.Job.Services.Report ToErpLocCode = se.ToErpLocCode, SeCustomerPartCode = se.CustomerPartCodeNoSpace, SeFactoryPartCode = se.FactoryPartCode, - CustomerPartCode = se.LU + CustomerPartCode = se.LU, + Site = sa.Site, + Price = sa.Price }).ToList(); //有结算有发运