SDF54 sbanknam1/sclientn1

This commit is contained in:
ialbert 2024-06-17 14:25:06 +03:00
parent a6c3f2f2b3
commit 8833818a01

View file

@ -86,9 +86,12 @@ public class Sdf54Creator {
Company prcCmp = companyImdg.getSingleObjectByID(Sender.Prc.getId()); Company prcCmp = companyImdg.getSingleObjectByID(Sender.Prc.getId());
String senderSbankName = ""; String senderSbankName = "";
if (prcCmp != null) { if (prcCmp != null) {
senderSbankName = prcCmp.getShortName(); if (LocaleUtil.isRus(locale)) {
if (!LocaleUtil.isRus(locale) && prcCmp.getProfile() != null) { senderSbankName = prcCmp.getShortName();
} else if (prcCmp.getProfile() != null) {
senderSbankName = prcCmp.getProfile().getShortNameEng(); senderSbankName = prcCmp.getProfile().getShortNameEng();
} else {
senderSbankName = "";
} }
} }
SpecifUtil.fillSegmentsBy35Symbols(senderSbankName, SpecifUtil.fillSegmentsBy35Symbols(senderSbankName,
@ -175,7 +178,15 @@ public class Sdf54Creator {
{ {
Company company1 = companyImdg.getSingleObjectByID(Sender.One.getId()); Company company1 = companyImdg.getSingleObjectByID(Sender.One.getId());
if (company1 != null) { // "АО СПВБ" company.shortName[id = 1] if (company1 != null) { // "АО СПВБ" company.shortName[id = 1]
SpecifUtil.fillSegmentsBy35Symbols(company1.getShortName(), String sclientn;
if (LocaleUtil.isRus(locale)) {
sclientn = company1.getShortName();
} else if (company1.getProfile() != null) {
sclientn = company1.getProfile().getShortNameEng();
} else {
sclientn = "";
}
SpecifUtil.fillSegmentsBy35Symbols(sclientn,
sDf54::setSclientn1, sDf54::setSclientn1,
sDf54::setSclientn2, sDf54::setSclientn2,
sDf54::setSclientn3, sDf54::setSclientn3,