ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MH: Rom eV Bezug Kostenträgerkontakt korrigiert

Browse Source
This commit is contained in:
HirschleM
2026-06-03 13:19:15 +02:00
parent 15b6f6779f
commit bf7203fab9
3 changed files with 37 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
ReportImp/RomEV/FLSGroupReport.cs
View File

@@ -37,10 +37,15 @@ namespace BeWo.Report.DefaultReports
if (c2scOid.HasValue) if (c2scOid.HasValue)
{ {
var c2s = DAOFactory.GenericDAO.GetByID<CostBearer2SupportConcept>(c2scOid.Value); var c2s = DAOFactory.GenericDAO.GetByID<CostBearer2SupportConcept>(c2scOid.Value);
if (c2s.CustomerReferenceNumber != null && !aktenzeichen.Contains(c2s.CustomerReferenceNumber)) var c2cList = c2s.SupportConcept.Customer.Customer2CostBearerList;
aktenzeichen.Add(c2s.CustomerReferenceNumber);
if (c2s.CostBearer.Organisation.Notice != null && !kostenträgerkontakte.Contains(c2s.CostBearer.Organisation.Notice)) foreach (var item in c2cList)
kostenträgerkontakte.Add(c2s.CostBearer.Organisation.Notice); {
if (item.ReferenceNumber != null && !aktenzeichen.Contains(item.ReferenceNumber))
aktenzeichen.Add(item.ReferenceNumber);
if (item.Notice != null && !kostenträgerkontakte.Contains(item.Notice))
kostenträgerkontakte.Add(item.Notice);
}
} }
} }
if (aktenzeichen.Count > 0) if (aktenzeichen.Count > 0)
@@ -63,10 +68,15 @@ namespace BeWo.Report.DefaultReports
if (c2scOid.HasValue) if (c2scOid.HasValue)
{ {
var c2s = DAOFactory.GenericDAO.GetByID<CostBearer2SupportConcept>(c2scOid.Value); var c2s = DAOFactory.GenericDAO.GetByID<CostBearer2SupportConcept>(c2scOid.Value);
if (c2s.CustomerReferenceNumber != null && !aktenzeichen.Contains(c2s.CustomerReferenceNumber)) var c2cList = c2s.SupportConcept.Customer.Customer2CostBearerList;
aktenzeichen.Add(c2s.CustomerReferenceNumber);
if (c2s.CostBearer.Organisation.Notice != null && !kostenträgerkontakte.Contains(c2s.CostBearer.Organisation.Notice)) foreach (var item in c2cList)
kostenträgerkontakte.Add(c2s.CostBearer.Organisation.Notice); {
if (item.ReferenceNumber != null && !aktenzeichen.Contains(item.ReferenceNumber))
aktenzeichen.Add(item.ReferenceNumber);
if (item.Notice != null && !kostenträgerkontakte.Contains(item.Notice))
kostenträgerkontakte.Add(item.Notice);
}
} }
} }
if (aktenzeichen.Count > 0) if (aktenzeichen.Count > 0)

25
ReportImp/RomEV/FLSListReport.cs
View File

@@ -38,10 +38,14 @@ namespace BeWo.Report.DefaultReports
var customerName = cb2scList[0].SupportConcept.Customer.Person.FirstNameLastName; var customerName = cb2scList[0].SupportConcept.Customer.Person.FirstNameLastName;
foreach (var c2s in cb2scList) foreach (var c2s in cb2scList)
{ {
if (c2s.CustomerReferenceNumber != null && !aktenzeichen.Contains(c2s.CustomerReferenceNumber)) var c2cList = c2s.SupportConcept.Customer.Customer2CostBearerList;
aktenzeichen.Add(c2s.CustomerReferenceNumber); foreach (var item in c2cList)
if (c2s.CostBearer.Organisation.Notice != null && !kostenträgerkontakte.Contains(c2s.CostBearer.Organisation.Notice)) {
kostenträgerkontakte.Add(c2s.CostBearer.Organisation.Notice); if (item.ReferenceNumber != null && !aktenzeichen.Contains(item.ReferenceNumber))
aktenzeichen.Add(item.ReferenceNumber);
if (item.Notice != null && !kostenträgerkontakte.Contains(item.Notice))
kostenträgerkontakte.Add(item.Notice);
}
} }
foreach (var sr in group.ServiceRecords) foreach (var sr in group.ServiceRecords)
@@ -69,10 +73,15 @@ namespace BeWo.Report.DefaultReports
if (c2scOid.HasValue) if (c2scOid.HasValue)
{ {
var c2s = DAOFactory.GenericDAO.GetByID<CostBearer2SupportConcept>(c2scOid.Value); var c2s = DAOFactory.GenericDAO.GetByID<CostBearer2SupportConcept>(c2scOid.Value);
if (c2s.CustomerReferenceNumber != null && !aktenzeichen.Contains(c2s.CustomerReferenceNumber)) var c2cList = c2s.SupportConcept.Customer.Customer2CostBearerList;
aktenzeichen.Add(c2s.CustomerReferenceNumber);
if (c2s.CostBearer.Organisation.Notice != null && !kostenträgerkontakte.Contains(c2s.CostBearer.Organisation.Notice)) foreach (var item in c2cList)
kostenträgerkontakte.Add(c2s.CostBearer.Organisation.Notice); {
if (item.ReferenceNumber != null && !aktenzeichen.Contains(item.ReferenceNumber))
aktenzeichen.Add(item.ReferenceNumber);
if (item.Notice != null && !kostenträgerkontakte.Contains(item.Notice))
kostenträgerkontakte.Add(item.Notice);
}
} }
} }
if (aktenzeichen.Count > 0) if (aktenzeichen.Count > 0)

4
ReportImp/RomEV/Quittierungsbeleg.cs
View File

@@ -77,8 +77,8 @@ namespace RomEV
{ {
if (cb.CostBearer.Organisation.Name == pRO.Costbearer) if (cb.CostBearer.Organisation.Name == pRO.Costbearer)
{ {
if (cb.CostBearer.Organisation.Notice.IsNotNullOrEmpty()) if (cb.Notice.IsNotNullOrEmpty())
pRO.ContactEmployee = cb.CostBearer.Organisation.Notice; pRO.ContactEmployee = cb.Notice;
else else
pRO.ContactEmployee = ""; pRO.ContactEmployee = "";