修改了mt210,mt192292,mt196296,mt940的关于amount节点长度超出的异常警告

swiftCore/src/main/java/com/brilliance/swift/mx2mt/mt210/impl/Field32BGenerate.java

@@ -26,7 +26,7 @@ public class Field32BGenerate extends AbstractMx2MtTagsGenerate {
         String ccy = "";
         String amtStr = getXmlNodeValue(bodyHdrParentElementName, document, "Ntfctn.Itm("+0+").Amt");
         String ccyStr = getXmlNodeValue(bodyHdrParentElementName, document, "Ntfctn.Itm("+0+").Amt@Ccy");
-        if(amtStr.length()>14){
+        if (NumberUtil.judgeAmtStrExceedLength(amt, 14)) {
             buildSTErrorInfo(ERROR.T20066, "BLOCK4/:32B:", amtStr);
         }
         String str = " {XAU, XAG, XPD,XPT}";

swiftCore/src/main/java/com/brilliance/swift/mx2mt/mt941942/impl/Field61Generate.java

@@ -81,19 +81,15 @@ public class Field61Generate extends AbstractMx2MtTagsGenerate {
                     }
                     String amt = getXmlNodeValue(bodyHdrParentElementName, document, "Rpt.Ntry(" + i + ").Amt");
                     String ccy = getXmlNodeValue(bodyHdrParentElementName, document, "Rpt.Ntry(" + i + ").Amt@Ccy");
-                    if(amt.length()>14){
-                        buildSTErrorInfo(ERROR.T20113, "BLOCK4/:61:", amt);
-                        return;
-                    }
                     if (StringUtil.isNotEmpty(amt) && StringUtil.isNotEmpty(ccy)) {
                         String amount = NumberUtil.formatAmt(new BigDecimal(amt), ccy);
-                        value += amount;
-                    }
-                    if(StringUtil.isNotEmpty(ccy)&&StringUtil.isNotEmpty(ccy2)){
-                        if(!ccy.equals(ccy2)){
-                            buildSTErrorInfo(ERROR.T20116, "BLOCK4/:61:", ccy);
-                            return;
+                        if (StringUtil.isNotEmpty(ccy2) && !ccy2.equals(ccy)) {
+                            buildSTErrorInfo(ERROR.T20116, "Block4/61/"+(i+1), null);
                         }
+                        if (NumberUtil.judgeAmtStrExceedLength(amt, 14)) {
+                            buildSTErrorInfo(ERROR.T20113, "Block4/61/"+(i+1), amt);
+                        }
+                        value += amount;
                     }
                     value += "NTRF";
                     String endToEndId = getXmlNodeValue(bodyHdrParentElementName, document, "Rpt.Ntry(" + i + ").NtryDtls.TxDtls.Refs.EndToEndId");

swiftCore/src/main/java/com/brilliance/swift/mx2mt/mt941942/impl/Field90CGenerate.java

@@ -27,7 +27,9 @@ public class Field90CGenerate extends AbstractMx2MtTagsGenerate {
         if(StringUtil.isNotEmpty(sumc)&&StringUtil.isNotEmpty(nbOfNtries)) {
             String currency = getXmlNodeValue(bodyHdrParentElementName, document, "Rpt.Acct.Ccy");
             String amt = NumberUtil.formatAmt(new BigDecimal(sumc), currency);
-            if(nbOfNtries.length()>5){
+            if (NumberUtil.judgeAmtStrExceedLength(amt, 14)) {
+                buildSTErrorInfo(ERROR.T20120, "BLOCK4/:90C:", amt);
+            } else if(nbOfNtries.length()>5){
                 buildSTErrorInfo(ERROR.T20119, "BLOCK4/:90C:", nbOfNtries);
             } else {
                 tags.add(new Tag(name,nbOfNtries+currency+amt));

swiftCore/src/main/java/com/brilliance/swift/mx2mt/mt941942/impl/Field90DGenerate.java

@@ -27,7 +27,9 @@ public class Field90DGenerate extends AbstractMx2MtTagsGenerate {
         if(StringUtil.isNotEmpty(sumd)&&StringUtil.isNotEmpty(nbOfNtries)) {
             String currency = getXmlNodeValue(bodyHdrParentElementName, document, "Rpt.Acct.Ccy");
             String amt = NumberUtil.formatAmt(new BigDecimal(sumd), currency);
-            if(nbOfNtries.length()>5){
+            if (NumberUtil.judgeAmtStrExceedLength(amt, 14)) {
+                buildSTErrorInfo(ERROR.T20120, "BLOCK4/:90D:", amt);
+            } else if(nbOfNtries.length()>5){
                 buildSTErrorInfo(ERROR.T20119, "BLOCK4/:90D:", nbOfNtries);
             } else {
                 tags.add(new Tag(name,nbOfNtries+currency+amt));