1、补充清算CBB处理，loadSettleSessionInfo 2、补充兜底wrkbch 参考HLJ 的matbut.getWrkBranch代码，

3、复核 将cbb的cbc字段去除空格读取CBSCONF.INI配置，保存时createCbbEntries函数使用 cbb.setCbc( Strings.mid(blk,2,6));可能存在空格4、setmodservice补充setDefDsp函数

isc-common-core/src/main/resources/ini/cbsconf.ini

@@ -34,6 +34,7 @@ COD31=NID
 COD31=NCD
 COD33=FXD
 COD34=FTD
+COD35=CRD
 
 [CBCCOD]
 COD1=ACRACR
@@ -1324,4 +1325,14 @@ OPN=-
 UTLSUM=+
 [FTD-UTLAMT-COL]
 COD1=OPN
-COD2=UTLSUM
\ No newline at end of file
+COD2=UTLSUM
+;清算模块
+[CRD-MAXAMT]
+OPR1=+MAXSUM
+OPR2=+OPN
+[CRD-MAXAMT-OPR]
+MAXSUM=+
+OPN=+
+[CRD-MAXAMT-COL]
+COD1=MAXSUM
+COD2=OPN

isc-common-service/src/main/java/com/brilliance/isc/common/cbsmod/service/impl/CbsmodServiceImpl.java

@@ -15,6 +15,7 @@ import com.brilliance.isc.mda.dao.CbeMapper;
 import com.brilliance.mda.runtime.mda.impl.Argument;
 import com.brilliance.mda.runtime.mda.util.*;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -386,8 +387,8 @@ public class CbsmodServiceImpl implements CbsmodService {
         }
         String cbsConfKey = cbeArg.getObjtyp() + "-" + cbeArg.getCbt() + "-OPR";
         cbbList.forEach(cbb -> {
-            String opr = Inis.getIniStr("CBSCONF.INI",cbsConfKey,cbb.getCbc());
-            logger.info("commitCbbEntries读取CBSCONF.INI，key:{},value:{}",cbsConfKey+"#"+"OPR",cbb.getCbc());
+            String opr = Inis.getIniStr("CBSCONF.INI",cbsConfKey, StringUtils.trimToEmpty(cbb.getCbc()));
+            logger.info("commitCbbEntries读取CBSCONF.INI，key:{},value:{}",cbsConfKey+"#"+"OPR",StringUtils.trimToEmpty(cbb.getCbc()));
             updateCbbAmounts( cbeArg, cbb, opr, "C" );
             cbbMapper.updateByPrimaryKey(cbb);
             List<Cbb> afterCbbList = cbsRange.sdbRngSelectAfterEntry(cbb);

isc-common-service/src/main/java/com/brilliance/isc/common/context/SettleContext.java

@@ -331,6 +331,14 @@ public class SettleContext {
                 }
             }
         }
+        //HLJ matbut.getWrkBranch
+        //进交易时业务所属行默认为业务经办行
+        if (Objects.nonNull(settleSession.getBch()) &&
+                (Objects.isNull(settleSession.getWrkbch()) || StringUtils.isEmpty(settleSession.getWrkbch().getInr()))
+        ) {
+            Bch wrkbch = MdaUtils.deepClone(settleSession.getBch());
+            settleSession.setWrkbch(wrkbch);
+        }
         //20240131 满足海口自贸区上收到总行的业务
         setAccBch4Zmq(settleSession, bizInfoVo, ptsList);
 

isc-common-service/src/main/java/com/brilliance/isc/common/setmod/service/SetmodService.java

@@ -40,7 +40,7 @@ public interface SetmodService {
 
     String getGllRol(String argrol);
 
-    void setglgAllValDat ( SetmodVo setmodVo, Date argValdat , String argFlag   );
+    void setglgAllValDat(SetmodVo setmodVo, Date argValdat, String argFlag);
 
     //获取币种的节假日，目前前端组件已实现,后端使用isHoliday方法
     @Deprecated
@@ -145,4 +145,7 @@ public interface SetmodService {
     void updateSetfelObjmod(List<SetfelVo> setfels, String feecod, SimpleModuleVo linkModule);
 
     BigDecimal getSettlementAmount(SetmodVo setmodVo, String argCur);
+
+    void setDefDsp(SetmodVo setmodVo, String rol, String dcflag, String dspLst);
+
 }

isc-common-service/src/main/java/com/brilliance/isc/common/setmod/vo/SetmodVo.java

@@ -100,14 +100,14 @@ public class SetmodVo extends AbstractCommonVo {
     private String ref = NULLSTR;
 
     //开立日期
-    @JsonFormat(pattern="yyyy-MM-dd",timezone="GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date opndat;
 
     //到期日期
-    @JsonFormat(pattern="yyyy-MM-dd",timezone="GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date expdat;
 
-    @JsonFormat(pattern="yyyy-MM-dd",timezone="GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date matdat;
 
     //Charges to by contract
@@ -141,9 +141,9 @@ public class SetmodVo extends AbstractCommonVo {
     // 结算信息，需要赋值
     private Map<String, Wrksum> wrksumMap;
     //Current total in detailled settlement
-    private  BigDecimal prtdetamt = Decimals.ZERO_SCALE2;
+    private BigDecimal prtdetamt = Decimals.ZERO_SCALE2;
     //Count of positions in PrintDetailledSettlement
-    private  int prtdetcnt;
+    private int prtdetcnt;
 
     private List<Fale01Vo> fale01List;
 
@@ -189,6 +189,9 @@ public class SetmodVo extends AbstractCommonVo {
         return Decimals.add(Decimals.sub(docamt, redamt), othdocamt);
     }
 
+    //trnmod.trnism.parstm HLJ 在defSetDsp使用
+    private String trnismParstm = NULLSTR;
+
     @Override
     public void reset() {
         if (rec == null) {