Merge remote-tracking branch 'origin/develop' into develop

isc-common-core/src/main/java/com/brilliance/isc/bo/Crd.java

@@ -19,7 +19,7 @@ import static com.brilliance.mda.runtime.mda.Constants.NULLSTR;
 public class Crd extends AbstractCommonVo {
 
 
-    //Internal Unique ID of Import L/C (max = 8)
+    //Internal Unique ID of Import L/C (max = 16)
     private String inr = NULLSTR;
 
     //Reference (max = 16)
@@ -37,7 +37,6 @@ public class Crd extends AbstractCommonVo {
 
     //Date L/C Opened/Issued
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-
     private Date opndat = NULLDATE;
 
     //Date L/C Closed
@@ -51,10 +50,16 @@ public class Crd extends AbstractCommonVo {
     //Object INR of Associated Contract Optional (max =8)
     private String rcvobjinr = NULLSTR;
 
-    //Clearing Type  (max =1)
+    //Clearing Type  (max =1) I:Clearing In  ;O:Clearing Out
     private String clrtyp = NULLSTR;
 
-    //Transaction Type  (max =1)
+    /*
+        Transaction Type  (max =1)
+        贸易 0
+        非贸易 1
+        资本 2
+        其他 3
+     */
     private String trntyp = NULLSTR;
 
     //Receiver BIC  (max =12)
@@ -84,7 +89,7 @@ public class Crd extends AbstractCommonVo {
     //Error Message  (max =40)
     private String errmsg = NULLSTR;
 
-    //Customer Type  (max =1)
+    //Customer Type  (max =1)  1:对私 0:对公
     private String custyp = NULLSTR;
 
     //BRANCHINR (max =8)

isc-common-core/src/main/java/com/brilliance/isc/bo/Spt.java

 package com.brilliance.isc.bo;
 
-import com.brilliance.mda.runtime.mda.util.Decimals;
 import com.brilliance.isc.common.json.BigDecimalSerialize;
+import com.brilliance.mda.runtime.mda.util.Decimals;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -177,4 +177,7 @@ public class Spt {
         private String cortyp= NULLSTR;
 
         private String frontchannel= NULLSTR;
+
+        //HLJ 清算模块 len=34 MT103-59 ACT
+        private String act59= NULLSTR;
 }
\ No newline at end of file

isc-common-core/src/main/java/com/brilliance/isc/bo/model/Crdgrp.java

@@ -19,6 +19,8 @@ public class Crdgrp extends AbstractCommonVo {
 
     private Crd rec;
 
+    private Crtp crtp;
+
     private Cracbs cbs;
 
     private PtsptaVo snd;
@@ -36,7 +38,10 @@ public class Crdgrp extends AbstractCommonVo {
         if (rec == null) {
             rec = new Crd();
         }
-
+        if (crtp == null) {
+            crtp = new Crtp();
+        }
+        crtp.reset();
         if (cbs == null) {
             cbs = new Cracbs();
         }

isc-common-core/src/main/java/com/brilliance/isc/bo/model/Crtmod.java

@@ -24,7 +24,6 @@ public class Crtmod extends AbstractCommonVo {
     //Inr of SMH
     private String smhinr = NULLSTR;
 
-    private Crdgrp crdgrp;
 
 //    private Sysobj crdobj;
 
@@ -35,10 +34,6 @@ public class Crtmod extends AbstractCommonVo {
     //    private Crtdoc crtdoc;
     @Override
     public void reset() {
-        if (crdgrp == null) {
-            crdgrp = new Crdgrp();
-        }
-        crdgrp.reset();
 
         if (crtspt == null) {
             crtspt = new Spt();

isc-common-core/src/main/java/com/brilliance/isc/bo/model/Crtp.java

 package com.brilliance.isc.bo.model;
 
-import com.brilliance.isc.bo.Usr;
 import com.brilliance.isc.common.vo.AbstractCommonVo;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -10,6 +9,8 @@ import org.slf4j.LoggerFactory;
 
 import java.util.Date;
 
+import static com.brilliance.mda.runtime.mda.Constants.NULLSTR;
+
 /**
  *
  */
@@ -24,13 +25,11 @@ public class Crtp extends AbstractCommonVo {
 
 
     //USE FOR ARE AMTOUNT (max=1)
-    private Usr usr;
+    private String forare = NULLSTR;
+
 
     @Override
     public void reset() {
         super.reset();
-        if (usr == null) {
-            usr = new Usr();
-        }
     }
 }
\ No newline at end of file

isc-common-core/src/main/java/com/brilliance/isc/common/nosmod/vo/Noscbs.java → isc-common-core/src/main/java/com/brilliance/isc/common/nosmod/bo/Noscbs.java

-package com.brilliance.isc.common.nosmod.vo;
+package com.brilliance.isc.common.nosmod.bo;
 
 import com.brilliance.isc.bo.Cbb;
 import com.brilliance.isc.common.vo.AbstractCommonVo;

isc-common-core/src/main/java/com/brilliance/isc/common/nosmod/vo/Nosmod.java → isc-common-core/src/main/java/com/brilliance/isc/common/nosmod/bo/Nosmod.java

-package com.brilliance.isc.common.nosmod.vo;
+package com.brilliance.isc.common.nosmod.bo;
 
 import com.brilliance.isc.bo.Act;
 import com.brilliance.isc.bo.Cbe;

isc-common-core/src/main/java/com/brilliance/isc/common/nosmod/vo/NoscbsVo.java

+package com.brilliance.isc.common.nosmod.vo;
+
+import com.brilliance.isc.bo.Cbb;
+import com.brilliance.isc.common.vo.AbstractCommonVo;
+import com.brilliance.isc.vo.model.CbbVo;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @program: isc-core
+ * @ClassName: NoscbsVo
+ * @description:
+ * @author: huangshunlin
+ * @create: 2024-10-18 20:34
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class NoscbsVo extends AbstractCommonVo implements Serializable {
+    private CbbVo nos;
+
+    @Override
+    public void reset() {
+        super.reset();
+        if (nos == null) {
+            nos = new CbbVo();
+        }
+        nos.reset();
+    }
+}

isc-common-core/src/main/java/com/brilliance/isc/common/nosmod/vo/NosmodVo.java

+package com.brilliance.isc.common.nosmod.vo;
+
+import com.brilliance.isc.common.vo.AbstractCommonVo;
+import com.brilliance.isc.common.vo.ActVo;
+import com.brilliance.isc.vo.lg.CbeVo;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @program: isc-funds
+ * @ClassName: Nosmod
+ * @description:
+ * @author:huangshunlin
+ * @create:2024-10-18 20:30
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class NosmodVo extends AbstractCommonVo implements Serializable {
+    private NoscbsVo cbs;
+
+    private CbeVo wrkcbe;
+
+    private ActVo rec;
+
+    @Override
+    public void reset() {
+        super.reset();
+        if (cbs == null) {
+            cbs = new NoscbsVo();
+        }
+        cbs.reset();
+        if (wrkcbe == null) {
+            wrkcbe = new CbeVo();
+        }
+
+        if (rec == null) {
+            rec = new ActVo();
+        }
+
+    }
+}

isc-common-core/src/main/java/com/brilliance/isc/mda/dao/GleMapper.java

 package com.brilliance.isc.mda.dao;
-import java.math.BigDecimal;
 
 import com.brilliance.isc.bo.Gle;
 import com.brilliance.isc.vo.PvcRequestVo;
@@ -7,6 +6,7 @@ import com.brilliance.isc.vo.PvcResponseVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.math.BigDecimal;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -28,19 +28,21 @@ public interface GleMapper {
 
     Gle selectByPrimaryKey(Gle record);
 
-    int dyncDelete(Map<String,Object> dyncMap);
+    int dyncDelete(Map<String, Object> dyncMap);
+
+    int dyncUpdate(Map<String, Object> dyncMap);
 
-    List<Gle> dyncRead(Map<String,Object> dyncMap);
+    List<Gle> dyncRead(Map<String, Object> dyncMap);
 
     Gle selectByCondition(Gle record);
 
-    List<Gle>  selectByTrninr(@Param("trninr")String trninr);
+    List<Gle> selectByTrninr(@Param("trninr") String trninr);
 
-    Gle selectByNewactcodAndCurAndTrninr(@Param("newactcod") String newactcod, @Param("cur")String cur, @Param("trninr")String trninr);
+    Gle selectByNewactcodAndCurAndTrninr(@Param("newactcod") String newactcod, @Param("cur") String cur, @Param("trninr") String trninr);
 
-    int updateByTrninr(@Param("itfinr") String itfinr,@Param("trninr")String trninr);
+    int updateByTrninr(@Param("itfinr") String itfinr, @Param("trninr") String trninr);
 
-    int selectCountByTrninr(@Param("trninr")String trninr);
+    int selectCountByTrninr(@Param("trninr") String trninr);
 
     List<Gle> selectByTrninrLikeTaxinf(@Param("trninr") String trninr);
 
@@ -52,4 +54,7 @@ public interface GleMapper {
 
     List<PvcResponseVo> selectPVCList(PvcRequestVo gleRequestVo);
 
+    Gle selectSpcGLeByTrninr(@Param("trninr") String trninr);
+
+
 }
\ No newline at end of file

isc-common-core/src/main/java/com/brilliance/isc/mda/dao/SptMapper.java

@@ -30,6 +30,8 @@ public interface SptMapper {
 
     int dyncDelete(Map<String, Object> dyncMap);
 
+    int dyncUpdate(Map<String, Object> dyncMap);
+
     List<Spt> dyncRead(Map<String, Object> dyncMap);
 
     List<Spt> selectList(@Param("selobj") String selobj, @Param("inidatfro") String inidatfro,

isc-common-core/src/main/java/com/brilliance/isc/vo/funds/CracbsVo.java

+package com.brilliance.isc.vo.funds;
+
+import com.brilliance.isc.common.vo.AbstractCommonVo;
+import com.brilliance.isc.vo.model.CbbVo;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+/**
+ * @program: isc-core
+ * @ClassName: Cracbs
+ * @description: 清算cbs模块
+ * @author: huangshunlin
+ * @create: 2024-10-16 20:41
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class CracbsVo extends AbstractCommonVo {
+
+    private CbbVo max;
+
+    @Override
+    public void reset() {
+        super.reset();
+        if (max == null) {
+            max = new CbbVo();
+        }
+        max.reset();
+    }
+
+}

isc-common-core/src/main/java/com/brilliance/isc/vo/funds/CrdBizInfoVo.java

@@ -5,6 +5,9 @@ import lombok.Data;
 
 import java.util.Date;
 
+import static com.brilliance.mda.runtime.mda.Constants.NULLDATE;
+import static com.brilliance.mda.runtime.mda.Constants.NULLSTR;
+
 /**
  * @program: isc-core
  * @ClassName: CrdBizInfoVo
@@ -16,17 +19,28 @@ import java.util.Date;
 public class CrdBizInfoVo extends BizInfoVo {
 
     //crtp.forare
-    private String forare;
+    private String forare = NULLSTR;
     //crdgrp.rec.opndat
-    private Date opndat;
+    private Date opndat = NULLDATE;
 
     //crdgrp.rec.rcvbchinr
-    private String rcvbchinr;
+    private String rcvbchinr = NULLSTR;
 
     //crdgrp.rec.custyp
-    private String custyp;
+    private String custyp = NULLSTR;
 
     //rcvact.inr
-    private String rcvactInr;
+    private String rcvactInr = NULLSTR;
+    //rcvact.extkey
+    private String rcvactExtkey = NULLSTR;
+
+    //crtcro 汇出清算 spcgle.act
+    private String spcgleAct = NULLSTR;
+
+    //crtcro 汇出清算 crdgrp.rec.rcvobjtyp
+    private String rcvobjtyp = NULLSTR;
+
+    //crtcro 汇出清算 cpdgrp.rec.valdat
+    private Date valdat = NULLDATE;
 
 }

isc-common-core/src/main/java/com/brilliance/isc/vo/funds/CrdVo.java

+package com.brilliance.isc.vo.funds;
+
+import com.brilliance.isc.common.vo.AbstractCommonVo;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+import java.util.Date;
+
+import static com.brilliance.mda.runtime.mda.Constants.NULLDATE;
+import static com.brilliance.mda.runtime.mda.Constants.NULLSTR;
+
+
+/**
+ * CrdVo
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class CrdVo extends AbstractCommonVo {
+
+
+    //Internal Unique ID of Import L/C (max = 16)
+    private String inr = NULLSTR;
+
+    //Reference (max = 16)
+    private String ownref = NULLSTR;
+
+    //Externally Displayed Name to Identify the Contract (max = 40)
+    private String nam = NULLSTR;
+
+    //Responsible User (max = 8)
+    private String ownusr = NULLSTR;
+
+    //Date of Creation Opening or Registry
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date credat = NULLDATE;
+
+    //Date L/C Opened/Issued
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date opndat = NULLDATE;
+
+    //Date L/C Closed
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+
+    private Date clsdat = NULLDATE;
+
+    //Object Type of Associated Contract Optional  (max =6)
+    private String rcvobjtyp = NULLSTR;
+
+    //Object INR of Associated Contract Optional (max =8)
+    private String rcvobjinr = NULLSTR;
+
+    //Clearing Type  (max =1) I:Clearing In  ;O:Clearing Out
+    private String clrtyp = NULLSTR;
+
+    /*
+        Transaction Type  (max =1)
+        贸易 0
+        非贸易 1
+        资本 2
+        其他 3
+     */
+    private String trntyp = NULLSTR;
+
+    //Receiver BIC  (max =12)
+    private String rcvbic = NULLSTR;
+
+    //Message ReferenceTag21  (max =16)
+    private String msgref = NULLSTR;
+
+    //Account in MessageTag59  (max =21)
+    private String msgact = NULLSTR;
+
+    //Message Type  (max =3)
+    private String msgtyp = NULLSTR;
+
+    //Message InrSMH  (max =8)
+    private String msginr = NULLSTR;
+
+    //Bound Message Type  (max =8)
+    private String bndtyp = NULLSTR;
+
+    //Bound Message INRSMH   (max =8)
+    private String bndinr = NULLSTR;
+
+    //Status  (max =1)
+    private String sta = NULLSTR;
+
+    //Error Message  (max =40)
+    private String errmsg = NULLSTR;
+
+    //Customer Type  (max =1)  1:对私 0:对公
+    private String custyp = NULLSTR;
+
+    //BRANCHINR (max =8)
+    private String branchinr = NULLSTR;
+
+    //BRANCH CODE KEYINR  (max =8)
+    private String bchkeyinr = NULLSTR;
+
+    //Receiver Branch Inr  (max =8)
+    private String rcvbchinr = NULLSTR;
+
+    //Version Counter  (max =4)
+    private String ver = NULLSTR;
+
+    //Inr for SPT  (max =8)
+    private String sptinr = NULLSTR;
+
+    //Entity holding Contract   (max =8)
+    private String etyextkey = NULLSTR;
+
+
+}
\ No newline at end of file

isc-common-core/src/main/java/com/brilliance/isc/vo/funds/CrdgrpVo.java

+package com.brilliance.isc.vo.funds;
+
+import com.brilliance.isc.common.vo.AbstractCommonVo;
+import com.brilliance.isc.common.vo.PtsptaVo;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+/**
+ * @program: isc-core
+ * @ClassName: Crdgrp
+ * @description: 清算grp模块
+ * @author: huangshunlin
+ * @create: 2024-10-16 20:38
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class CrdgrpVo extends AbstractCommonVo {
+
+    private CrdVo rec;
+
+    private CrtpVo crtp;
+
+    private CracbsVo cbs;
+
+    private PtsptaVo snd;
+
+    private PtsptaVo rcv;
+
+    private PtsptaVo trf;
+
+    private PtsptaVo apl;
+
+    private PtsptaVo acc;
+
+    @Override
+    public void reset() {
+        if (rec == null) {
+            rec = new CrdVo();
+        }
+        if (crtp == null) {
+            crtp = new CrtpVo();
+        }
+        crtp.reset();
+        if (cbs == null) {
+            cbs = new CracbsVo();
+        }
+        cbs.reset();
+
+        if (snd == null) {
+            snd = new PtsptaVo();
+        }
+        snd.reset();
+
+        if (rcv == null) {
+            rcv = new PtsptaVo();
+        }
+        rcv.reset();
+
+        if (trf == null) {
+            trf = new PtsptaVo();
+        }
+        trf.reset();
+
+        if (apl == null) {
+            apl = new PtsptaVo();
+        }
+        apl.reset();
+
+        if (acc == null) {
+            acc = new PtsptaVo();
+        }
+        acc.reset();
+
+    }
+}

isc-common-core/src/main/java/com/brilliance/isc/vo/funds/CrtmodVo.java

+package com.brilliance.isc.vo.funds;
+
+import com.brilliance.isc.bo.SptVo;
+import com.brilliance.isc.common.vo.AbstractCommonVo;
+import com.brilliance.mda.runtime.mda.IStream;
+import com.brilliance.mda.runtime.mda.impl.StreamImpl;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+import static com.brilliance.mda.runtime.mda.Constants.NULLSTR;
+
+/**
+ * @program: isc-core
+ * @ClassName: CrtmodVo
+ * @description: 清算crtmod
+ * @author: huangshunlin
+ * @create: 2024-10-17 18:24
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class CrtmodVo extends AbstractCommonVo {
+    //Parameter Stream
+    private IStream parstm = new StreamImpl();
+    //Inr of SMH
+    private String smhinr = NULLSTR;
+
+//    private Sysobj crdobj;
+
+//    private Crdlod crdlod;
+
+    private SptVo crtspt;
+
+    //    private Crtdoc crtdoc;
+    @Override
+    public void reset() {
+
+        if (crtspt == null) {
+            crtspt = new SptVo();
+        }
+    }
+}

isc-common-core/src/main/java/com/brilliance/isc/vo/funds/CrtpVo.java

+package com.brilliance.isc.vo.funds;
+
+import com.brilliance.isc.common.vo.AbstractCommonVo;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Date;
+
+import static com.brilliance.mda.runtime.mda.Constants.NULLSTR;
+
+/**
+ *
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class CrtpVo extends AbstractCommonVo {
+    private static Logger log = LoggerFactory.getLogger(CrtpVo.class);
+
+    //Value Date
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date valdat;
+
+
+    //USE FOR ARE AMTOUNT (max=1)
+    private String forare = NULLSTR;
+
+
+    @Override
+    public void reset() {
+        super.reset();
+    }
+}
\ No newline at end of file

isc-common-core/src/main/java/com/brilliance/isc/vo/funds/FxacbsVo.java

+package com.brilliance.isc.vo.funds;
+
+import com.brilliance.isc.common.vo.AbstractCommonVo;
+import com.brilliance.isc.vo.model.CbbVo;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class FxacbsVo extends AbstractCommonVo {
+
+    private CbbVo max;
+
+    private CbbVo nom1;
+
+    private CbbVo opn1;
+
+    private CbbVo opn2;
+
+    @Override
+    public void reset() {
+        super.reset();
+        if (max == null) {
+            max = new CbbVo();
+        }
+        if (nom1 == null) {
+            nom1 = new CbbVo();
+        }
+        if (opn1 == null) {
+            opn1 = new CbbVo();
+        }
+        if (opn2 == null) {
+            opn2 = new CbbVo();
+        }
+    }
+}

isc-common-core/src/main/java/com/brilliance/isc/vo/funds/FxdVo.java

+package com.brilliance.isc.vo.funds;
+
+import com.brilliance.isc.common.vo.AbstractCommonVo;
+import com.brilliance.mda.runtime.mda.util.Decimals;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import static com.brilliance.mda.runtime.mda.Constants.NULLDATE;
+import static com.brilliance.mda.runtime.mda.Constants.NULLSTR;
+
+
+/**
+ * FxdVo:
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class FxdVo extends AbstractCommonVo {
+
+
+    //Internal Unique ID of Import L/C
+    private String inr = NULLSTR;
+
+    //Reference
+    private String ownref = NULLSTR;
+
+    //Externally Displayed Name to Identify the Contract
+    private String nam = NULLSTR;
+
+    //Date Foreign Exchange Opened/Issued
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date opndat = NULLDATE;
+
+    //Responsible User
+    private String ownusr = NULLSTR;
+
+    //Foreign Exchange Type
+    private String fxtyp = NULLSTR;
+
+    //Rate
+    private BigDecimal rat = Decimals.ZERO_SCALE6;
+
+    //Middle Rate
+    private BigDecimal midrat = Decimals.ZERO_SCALE6;
+
+    //Quote Reference
+    private String quoref = NULLSTR;
+
+    //Fund Department Reference
+    private String fudref = NULLSTR;
+
+    //Value date
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date valdat = NULLDATE;
+
+    //Date of confirmation
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date cnfdat = NULLDATE;
+
+    //Settlement Date
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date setdat = NULLDATE;
+
+    //Settlemt date from
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date setdatfrm = NULLDATE;
+
+    //Settlement date to
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date setdatto = NULLDATE;
+
+    //Date of Closed
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date clsdat = NULLDATE;
+
+    //Version
+    private String ver = NULLSTR;
+
+    //Branch INR
+    private String branchinr = NULLSTR;
+
+    //Branch INR
+    private String bchkeyinr = NULLSTR;
+
+    //TRADE IN
+    private String trdint = NULLSTR;
+
+    //TRADE OUT
+    private String trdout = NULLSTR;
+
+    //交易主体
+    private String trnman = NULLSTR;
+
+    //Foreign Account
+    private String acc = NULLSTR;
+
+    //CNY Account
+    private String acc2 = NULLSTR;
+
+    //Clearing Department Responsible User
+    private String usr = NULLSTR;
+
+    //Disposition
+    private String dsp = NULLSTR;
+
+    //Disposition
+    private String dsp2 = NULLSTR;
+
+    //Cash cover percent
+    private BigDecimal cshpct = Decimals.ZERO_SCALE2;
+
+    //Rate
+    private BigDecimal rat1 = Decimals.ZERO_SCALE6;
+
+    //Account manager
+    private String accmng = NULLSTR;
+
+    //客户经理部门
+    private String hdbch = NULLSTR;
+
+    //Entity  KEY of Entry
+    private String etyextkey = NULLSTR;
+
+
+}
\ No newline at end of file

isc-common-core/src/main/java/com/brilliance/isc/vo/funds/FxdgrpVo.java

+package com.brilliance.isc.vo.funds;
+
+import com.brilliance.isc.common.vo.AbstractCommonVo;
+import com.brilliance.isc.common.vo.PtsptaVo;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+/**
+ * @program: isc-core
+ * @ClassName: FxdgrpVo
+ * @description: fxdgrp VO
+ * @author: huangshunlin
+ * @create: 2024-10-09 11:23
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class FxdgrpVo extends AbstractCommonVo {
+
+    private FxdVo rec;
+
+    private FxtVo blk;
+
+    private FxacbsVo cbs;
+
+    private PtsptaVo apl;
+
+    private PtsptaVo act;
+
+    private PtsptaVo age;
+
+    private PtsptaVo acc;
+
+    @Override
+    public void reset() {
+        super.reset();
+        if (rec == null) {
+            rec = new FxdVo();
+        }
+        if (blk == null) {
+            blk = new FxtVo();
+        }
+        if (cbs == null) {
+            cbs = new FxacbsVo();
+        }
+        cbs.reset();
+        if (apl == null) {
+            apl = new PtsptaVo();
+        }
+        apl.reset();
+        if (act == null) {
+            act = new PtsptaVo();
+        }
+        act.reset();
+        if (age == null) {
+            age = new PtsptaVo();
+        }
+        age.reset();
+        if (acc == null) {
+            acc = new PtsptaVo();
+        }
+        acc.reset();
+
+    }
+}

isc-common-core/src/main/java/com/brilliance/isc/vo/funds/FxtVo.java

+package com.brilliance.isc.vo.funds;
+
+import com.brilliance.isc.common.vo.AbstractCommonVo;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+import static com.brilliance.mda.runtime.mda.Constants.NULLSTR;
+
+
+/**
+ * FxtVo:
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class FxtVo extends AbstractCommonVo {
+
+
+    //Internal Unique ID
+    private String inr = NULLSTR;
+
+    //Remark
+    private String remark = NULLSTR;
+
+
+}
\ No newline at end of file

isc-common-core/src/main/java/com/brilliance/isc/vo/funds/FxtpVo.java

+package com.brilliance.isc.vo.funds;
+
+import com.brilliance.isc.common.vo.AbstractCommonVo;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static com.brilliance.mda.runtime.mda.Constants.NULLSTR;
+
+/**
+ *
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class FxtpVo extends AbstractCommonVo {
+    private static Logger log = LoggerFactory.getLogger(FxtpVo.class);
+
+    //Amount Label (max=30)
+    private String amtlab = NULLSTR;
+    //Amount LabelCNY (max=30)
+    private String cnylab = NULLSTR;
+    //Quote Flag (max=1)
+    private String quoflg = NULLSTR;
+    //钞汇标志 (max=1)
+    private String cshflg = NULLSTR;
+    //Calculate (max=1)
+    private String calflg = NULLSTR;
+    //外币 (max=1)
+    private String frgchk = NULLSTR;
+    //人民币 (max=1)
+    private String cnychk = NULLSTR;
+
+
+    @Override
+    public void reset() {
+        super.reset();
+    }
+}
\ No newline at end of file

isc-common-core/src/main/resources/mapper/sptmapper.xml

@@ -55,11 +55,12 @@
         <result property="chnref" column="chnref" jdbcType="VARCHAR"/>
         <result property="cortyp" column="cortyp" jdbcType="VARCHAR"/>
         <result property="frontchannel" column="frontchannel" jdbcType="VARCHAR"/>
+        <result property="act59" column="act59" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
         inr
-        ,objtyp,objinr,objnam,objref,txt,dattim,usr,ssninr,frm,ehtyp,pan,sta,delflg,hldflg,infdsp,inftxt,ownusg,ownusr,channel,smhinr,mapflg,cretrn,ordinr,tardattim,creobjtyp,creobjinr,relcur,relamt,etgextkey,etyextkey,ptainr,payflg,wrkgrp,wrkusr,bchkeyinr,branchinr,vipflg,credat,msgtyp,flg202,ownref,imginr,lstusr,lstgrp,paytyp,eciflg,dfref,ctmnam,chnref,cortyp,frontchannel
+        ,objtyp,objinr,objnam,objref,txt,dattim,usr,ssninr,frm,ehtyp,pan,sta,delflg,hldflg,infdsp,inftxt,ownusg,ownusr,channel,smhinr,mapflg,cretrn,ordinr,tardattim,creobjtyp,creobjinr,relcur,relamt,etgextkey,etyextkey,ptainr,payflg,wrkgrp,wrkusr,bchkeyinr,branchinr,vipflg,credat,msgtyp,flg202,ownref,imginr,lstusr,lstgrp,paytyp,eciflg,dfref,ctmnam,chnref,cortyp,frontchannel,act59
     </sql>
 
     <select id="selectByPrimaryKey" resultMap="BaseResultMap">
@@ -130,6 +131,7 @@
             #{chnref,jdbcType=VARCHAR},
             #{cortyp,jdbcType=VARCHAR},
             #{frontchannel,jdbcType=VARCHAR},
+            #{act59,jdbcType=VARCHAR},
         </trim>
     </insert>
 
@@ -188,6 +190,7 @@
             <if test="chnref != null">chnref,</if>
             <if test="cortyp != null">cortyp,</if>
             <if test="frontchannel != null">frontchannel,</if>
+            <if test="act59 != null">act59,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="inr != null">#{inr,jdbcType=VARCHAR},</if>
@@ -242,6 +245,7 @@
             <if test="chnref != null">#{chnref,jdbcType=VARCHAR},</if>
             <if test="cortyp != null">#{cortyp,jdbcType=VARCHAR},</if>
             <if test="frontchannel != null">#{frontchannel,jdbcType=VARCHAR},</if>
+            <if test="act59 != null">#{act59,jdbcType=VARCHAR},</if>
         </trim>
     </insert>
 
@@ -299,6 +303,7 @@
             <if test="chnref != null">chnref = #{chnref,jdbcType=VARCHAR},</if>
             <if test="cortyp != null">cortyp = #{cortyp,jdbcType=VARCHAR},</if>
             <if test="frontchannel != null">frontchannel = #{frontchannel,jdbcType=VARCHAR},</if>
+            <if test="act59 != null">act59 = #{act59,jdbcType=VARCHAR},</if>
         </set>
         where inr = #{inr,jdbcType=VARCHAR}
     </update>
@@ -357,6 +362,7 @@
             chnref = #{chnref,jdbcType=VARCHAR},
             cortyp = #{cortyp,jdbcType=VARCHAR},
             frontchannel = #{frontchannel,jdbcType=VARCHAR},
+            act59 = #{act59,jdbcType=VARCHAR},
         </set>
         where inr = #{inr,jdbcType=VARCHAR}
     </update>
@@ -422,6 +428,7 @@
             <if test="module.chnref != null">chnref = #{module.chnref,jdbcType=VARCHAR},</if>
             <if test="module.cortyp != null">cortyp = #{module.cortyp,jdbcType=VARCHAR},</if>
             <if test="module.frontchannel != null">frontchannel = #{module.frontchannel,jdbcType=VARCHAR},</if>
+            <if test="module.act59 != null">act59 = #{module.act59,jdbcType=VARCHAR},</if>
         </set>
         ${conditions}
     </update>
@@ -602,6 +609,7 @@
         <if test="chnref != null">and chnref = #{chnref,jdbcType=VARCHAR}</if>
         <if test="cortyp != null">and cortyp = #{cortyp,jdbcType=VARCHAR}</if>
         <if test="frontchannel != null">and frontchannel = #{frontchannel,jdbcType=VARCHAR}</if>
+        <if test="act59 != null">and act59 = #{act59,jdbcType=VARCHAR}</if>
     </select>
     <select id="selectByCreobjtypAndCreobjinrAndHldflg" resultMap="BaseResultMap">
         select

isc-common-service/src/main/java/com/brilliance/isc/common/nosmod/NosmodService.java

 package com.brilliance.isc.common.nosmod;
 
-import com.brilliance.isc.common.nosmod.vo.Nosmod;
+import com.brilliance.isc.common.nosmod.bo.Nosmod;
 import com.brilliance.isc.common.setmod.vo.SetmodVo;
 import com.brilliance.isc.common.trnmod.vo.TrnmodVo;
 

isc-common-service/src/main/java/com/brilliance/isc/common/nosmod/impl/NosmodServiceImpl.java

@@ -4,7 +4,7 @@ import com.brilliance.isc.bo.Act;
 import com.brilliance.isc.common.cbsmod.service.CbsmodService;
 import com.brilliance.isc.common.context.SettleContext;
 import com.brilliance.isc.common.nosmod.NosmodService;
-import com.brilliance.isc.common.nosmod.vo.Nosmod;
+import com.brilliance.isc.common.nosmod.bo.Nosmod;
 import com.brilliance.isc.common.setgll.vo.SetgllVo;
 import com.brilliance.isc.common.setmod.vo.SetmodVo;
 import com.brilliance.isc.common.trnmod.vo.TrnmodVo;