修改jar包、配置文件

editor_vue/src/iso/script/Rule/Cbpr/Camt029.js

@@ -223,7 +223,7 @@ function CBPR_Cancellation_Status_Identification_FormalRule(obj) {
   var cxlStsId = obj.cxlStsId;
   const position = " Cancellation Status Identification";
   if(isNotEmpty(cxlStsId)){
-    if(cxlStsId.startsWith('/') || cxlStsId.endsWith('/') || cxlStsId.length != 16 || cxlStsId.indexOf('//')>=0){
+    if(cxlStsId.startsWith('/') || cxlStsId.endsWith('/') || cxlStsId.indexOf('//')>=0){
       message(position,msg);
       return false;
     }

editor_vue/src/iso/script/Rule/Cbpr/Camt056.js

@@ -196,7 +196,7 @@ function CBPR_Cancellation_Identification_FormalRule(obj) {
     var cxlStsId = obj.cxlStsId;
     const position = " Cancellation Identification";
     if (isNotEmpty(cxlStsId)) {
-        if (cxlStsId.startsWith('/') || cxlStsId.endsWith('/') || cxlStsId.length != 16 || cxlStsId.indexOf('//') >= 0) {
+        if (cxlStsId.startsWith('/') || cxlStsId.endsWith('/') || cxlStsId.indexOf('//') >= 0) {
             message(position, msg);
             return false;
         }

editor_vue/src/iso/script/Rule/Cbpr/Pacs009.js

@@ -190,7 +190,7 @@ function CBPR_E2E_CORE_TextualRule(){
 function CBPR_End_To_End_Identification_FormalRule(obj) {
 	const msg = "In the E2E identification, the below restrictions apply to the first 16 characters:- The first one and the 16th one cannot be “/” and - The string of 16 characters cannot contain “//”";
 	const position = "End To End Identification";
-	var endToEndId = obj.endToEndId.substring(0,16);
+    var endToEndId = obj.endToEndId;
 	if (isNotEmpty(endToEndId)) {
 		if(endToEndId.startsWith('/') || endToEndId.endsWith('/') || endToEndId.indexOf("//")>=0) {
 			message(position,msg);

editor_vue/src/iso/script/Rule/Cbpr/Pacs009adv.js

@@ -331,7 +331,7 @@ function CBPR_E2E_ADV_TextualRule(){
 function CBPR_End_To_End_Identification_FormalRule(obj) {
 	const msg = "In the E2E identification, the below restrictions apply to the first 16 characters:- The first one and the 16th one cannot be “/” and - The string of 16 characters cannot contain “//”";
 	const position = "End To End Identification";
-	var endToEndId = obj.endToEndId.substring(0,16);
+    var endToEndId = obj.endToEndId;
 	if (isNotEmpty(endToEndId)) {
 		if(endToEndId.startsWith('/') || endToEndId.endsWith('/') || endToEndId.indexOf("//")>=0) {
 			message(position,msg);

editor_vue/src/iso/script/Rule/Cbpr/Pacs009cov.js

@@ -182,10 +182,10 @@ function CBPR_Business_Service_TextualRule() {
 	return true;
 }
 
-//r8    必须使用值“swift.cbprpplus.02”。
+//r8    必须使用值“swift.cbprpplus.cov.02”。
 function CBPR_Business_Service_Usage_TextualRule(obj) {
     const position = "Business Service";
-    const msg = "The value 'swift.cbprplus.02' must be used.";
+    const msg = "The value 'swift.cbprplus.cov.02' must be used.";
     var bizSvc = obj.bizSvc;
     if (bizSvc != 'swift.cbprplus.cov.02') {
         message(position, msg);
@@ -263,7 +263,7 @@ function CBPR_E2E_COV_TextualRule(){
 function CBPR_End_To_End_Identification_FormalRule(obj) {
 	const msg = "In the E2E identification, the below restrictions apply to the first 16 characters:- The first one and the 16th one cannot be “/” and - The string of 16 characters cannot contain “//”";
 	const position = "End To End Identification";
-	var endToEndId = obj.endToEndId.substring(0,16);
+    var endToEndId = obj.endToEndId;
 	if (isNotEmpty(endToEndId)) {
 		if(endToEndId.startsWith('/') || endToEndId.endsWith('/') || endToEndId.indexOf("//")>=0) {
 			message(position,msg);

swift-service/src/main/java/com/brilliance/mxeditor/MxTransfer.java

@@ -7,6 +7,7 @@ import com.brilliance.mxeditor.exception.SwiftException;
 import com.brilliance.mxeditor.interf.CommonSend;
 import com.brilliance.mxeditor.util.MessageUtil;
 import com.brilliance.mxeditor.util.StringUtil;
+import com.prowidesoftware.swift.model.mx.AbstractMX;
 import org.apache.commons.io.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -62,11 +63,11 @@ public class MxTransfer {
                 pmtId008.put("instrId",bizMsgIdr);
 //                pmtId008.put("endToEndId",bizMsgIdr);
                 break;
-//            case "pacs.009":
-//                JSONObject pmtId009 = (JSONObject)gsonMaps.get("pmtId");
-//                pmtId009.put("instrId",bizMsgIdr);
+            case "pacs.009":
+                JSONObject pmtId009 = (JSONObject)gsonMaps.get("pmtId");
+                pmtId009.put("instrId",bizMsgIdr);
 //                pmtId009.put("endToEndId",bizMsgIdr);
-//                break;
+                break;
 //            case "pacs.052":
 //                JSONObject rpt = (JSONObject)gsonMaps.get("rpt");
 //                rpt.put("id",bizMsgIdr);

swift-service/src/main/resources/static/index.html

-<!doctype html><html lang=""><head><meta charset="utf-8"/><meta http-equiv="X-UA-Compatible" content="IE=edge"/><meta name="viewport" content="width=device-width,initial-scale=1"/><link rel="icon" href="favicon.ico"/><title>ISO手工拟报</title><script defer="defer" src="js/chunk-vendors.dbe64cdc.js"></script><script defer="defer" src="js/app.0265eb42.js"></script><script defer="defer" src="js/main.59945214.js"></script><link href="css/chunk-vendors.77489a8d.css" rel="stylesheet"><link href="css/app.870bae8d.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but swiftiso-editor doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
+<!doctype html><html lang=""><head><meta charset="utf-8"/><meta http-equiv="X-UA-Compatible" content="IE=edge"/><meta name="viewport" content="width=device-width,initial-scale=1"/><link rel="icon" href="favicon.ico"/><title>ISO手工拟报</title><script defer="defer" src="js/chunk-vendors.dbe64cdc.js"></script><script defer="defer" src="js/app.e1640f86.js"></script><script defer="defer" src="js/main.59945214.js"></script><link href="css/chunk-vendors.77489a8d.css" rel="stylesheet"><link href="css/app.870bae8d.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but swiftiso-editor doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
\ No newline at end of file

swift-service/src/main/resources/template/pacs00800108.properties

@@ -62,5 +62,7 @@ fiToFICstmrCdtTrf.cdtTrfTxInf*.purp=purp
 fiToFICstmrCdtTrf.cdtTrfTxInf*.rmtInf=rmtInf
 fiToFICstmrCdtTrf.cdtTrfTxInf*.rgltryRptg*.dtls*.inf=inf
 fiToFICstmrCdtTrf.cdtTrfTxInf*.instgAgt=instgAgt
+fiToFICstmrCdtTrf.cdtTrfTxInf*.instrForCdtrAgt=instrForCdtrAgt
+fiToFICstmrCdtTrf.cdtTrfTxInf*.instrForNxtAgt=instrForNxtAgt