新增pacs.009.001.08.adv报文

editor_vue/src/iso/pages/index.vue

@@ -509,6 +509,9 @@ export default {
             }else if ("pacs.009.001.08.cov" === id) {
               child[5].defaultValue = "swift.cbprplus.cov.02";
               child[5].unable = true;
+            }else if ("pacs.009.001.08.adv" === id) {
+              child[5].defaultValue = "swift.cbprplus.adv.02";
+              child[5].unable = true;
             } else if ("pacs.010.001.03" === id) {
               child[5].defaultValue = "swift.cbprplus.02";
               child[5].unable = true;

editor_vue/src/iso/script/MsgCode.js

@@ -13825,6 +13825,12 @@ const MsgCodes = {
     isShow: true,
   },
   {
+    value: "pacs.009.001.08.ADV",
+    label: "Financial Institution Credit Transfer(ADV)",
+    label2: "Financial Institution Credit Transfer(ADV)",
+    isShow: true,
+  },
+  {
     value: "pacs.009.001.08.COV",
     label: "Financial Institution Credit Transfer(COV)",
     label2: "Financial Institution Credit Transfer(COV)",
@@ -13994,6 +14000,12 @@ const MsgCodes = {
       label2: "Payment request(COV)",
       isShow: true,
     },
+    {
+      value: "pacs.009.001.08.ADV",
+      label: "Payment request(ADV)",
+      label2: "Payment request(ADV)",
+      isShow: true,
+    },
     // {
     //   value: "pacs.009.001.08.Credit",
     //   label: "Credit Notification",
@@ -17153,6 +17165,74 @@ const MsgCodes = {
     label: "IFT72"
   },
   ],
+  copyDuplicateCode: [ {
+    label : "Copy Duplicate",
+    value : "CODU"
+  }, {
+    label : "Copy",
+    value : "COPY"
+  }, {
+    label : "Duplicate",
+    value : "DUPL"
+  } ],
+  priorityCode: [ {
+    label : "High",
+    value : "HIGH"
+  }, {
+    label : "Normal",
+    value : "NORM"
+  } ],
+  copyDuplicateCode: [ {
+    label : "Copy Duplicate",
+    value : "CODU"
+  }, {
+    label : "Copy",
+    value : "COPY"
+  }, {
+    label : "Duplicate",
+    value : "DUPL"
+  } ],
+  settlementMethodCode: [ {
+    label : "Cover Method",
+    value : "COVE"
+  } ],
+  instructionPriorityCode: [ {
+    label : "High",
+    value : "HIGH"
+  }, {
+    label : "Normal",
+    value : "NORM"
+  } ],
+  clearingChannelCode: [ {
+    label : "Real Time Gross Settlement System",
+    value : "RTGS"
+  }, {
+    label : "Real Time Net Settlement System",
+    value : "RTNS"
+  }, {
+    label : "Mass Payment Net System",
+    value : "MPNS"
+  }, {
+    label : "Book Transfer",
+    value : "BOOK"
+  } ],
+  settlementPriorityCode: [ {
+    label : "Urgent",
+    value : "URGT"
+  }, {
+    label : "High",
+    value : "HIGH"
+  }, {
+    label : "Normal",
+    value : "NORM"
+  } ],
+  codeCode: [ {
+    label : "Phone Beneficiary",
+    value : "PHOB"
+  }, {
+    label : "Telecom",
+    value : "TELB"
+  } ],
 };
 
 export default MsgCodes;
\ No newline at end of file

editor_vue/src/iso/script/MsgJson/index.js

@@ -27,6 +27,7 @@ import Camt_029_001_09 from "./Camt_029_001_09";
 import Camt_052_001_08 from "./Camt_052_001_08";
 import Pacs_009_001_08 from "./Pacs_009_001_08";
 import Pacs_009_001_08_COV from "./Pacs_009_001_08_COV";
+import Pacs_009_001_08_ADV from "./pacs_009_001_08_ADV";
 import Camt_060_001_05 from "./Camt_060_001_05";
 import Pacs_002_001_10 from "./Pacs_002_001_10";
 import Pain_001_001_09 from "./Pain_001_001_09";
@@ -160,6 +161,8 @@ export default function MsgJsonMap(mty) {
       return msgClone(Pacs_009_001_08);
     case "pacs.009.001.08.COV":
       return msgClone(Pacs_009_001_08_COV);
+    case "pacs.009.001.08.ADV":
+      return msgClone(Pacs_009_001_08_ADV);
     case "camt.060.001.05":
       return msgClone(Camt_060_001_05);
     case "pacs.002.001.10":

editor_vue/src/iso/script/Rule/CbprRule.js

@@ -13,6 +13,7 @@ import pacs004 from './Cbpr/Pacs004.js'
 import pacs008 from './Cbpr/Pacs008.js'
 import pacs009 from './Cbpr/Pacs009.js'
 import pacs009cov from './Cbpr/Pacs009cov.js'
+import pacs009adv from './Cbpr/Pacs009adv.js'
 import pacs010 from './Cbpr/Pacs010.js'
 import pain001 from './Cbpr/Pain001.js'
 import pain002 from './Cbpr/Pain002.js'
@@ -42,6 +43,8 @@ export function validatorRule(mty,obj) {
             return pacs008(obj);
         case 'pacs.009.001.08.COV' :
             return pacs009cov(obj);
+        case 'pacs.009.001.08.ADV' :
+            return pacs009adv(obj);
         case 'pacs.009.001.08' :
             return pacs009(obj);
         case 'pacs.010.001.03' :

swift-service/src/main/java/com/brilliance/mxeditor/controller/MxEditorController.java

@@ -286,6 +286,19 @@ public class MxEditorController {
                         + documentMxId.getVariant()
                         + documentMxId.getVersion();
             }
+            //009.001.08.adv的xsd文件和009.001.08的xsd文件不同
+            if("pacs00900108".equals(documentXsdName)){
+                regex = "(\\<SttlmMtd[\\w\\W]*\\<\\/SttlmMtd\\>)";
+                p = Pattern.compile(regex);
+                m = p.matcher(xml);
+                String sttlmMtd = "";
+                if (m.find()) {
+                    sttlmMtd = m.group(1);
+                }
+                if("<SttlmMtd>COVE</SttlmMtd>".equals(sttlmMtd)){
+                    documentXsdName="pacs00900108adv";
+                }
+            }
             if (StringUtil.isNotEmpty(documentXsdName) && StringUtil.isNotEmpty(documentXml)) {
                 SwiftTransferUtil.schemaValidate(documentXsdName, documentXml);
                 b2=true;

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

+identifier=identifier
+tp=type
+appHdr.fr=fr
+appHdr.to=to
+appHdr.bizMsgIdr=bizMsgIdr
+appHdr.msgDefIdr=msgDefIdr
+appHdr.bizSvc=bizSvc
+appHdr.creDt=creDt
+appHdr.cpyDplct=cpyDplct
+appHdr.pssblDplct=pssblDplct
+appHdr.prty=prty
+appHdr.rltd=rltd
+fiCdtTrf.grpHdr=grpHdr
+#fiCdtTrf.cdtTrfTxInf=cdtTrfTxInf
+#appHdr.fr.fiId.finInstnId.bicfi=senderBic
+#appHdr.fr.fiId.finInstnId.nm=senderNm
+#appHdr.to.fiId.finInstnId.bicfi=receiverBic
+#appHdr.to.fiId.finInstnId.nm=receiverNm
+#appHdr.bizMsgIdr=bizMsgIdr
+#appHdr.msgDefIdr=msgDefIdr
+#appHdr.bizSvc=bizSvc
+#appHdr.creDt=creDt
+#fiCdtTrf.grpHdr.sttlmInf=sttlmInf
+#fiCdtTrf.grpHdr.msgId=msgId
+#fiCdtTrf.grpHdr.nbOfTxs=nbOfTxs
+#fiCdtTrf.grpHdr.creDtTm=creDtTm
+fiCdtTrf.cdtTrfTxInf*.pmtId=pmtId
+fiCdtTrf.cdtTrfTxInf*.pmtTpInf=pmtTpInf
+fiCdtTrf.cdtTrfTxInf*.intrBkSttlmAmt=intrBkSttlmAmt
+fiCdtTrf.cdtTrfTxInf*.intrBkSttlmDt=intrBkSttlmDt
+fiCdtTrf.cdtTrfTxInf*.sttlmPrty=sttlmPrty
+fiCdtTrf.cdtTrfTxInf*.sttlmTmIndctn=sttlmTmIndctn
+fiCdtTrf.cdtTrfTxInf*.sttlmTmReq=sttlmTmReq
+fiCdtTrf.cdtTrfTxInf*.prvsInstgAgt1=prvsInstgAgt1
+fiCdtTrf.cdtTrfTxInf*.prvsInstgAgt1Acct=prvsInstgAgt1Acct
+fiCdtTrf.cdtTrfTxInf*.prvsInstgAgt2=prvsInstgAgt2
+fiCdtTrf.cdtTrfTxInf*.prvsInstgAgt2Acct=prvsInstgAgt2Acct
+fiCdtTrf.cdtTrfTxInf*.prvsInstgAgt3=prvsInstgAgt3
+fiCdtTrf.cdtTrfTxInf*.prvsInstgAgt3Acct=prvsInstgAgt3Acct
+fiCdtTrf.cdtTrfTxInf*.intrmyAgt1=intrmyAgt1
+fiCdtTrf.cdtTrfTxInf*.intrmyAgt1Acct=intrmyAgt1Acct
+fiCdtTrf.cdtTrfTxInf*.intrmyAgt2=intrmyAgt2
+fiCdtTrf.cdtTrfTxInf*.intrmyAgt2Acct=intrmyAgt2Acct
+fiCdtTrf.cdtTrfTxInf*.intrmyAgt3=intrmyAgt3
+fiCdtTrf.cdtTrfTxInf*.intrmyAgt3Acct=intrmyAgt3Acct
+fiCdtTrf.cdtTrfTxInf*.dbtr=dbtr
+fiCdtTrf.cdtTrfTxInf*.dbtrAcct=dbtrAcct
+fiCdtTrf.cdtTrfTxInf*.dbtrAgt=dbtrAgt
+fiCdtTrf.cdtTrfTxInf*.dbtrAgtAcct=dbtrAgtAcct
+fiCdtTrf.cdtTrfTxInf*.cdtrAgt=cdtrAgt
+fiCdtTrf.cdtTrfTxInf*.cdtrAgtAcct=cdtrAgtAcct
+fiCdtTrf.cdtTrfTxInf*.cdtr=cdtr
+fiCdtTrf.cdtTrfTxInf*.cdtrAcct=cdtrAcct
+fiCdtTrf.cdtTrfTxInf*.instrForCdtrAgt=instrForCdtrAgt
+fiCdtTrf.cdtTrfTxInf*.instrForNxtAgt=instrForNxtAgt
+fiCdtTrf.cdtTrfTxInf*.purp=purp
+fiCdtTrf.cdtTrfTxInf*.rmtInf.ustrd=ustrd
+#fiCdtTrf.cdtTrfTxInf*.undrlygCstmrCdtTrf=undrlygCstmrCdtTrf
+fiCdtTrf.cdtTrfTxInf*.instgAgt=instgAgt
+fiCdtTrf.cdtTrfTxInf*.instdAgt=instdAgt
\ No newline at end of file