Skip to content

S
swiftISOEditor
Commit fd7abf3d by lixinyi
Options

增加055拟报，更新清分

parent d03c13b4
Showing with 153 additions and 14 deletions
editor_vue/src/iso/pages/index.vue
......@@ -485,6 +485,9 @@ export default {
} else if ("camt.054.001.08" === id) {
child[5].defaultValue = "swift.cbprplus.02";
child[5].unable = true;
} else if ("camt.055.001.08" === id) {
child[5].defaultValue = "swift.cbprplus.02";
child[5].unable = true;
} else if ("camt.056.001.08" === id) {
child[5].defaultValue = "swift.cbprplus.02";
child[5].unable = true;
......
editor_vue/src/iso/script/MsgCode.js
......@@ -13865,6 +13865,12 @@ const MsgCodes = {
isShow: true,
},
{
value: "camt.055.001.08",
label: "Customer Payment Cancellation Request",
label2: "Customer Payment Cancellation Request",
isShow: true,
},
{
value: "camt.056.001.08",
label: "FI To FI Payment Cancellation Request(MXn92)",
label2: "FI To FI Payment Cancellation Request",
......@@ -17296,6 +17302,34 @@ const MsgCodes = {
label : "OTFX-其他",
value : "OTFX"
},],
codeCode055: [ {
label : "Duplicate Payment",
value : "DUPL"
}, {
label : "Cancel Upon Unable To Apply",
value : "CUTA"
}, {
label : "Undue Payment",
value : "UPAY"
}, {
label : "Requested By Customer",
value : "CUST"
}, {
label : "Incorrect Currency",
value : "CURR"
}, {
label : "Incorrect Agent",
value : "AGNT"
}, {
label : "Technical Problem",
value : "TECH"
}, {
label : "Fraudulent Origin",
value : "FRAD"
}, {
label : "Narrative",
value : "NARR"
} ],
};
export default MsgCodes;
\ No newline at end of file
editor_vue/src/iso/script/MsgJson/Camt_054_001_08.js
......@@ -779,7 +779,7 @@ export default [
label: "Value Date",
tag: "valDt",
type: "Choice",
status: "O",
status: "M", //1、不填会mx2mt报错 2、业务上会必填
children: [
{
path: "2.13.6.0",
......
editor_vue/src/iso/script/MsgJson/index.js
......@@ -21,6 +21,7 @@ import cips_111_001_02 from "./cips_111_001_02";
import cips_112_001_02 from "./cips_112_001_02";
import Camt_053_001_08 from "./Camt_053_001_08";
import Camt_054_001_08 from "./Camt_054_001_08";
import Camt_055_001_08 from "./camt_055_001_08";
import Camt_056_001_08 from "./Camt_056_001_08";
import Camt_057_001_06 from "./Camt_057_001_06";
import Camt_029_001_09 from "./Camt_029_001_09";
......@@ -149,6 +150,8 @@ export default function MsgJsonMap(mty) {
return msgClone(Ntry);
case "camt.054.001.08":
return msgClone(Camt_054_001_08);
case "camt.055.001.08":
return msgClone(Camt_055_001_08);
case "camt.056.001.08":
return msgClone(Camt_056_001_08);
case "camt.057.001.06":
......
editor_vue/src/iso/script/MsgValidator.js
......@@ -114,7 +114,7 @@ export function numberValidator(totalDig, fractionDig) {
export function regExpValidator(regExp) {
return (rule, value, callback) => {
if (value === undefined || value === null || value.trim() === "") {
if (value === undefined || value === null || value?.toString().trim() === "") {
callback();
} else {
if (new RegExp("^" + regExp + "$").test(value)) {
......
editor_vue/src/iso/script/Rule/Cbpr/Camt029.js
......@@ -242,7 +242,7 @@ function CBPR_Case_Identification_FormalRule(obj) {
const position = "Identification";
console.log(id);
if(isNotEmpty(id)){
if(id.startsWith('/') || id.endsWith('/') || id.length != 16 || id.indexOf('//')>=0){
if(id.startsWith('/') || id.endsWith('/') || id.indexOf('//')>=0){
message(position,msg);
return false;
}
......
editor_vue/src/iso/script/Rule/Cbpr/Camt056.js
......@@ -215,7 +215,7 @@ function CBPR_Case_Identification_FormalRule(obj) {
var id = obj.id;
const position = " Case Identification";
if (isNotEmpty(id)) {
if (id.startsWith('/') || id.endsWith('/') || id.length != 16 || id.indexOf('//') >= 0) {
if (id.startsWith('/') || id.endsWith('/') || id.indexOf('//') >= 0) {
message(position, msg);
return false;
}
......
editor_vue/src/iso/script/Rule/Cbpr/Pacs004.js
......@@ -433,8 +433,8 @@ function CBPR_Co_existence_Postal_Address_TextualRule() {
//r12
function CBPR_CRED_FormalRule(obj) {
const msg = "Charge information is mandatory if CRED is present – if no charges are taken, Zero must be used in 'Amount' (any agent in the payment chain).";
var chrgBr = obj.cdtTrfTxInf.chrgBr;
var chrgsInf = obj.cdtTrfTxInf.chrgsInf;
var chrgBr = obj.txInf.chrgBr;
var chrgsInf = obj.txInf.chrgsInf;
if (isNotEmpty(chrgBr) && 'CRED' == chrgBr){
if(isEmpty(chrgsInf)){
message("Charge Bearer", msg);
......@@ -911,12 +911,12 @@ function CBPR_UltimateDebtor_Option_3_Jurisdictions_only_TextualRule() {
// CrossElementComplexRule 如果存在收费信息，则指示金额必须存在
function ChargesInformationAndInstructedAmountRule(obj) {
const msg = "If ChargesInformation is present, then InstructedAmount must be present.";
var chrgsInf = obj.cdtTrfTxInf.chrgsInf;
var instdAmt = obj.cdtTrfTxInf.instdAmt;
const msg = "If ChargesInformation is present, then Returned Instructed Amount must be present.";
var chrgsInf = obj.txInf.chrgsInf;
var instdAmt = obj.txInf.rtrdInstdAmt;
if(isNotEmpty(chrgsInf)){
if(isEmpty(instdAmt)){
message("Instructed Amount", msg);
message("Returned Instructed Amount", msg);
return false;
}
}
......
editor_vue/src/iso/script/Rule/CbprRule.js
......@@ -5,6 +5,7 @@ import camt052pdf from './Cbpr/Camt052pdf.js'
import camt053 from './Cbpr/Camt053.js'
import camt053pdf from './Cbpr/Camt053pdf.js'
import camt054 from './Cbpr/Camt054.js'
import camt055 from './Cbpr/Camt055.js'
import camt056 from './Cbpr/Camt056.js'
import camt057 from './Cbpr/Camt057.js'
import camt060 from './Cbpr/Camt060.js'
......@@ -29,6 +30,8 @@ export function validatorRule(mty,obj) {
return camt053(obj)&&camt053pdf(obj);
case 'camt.054.001.08':
return camt054(obj);
case 'camt.055.001.08':
return camt055(obj);
case 'camt.056.001.08':
return camt056(obj);
case 'camt.057.001.06':
......
swift-service/src/main/java/com/brilliance/mxeditor/MxTransfer.java
......@@ -7,7 +7,6 @@ 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;
......@@ -30,7 +29,7 @@ public class MxTransfer {
}
}
gsonMaps.remove("appHdr");
List<String> list = new ArrayList<>(Arrays.asList("cdtTrfTxInf", "txInfAndSts","cxlDtls","txInfAndSts","undrlyg","txInf","cxlRsnInf","rtrRsnInf","rpt","stmt"));
List<String> list = new ArrayList<>(Arrays.asList("cdtTrfTxInf", "txInfAndSts","cxlDtls","txInfAndSts","undrlyg","orgnlPmtInfAndCxl","txInf","cxlRsnInf","rtrRsnInf","rpt","stmt"));
//最大数量大于1的节点需要读其子节点
for(String s: list) {
if (gsonMaps.get(s) != null) {
......
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.a8e6e710.js"></script><script defer="defer" src="js/main.59945214.js"></script><link href="css/chunk-vendors.77489a8d.css" rel="stylesheet"><link href="css/app.1726963b.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
<!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>
\ No newline at end of file
swift-service/src/main/resources/template/camt05500108.properties 0 → 100644
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
cstmrPmtCxlReq.assgnmt=assgnmt
#cstmrPmtCxlReq.undrlyg=undrlyg
#cstmrPmtCxlReq=cstmrPmtCxlReq
#cstmrPmtCxlReq.assgnmt=assgnmt
#cstmrPmtCxlReq.undrlyg=undrlyg
#cstmrPmtCxlReq.undrlyg.txInf._case=case
#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
#cstmrPmtCxlReq.assgnmt.id=id
#cstmrPmtCxlReq.assgnmt.creDtTm=creDtTm
#cstmrPmtCxlReq.assgnmt.assgnr.agt=assgnrAgt
#cstmrPmtCxlReq.assgnmt.assgne.agt=assgneAgt
cstmrPmtCxlReq.undrlyg*.orgnlPmtInfAndCxl*.orgnlPmtInfId=orgnlPmtInfId
cstmrPmtCxlReq.undrlyg*.orgnlPmtInfAndCxl*.orgnlGrpInf=orgnlGrpInf
cstmrPmtCxlReq.undrlyg*.orgnlPmtInfAndCxl*.txInf*.orgnlGrpInf=orgnlGrpInf
cstmrPmtCxlReq.undrlyg*.orgnlPmtInfAndCxl*.txInf*.orgnlInstrId=orgnlInstrId
cstmrPmtCxlReq.undrlyg*.orgnlPmtInfAndCxl*.txInf*.orgnlEndToEndId=orgnlEndToEndId
cstmrPmtCxlReq.undrlyg*.orgnlPmtInfAndCxl*.txInf*.orgnlTxId=orgnlTxId
cstmrPmtCxlReq.undrlyg*.orgnlPmtInfAndCxl*.txInf*.orgnlUETR=orgnlUETR
cstmrPmtCxlReq.undrlyg*.orgnlPmtInfAndCxl*.txInf*.orgnlClrSysRef=orgnlClrSysRef
cstmrPmtCxlReq.undrlyg*.orgnlPmtInfAndCxl*.txInf*.orgnlIntrBkSttlmAmt=orgnlIntrBkSttlmAmt
cstmrPmtCxlReq.undrlyg*.orgnlPmtInfAndCxl*.txInf*.orgnlIntrBkSttlmDt=orgnlIntrBkSttlmDt
cstmrPmtCxlReq.undrlyg*.orgnlPmtInfAndCxl*.txInf*.orgnlReqdColltnDt=orgnlReqdColltnDt
cstmrPmtCxlReq.undrlyg*.orgnlPmtInfAndCxl*.txInf*.orgnlInstdAmt=orgnlInstdAmt
cstmrPmtCxlReq.undrlyg*.orgnlPmtInfAndCxl*.txInf*.cxlRsnInf*.orgtr=orgtr
cstmrPmtCxlReq.undrlyg*.orgnlPmtInfAndCxl*.txInf*.cxlRsnInf*.rsn=rsn
cstmrPmtCxlReq.undrlyg*.orgnlPmtInfAndCxl*.txInf*.cxlRsnInf*.AddtlInf=AddtlInf
cstmrPmtCxlReq.undrlyg*.orgnlPmtInfAndCxl*.txInf*._case=_case
cstmrPmtCxlReq.undrlyg*.orgnlPmtInfAndCxl*.txInf*.cxlId=cxlId
\ No newline at end of file
swift-service/src/main/resources/templateOut/camt05500108.properties 0 → 100644
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
cstmrPmtCxlReq.assgnmt=assgnmt
cstmrPmtCxlReq.undrlyg=undrlyg
#cstmrPmtCxlReq=cstmrPmtCxlReq
#cstmrPmtCxlReq.assgnmt=assgnmt
#cstmrPmtCxlReq.undrlyg=undrlyg
#cstmrPmtCxlReq.undrlyg.txInf._case=case
#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
#cstmrPmtCxlReq.assgnmt.id=id
#cstmrPmtCxlReq.assgnmt.creDtTm=creDtTm
#cstmrPmtCxlReq.assgnmt.assgnr.agt=assgnrAgt
#cstmrPmtCxlReq.assgnmt.assgne.agt=assgneAgt
#cstmrPmtCxlReq.undrlyg*.orgnlPmtInfAndCxl*.orgnlPmtInfId=orgnlPmtInfId
#cstmrPmtCxlReq.undrlyg*.orgnlPmtInfAndCxl*.orgnlGrpInf=orgnlGrpInf
#cstmrPmtCxlReq.undrlyg*.orgnlPmtInfAndCxl*.txInf*.orgnlGrpInf=orgnlGrpInf
#cstmrPmtCxlReq.undrlyg*.orgnlPmtInfAndCxl*.txInf*.orgnlInstrId=orgnlInstrId
#cstmrPmtCxlReq.undrlyg*.orgnlPmtInfAndCxl*.txInf*.orgnlEndToEndId=orgnlEndToEndId
#cstmrPmtCxlReq.undrlyg*.orgnlPmtInfAndCxl*.txInf*.orgnlTxId=orgnlTxId
#cstmrPmtCxlReq.undrlyg*.orgnlPmtInfAndCxl*.txInf*.orgnlUETR=orgnlUETR
#cstmrPmtCxlReq.undrlyg*.orgnlPmtInfAndCxl*.txInf*.orgnlClrSysRef=orgnlClrSysRef
#cstmrPmtCxlReq.undrlyg*.orgnlPmtInfAndCxl*.txInf*.orgnlIntrBkSttlmAmt=orgnlIntrBkSttlmAmt
#cstmrPmtCxlReq.undrlyg*.orgnlPmtInfAndCxl*.txInf*.orgnlIntrBkSttlmDt=orgnlIntrBkSttlmDt
#cstmrPmtCxlReq.undrlyg*.orgnlPmtInfAndCxl*.txInf*.orgnlReqdColltnDt=orgnlReqdColltnDt
#cstmrPmtCxlReq.undrlyg*.orgnlPmtInfAndCxl*.txInf*.orgnlInstdAmt=orgnlInstdAmt
#cstmrPmtCxlReq.undrlyg*.orgnlPmtInfAndCxl*.txInf*.cxlRsnInf*.orgtr=orgtr
#cstmrPmtCxlReq.undrlyg*.orgnlPmtInfAndCxl*.txInf*.cxlRsnInf*.rsn=rsn
#cstmrPmtCxlReq.undrlyg*.orgnlPmtInfAndCxl*.txInf*.cxlRsnInf*.AddtlInf=AddtlInf
#cstmrPmtCxlReq.undrlyg*.orgnlPmtInfAndCxl*.txInf*._case=_case
#cstmrPmtCxlReq.undrlyg*.orgnlPmtInfAndCxl*.txInf*.cxlId=cxlId
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment