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

isc-funds-business/src/main/java/com/brilliance/isc/funds/fxtfcm/register/doc/FxtfcmDocumentRegister.java

@@ -2,6 +2,7 @@ package com.brilliance.isc.funds.fxtfcm.register.doc;
 
 import com.brilliance.isc.common.component.PtsptaToolComponent;
 import com.brilliance.isc.common.register.document.IDocumentRegister;
+import com.brilliance.isc.common.register.document.common.SetmodDocumentRegister;
 import com.brilliance.isc.common.trndoc.service.TrndocService;
 import com.brilliance.isc.common.trndoc.vo.TrndocVo;
 import com.brilliance.isc.common.vo.PtsptaVo;
@@ -26,10 +27,15 @@ public class FxtfcmDocumentRegister implements IDocumentRegister {
     TrndocService trndocService;
     @Resource
     PtsptaToolComponent ptsptaToolComponent;
+    @Autowired
+    private SetmodDocumentRegister setmodDocumentRegister;
 
     @Override
     public void registerDocument(TrndocVo trndoc) {
+
         doRegister(trndoc);
+        setmodDocumentRegister.registerDocument(trndoc);
+        //entmodDocumentRegister.registerDocument(trndoc);
     }
 
     public void doRegister(TrndocVo trndoc){

isc-funds-business/src/main/java/com/brilliance/isc/funds/fxtfcm/register/settle/FxtfcmSettleRegister.java

@@ -70,6 +70,10 @@ public class FxtfcmSettleRegister implements ISettleRegister {
             nom1Cur= setmodVo.getCbsMap().get("NOM1").getCur();
         }
 
+        setmodVo.setDoccur(maxCur);
+        setmodVo.setDocamt(maxAmt);
+        setmodVo.setOpnamt(maxAmt);
+
         SetglgVo setglg = setmodVo.getSetglg();
 
         setglgService.setglgClrAmount ( setmodVo.getSetglg(),"TRN" );
@@ -90,7 +94,7 @@ public class FxtfcmSettleRegister implements ISettleRegister {
             //#卖出确认
             //D:281105(A外币)
             act1 = glemodService.getAvailAcc ( "FX-SPR", nom1Cur, "", setmodVo.getSetamt() );
-            dbtKey = setglgService.setglgAddAmount ( setmodVo.getSetglg(),"SET", "APL", nom1Cur, setmodVo.getSetamt(), "SET", "FTD", "F", act1, "SET" );
+            dbtKey = setglgService.setglgAddAmount ( setmodVo.getSetglg(),"SET", "APL", maxCur, setmodVo.getSetamt(), "SET", "FTD", "F", act1, "SET" );
             /**
              $Act1 = SETMOD\\GLEMOD.GetAvailAcc ( "FX-ELQ", FXDGRP\\CBS\\MAX\\CUR, "", self, SETMOD\\SETAMT )
              $DbtKey = \\SETMOD\\SETGLG.SetglgAddAmount ( "SET", "OWN", SETMOD\\DOCCUR, SETMOD\\SETAMT, "SET", "FXD", "F", $Act1, "SET" )
@@ -100,7 +104,7 @@ public class FxtfcmSettleRegister implements ISettleRegister {
 
             if( ptsptaToolComponent.ptsIsRolSet(fxdgrp.getAct()) )
             {
-                if( 1==1 )
+                if( ptsptaToolComponent.ptsIsRolSet(fxdgrp.getAct()) )
                 {
                     acctyp = "DB-CLR";
                     acc = glemodService.getAvailAcc ( acctyp,maxCur, fxdgrp.getAct().getPts().getPtyinr(),  setmodVo.getSetamt() );
@@ -115,7 +119,7 @@ public class FxtfcmSettleRegister implements ISettleRegister {
             }
             else
             {
-                if( 1==1 )
+                if( ptsptaToolComponent.ptsIsRolSet(fxdgrp.getApl()) )
                 {
                     acctyp = "DB-CLR";
                     acc = glemodService.getAvailAcc ( acctyp, maxCur, fxdgrp.getApl().getPts().getPtyinr(),  setmodVo.getSetamt() );