BoXu.Zheng
/
BeiJinSettleAccount
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

up
continuous-integration/drone/push Build is passing
Details

master
马昊 2 years ago
parent
c7ba489752
commit
f690661994
5 changed files with 21 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisBBACSaSeEdiCompareExportService.cs
  2. 4
      code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisHBPOSaSeEdiCompareExportService.cs
  3. 4
      code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/MaiDanBBACSaSeCompareExportService.cs
  4. 12
      code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/PubSaSeCompareExportService.cs
  5. 4
      code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SaSeCompareExportBaseService.cs

4
code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisBBACSaSeEdiCompareExportService.cs
View File

@ -240,7 +240,9 @@ namespace SettleAccount.Job.Services.Report
SaCustomerPartCode = sa.CustomerPartCodeNoSpace, SaCustomerPartCode = sa.CustomerPartCodeNoSpace,
SaFactoryPartCode = sa.PartCode, SaFactoryPartCode = sa.PartCode,
EdiCustomerPartCode = seEdi.EdiCustomerPartCode, 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(); var saSeCompareFullJoin = saSeCompareLeft.Union(saSeCompareRight).ToList();
return saSeCompareFullJoin; return saSeCompareFullJoin;

4
code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisHBPOSaSeEdiCompareExportService.cs
View File

@ -235,7 +235,9 @@ namespace SettleAccount.Job.Services.Report
SaCustomerPartCode = sa.CustomerPartCodeNoSpace, SaCustomerPartCode = sa.CustomerPartCodeNoSpace,
SaFactoryPartCode = sa.PartCode, SaFactoryPartCode = sa.PartCode,
EdiCustomerPartCode = seEdi.EdiCustomerPartCode, 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(); var saSeCompareFullJoin = saSeCompareLeft.Union(saSeCompareRight).ToList();
return saSeCompareFullJoin; return saSeCompareFullJoin;

4
code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/MaiDanBBACSaSeCompareExportService.cs
View File

@ -247,7 +247,9 @@ namespace SettleAccount.Job.Services.Report
SeCustomerPartCode = se.CustomerPartCodeNoSpace, SeCustomerPartCode = se.CustomerPartCodeNoSpace,
SeFactoryPartCode = se.FactoryPartCode, SeFactoryPartCode = se.FactoryPartCode,
CustomerPartCode = se.LU, CustomerPartCode = se.LU,
CodeType = se.CodeType CodeType = se.CodeType,
Site = sa.Site,
Price = sa.Price
}).ToList(); }).ToList();
//有结算有发运 //有结算有发运

12
code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/PubSaSeCompareExportService.cs
View File

@ -280,7 +280,9 @@ namespace SettleAccount.Job.Services.Report
ToErpLocCode = se.ToErpLocCode, ToErpLocCode = se.ToErpLocCode,
SeCustomerPartCode = se.CustomerPartCodeNoSpace, SeCustomerPartCode = se.CustomerPartCodeNoSpace,
SeFactoryPartCode = se.FactoryPartCode, SeFactoryPartCode = se.FactoryPartCode,
CustomerPartCode = se.LU CustomerPartCode = se.LU,
Site = sa.Site,
Price = sa.Price
}).ToList(); }).ToList();
//有结算有发运 //有结算有发运
@ -410,7 +412,9 @@ namespace SettleAccount.Job.Services.Report
ToErpLocCode = se.ToErpLocCode, ToErpLocCode = se.ToErpLocCode,
SeCustomerPartCode = se.CustomerPartCodeNoSpace, SeCustomerPartCode = se.CustomerPartCodeNoSpace,
SeFactoryPartCode = se.FactoryPartCode, SeFactoryPartCode = se.FactoryPartCode,
CustomerPartCode = se.LU CustomerPartCode = se.LU,
Site = sa.Site,
Price = sa.Price
}).ToList(); }).ToList();
//有结算有发运 //有结算有发运
@ -541,7 +545,9 @@ namespace SettleAccount.Job.Services.Report
ToErpLocCode = se.ToErpLocCode, ToErpLocCode = se.ToErpLocCode,
SeCustomerPartCode = se.LU, SeCustomerPartCode = se.LU,
SeFactoryPartCode = se.FactoryPartCode, SeFactoryPartCode = se.FactoryPartCode,
CustomerPartCode = se.LU CustomerPartCode = se.LU,
Site = sa.Site,
Price = sa.Price
}).ToList(); }).ToList();
//有结算有发运 //有结算有发运

4
code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SaSeCompareExportBaseService.cs
View File

@ -146,7 +146,9 @@ namespace SettleAccount.Job.Services.Report
ToErpLocCode = se.ToErpLocCode, ToErpLocCode = se.ToErpLocCode,
SeCustomerPartCode = se.CustomerPartCodeNoSpace, SeCustomerPartCode = se.CustomerPartCodeNoSpace,
SeFactoryPartCode = se.FactoryPartCode, SeFactoryPartCode = se.FactoryPartCode,
CustomerPartCode = se.LU CustomerPartCode = se.LU,
Site = sa.Site,
Price = sa.Price
}).ToList(); }).ToList();
//有结算有发运 //有结算有发运

Write Preview
Loading…
Cancel
Save