treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

http://jira.mfd.msk:8088/browse/CLS-469

Browse source 
Исправил ошибки
This commit is contained in:
psemenkov 2023-08-09 11:12:03 +03:00
parent 31e8a7af86
commit acb9b5a674
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
clearing-parent/swt-importer/src/main/java/ru/spcex/clearing/swt/importer/readers/template/SDf21Template.java
View file

@ -63,16 +63,20 @@ public class SDf21Template extends AbstractTemplate {
currentPattern = hederPatterns.get(i);
if (currentPattern.canRead(line)) {
currentPattern.reed(line, currentRecord);
result = prepareNextLine(this::setLine);
if (!SUCSESS.equals(result)) return result;
currentRecord.setNotEmpty(true);
if (Tag18A.equals(currentPattern)) {
String str18 = currentRecord.getValFor18ATag().trim();
if (StringUtils.hasText(str18)) {
int count = Integer.parseInt(str18);
oneDimensionalCount = oneDimensionalPatterns.size() * count;
if(count == 0){
setReadEnded(true);
return SUCSESS;
}
}
}
result = prepareNextLine(this::setLine);
if (!SUCSESS.equals(result)) return result;
} else {
result = checkNotValue(line, "required teg: " + currentPattern.name() + ", but was: ");
if (!SUCSESS.equals(result)) return result;
@ -85,8 +89,6 @@ public class SDf21Template extends AbstractTemplate {
currentPattern = oneDimensionalPatterns.get(j % oneDimensionalPatterns.size());
if (currentPattern.canRead(line)) {
currentPattern.reed(line, currentRecord);
result = prepareNextLine(this::setLine);
if (!SUCSESS.equals(result)) return result;
currentRecord.setNotEmpty(true);
if (Tag18A.equals(currentPattern)) {
String str18 = currentRecord.getValFor18ATag().trim();
@ -100,6 +102,8 @@ public class SDf21Template extends AbstractTemplate {
groupRecords.addAll(currentRecords);
currentRecords = new ArrayList<>();
}
result = prepareNextLine(this::setLine);
if (!SUCSESS.equals(result)) return result;
} else {
result = checkNotValue(line, "required teg: " + currentPattern.name() + ", but was: ");
if (!SUCSESS.equals(result)) return result;