diff --git a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF07_Converter.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF07_Converter.java index 765bd53a6..a92b4f0af 100644 --- a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF07_Converter.java +++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF07_Converter.java @@ -5,7 +5,6 @@ import com.linuxense.javadbf.DBFField; import org.springframework.stereotype.Service; import ru.clearing.classes.statics.data.sdf.SDf07; -import java.math.BigDecimal; import java.util.LinkedList; import java.util.List; @@ -25,6 +24,9 @@ public class S_DF07_Converter extends DFConverter { values.add(typeMatch(entity.getSpec())); values.add(typeMatch(entity.getNumber())); values.add(typeMatch(entity.getResult())); + values.add(typeMatch(entity.getDoc_Num())); + values.add(typeMatch(entity.getDoc_Date())); + values.add(typeMatch(entity.getPay_val())); return values.toArray(Object[]::new); } @@ -51,6 +53,9 @@ public class S_DF07_Converter extends DFConverter { dbfFields.add(new DBFField("SPEC", DBFDataType.CHARACTER, 254)); dbfFields.add(new DBFField("NUMBER", DBFDataType.NUMERIC, 10)); dbfFields.add(new DBFField("RESULT", DBFDataType.NUMERIC, 1)); + dbfFields.add(new DBFField("DOC_NUM", DBFDataType.CHARACTER, 3)); + dbfFields.add(new DBFField("DOC_DATE", DBFDataType.CHARACTER, 8)); + dbfFields.add(new DBFField("PAY_VAL", DBFDataType.CHARACTER, 12)); return dbfFields.toArray(DBFField[]::new); } diff --git a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF54_Converter.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF54_Converter.java index 796b57368..44f1947e1 100644 --- a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF54_Converter.java +++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF54_Converter.java @@ -54,6 +54,11 @@ public class S_DF54_Converter extends DFConverter { values.add(typeMatch(entity.getSpecif_1())); values.add(typeMatch(entity.getSend_type())); values.add(typeMatch(entity.getDoc_result())); + values.add(typeMatch(entity.getDoc_Num())); + values.add(typeMatch(entity.getDoc_Date())); + values.add(typeMatch(entity.getValue_date())); + values.add(typeMatch(entity.getSwift_ben())); + values.add(typeMatch(entity.getSwift_intermed())); return values.toArray(Object[]::new); } @@ -100,6 +105,11 @@ public class S_DF54_Converter extends DFConverter { dbfFields.add(new DBFField("SPECIF1", DBFDataType.CHARACTER, 254)); dbfFields.add(new DBFField("SEND_TYPE", DBFDataType.CHARACTER, 10)); dbfFields.add(new DBFField("DOC_RESULT", DBFDataType.CHARACTER, 2)); + dbfFields.add(new DBFField("DOC_NUM", DBFDataType.CHARACTER, 3)); + dbfFields.add(new DBFField("DOC_DATE", DBFDataType.CHARACTER, 8)); + dbfFields.add(new DBFField("VALUE_DATE", DBFDataType.CHARACTER, 8)); + dbfFields.add(new DBFField("SWIFT_BEN", DBFDataType.CHARACTER, 11)); + dbfFields.add(new DBFField("SWIFT_INT", DBFDataType.CHARACTER, 11)); return dbfFields.toArray(DBFField[]::new); }