From 12966daba9bff09f17e69b411c11d27a6ac9c730 Mon Sep 17 00:00:00 2001
From: chengzhuoshen <815340223@qq.com>
Date: Thu, 15 Sep 2022 10:12:41 +0800
Subject: [PATCH] 0822swift官网MX2MT更新-6
---
swiftCore/src/main/java/com/brilliance/swift/mx2mt/mt940950/impl/Field28CGenerate.java | 2 +-
swiftCore/src/main/resources/swiftTxt/MT103.txt | 65 +++++++++++++++++++----------------------------------------------
swiftCore/src/test/java/com/brilliance/Mt2MxTest.java | 2 +-
swiftCore/src/test/java/com/brilliance/Mx2MtTest.java | 2 +-
4 files changed, 22 insertions(+), 49 deletions(-)
diff --git a/swiftCore/src/main/java/com/brilliance/swift/mx2mt/mt940950/impl/Field28CGenerate.java b/swiftCore/src/main/java/com/brilliance/swift/mx2mt/mt940950/impl/Field28CGenerate.java
index 2bdc328..d31674d 100644
--- a/swiftCore/src/main/java/com/brilliance/swift/mx2mt/mt940950/impl/Field28CGenerate.java
+++ b/swiftCore/src/main/java/com/brilliance/swift/mx2mt/mt940950/impl/Field28CGenerate.java
@@ -31,7 +31,7 @@ public class Field28CGenerate extends AbstractMx2MtTagsGenerate {
}
}
String pageNumber = getXmlNodeValue(bodyHdrParentElementName, document, "Stmt.StmtPgntn.PgNb");
- if (StringUtil.isNotEmpty(lglSeqNbStr)) {
+ if (StringUtil.isNotEmpty(lglSeqNbStr) && lglSeqNbStr.length() <= 5) {
value = lglSeqNbStr + "/" + Integer.parseInt(pageNumber);
} else {
value = elctrncSeqNbStr + "/" + Integer.parseInt(pageNumber);
diff --git a/swiftCore/src/main/resources/swiftTxt/MT103.txt b/swiftCore/src/main/resources/swiftTxt/MT103.txt
index 219bef2..480537b 100644
--- a/swiftCore/src/main/resources/swiftTxt/MT103.txt
+++ b/swiftCore/src/main/resources/swiftTxt/MT103.txt
@@ -1,48 +1,21 @@
-{1:F01FOOBARC0AXXX4402221388}{2:O1031010200908BANKANC0AXXX50363658012204281624U}{3:{111:001}{121:8a562c67-ca16-48ba-b074-65581be6f001}}{4:
-:20:TBEXO12345
-:13C:/SNDTIME/2124+0700
-:13C:/RNCTIME/2330+0800
-:13C:/CLSTIME/2221+0600
-:13C:/TILTIME/2321+0800
-:13C:/FROTIME/2021+0900
-:13C:/REJTIME/2121+0800
+{1:F01PSBCCNBJAXXX1103110461}{2:O1030825201018CITIUS33AXXX71512921532010182025N}{3:{108:PM22082600000100}{111:001}{121:6bd1dbad-21cf-4334-8dd5-64e92c270124}}{4:
+:20:PM220914MX103001
:23B:CRED
-:23E:HOLD/81939316763
-:23E:SDVA
-:23E:INTC
-:23E:TELB
-:23E:PHOB
-:23E:CHQB
-:26T:GCY
-:32A:220313USD23453,13
-:33B:EUR1345,12
-:36:17,435713542
-:50F:ARNU/BE/12598766233
-1/Name
-6/BE/FvW/ABC1234567
-7/BE/1256ABC12345678976543213854847
-8/54689
-:52A://AUqwert123456
-FOOBARC0
-:53B:/C/we1234
-bobjack
-:56A:FOOBARC6
-:57C:/Q1234433
-:59F://CH3234232
-1/Vanmusten Ilya
-2/Brugmannlaan 415
-3/BE/Brussels
-:70:/ROC/CUST123456789///INV/123 dated
-03/04/2006
-:71A:OUR
-:71G:USD12,43
-:72:/INS/FOOBARC7
-/REC/chengzhuoshendsdsdsdsddsd
-/INTA/BANKERUN
-/LOCINS/DDMC
-/CATPURP/DVPM
-/SVCLVL/PRPT
-:77B:/ORDERRES/BE//MEILAAN 1, 9000 GENT
-//JIANGXIAQU
-//WENHUADADAO
+:32A:220906USD1000,
+:33B:USD1000,
+:50K:/36921469
+10
+beijingshifengtaiqu
+beijingshikunlunzhongxin
+beijingshi
+:53A:PSBCCNBJXXX
+:54A:CITIUS33XXX
+:59:/FTT883320000031295
+zhangxinyao
+beijingshifengtaiqu
+beijingshikunlunzhongxin
+beijingshi
+:70:.BUYING GOODS
+ADDL REMITTER INFO:CR 355255
+:71A:SHA
-}
\ No newline at end of file
diff --git a/swiftCore/src/test/java/com/brilliance/Mt2MxTest.java b/swiftCore/src/test/java/com/brilliance/Mt2MxTest.java
index a3a53c8..60b1128 100644
--- a/swiftCore/src/test/java/com/brilliance/Mt2MxTest.java
+++ b/swiftCore/src/test/java/com/brilliance/Mt2MxTest.java
@@ -48,6 +48,6 @@ public class Mt2MxTest {
@Test
public void testPacs008001() {
- test("/swiftTxt/Mt103.txt", null);
+ test("/swiftTxt/MT103.txt", null);
}
}
diff --git a/swiftCore/src/test/java/com/brilliance/Mx2MtTest.java b/swiftCore/src/test/java/com/brilliance/Mx2MtTest.java
index 773cbcf..5724ed1 100644
--- a/swiftCore/src/test/java/com/brilliance/Mx2MtTest.java
+++ b/swiftCore/src/test/java/com/brilliance/Mx2MtTest.java
@@ -125,7 +125,7 @@ public class Mx2MtTest {
@Test
public void testMx2MtMap() throws IOException {
- File file = FileUtils.toFile(Mx2MtTest.class.getResource("/swiftXml/MxCamt05300108_950.xml"));
+ File file = FileUtils.toFile(Mx2MtTest.class.getResource("/swiftXml/MxPacs00800108.xml"));
String xmlStr = FileUtils.readFileToString(file);
Map<String, String> maps = SwiftTransfer.mx2MtMap(xmlStr, null);
for (String key : maps.keySet()) {
--
libgit2 0.26.0