Skip to content

H
hangzhoutd2bdsproject
Commit 1beba488 by wangguangchao
Options

E-L报错代码修改

parent 9d6fbcf7
Showing with 183 additions and 174 deletions
module/actmod.mt
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<eibs:Module xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:eibs="http://eibs.brilliance.com" comments="" name="actmod" table="actmod" title="Module to hold Routines for Account" i18nSequence="6" ruleSequence="27" transient="true"> <eibs:Module xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:eibs="http://eibs.brilliance.com"
<localMethods type="local" name="getActtyplst" codeText="@0000" moduleName="actmod"/> name="actmod" table="actmod" title="Module to hold Routines for Account"
<localMethods type="local" name="getSqlFromActTypLst" codeText="@0001" moduleName="actmod"/> transient="true" i18nSequence="6" ruleSequence="27">
<localMethods type="local" name="reoActOfPty" codeText="@0002" moduleName="actmod"/> <modules name="pty" type="pty" static="true"/>
<localMethods type="local" name="ibaNCheckSumGen" codeText="@0003" moduleName="actmod"/> <modules name="pta" type="pta"/>
<localMethods type="local" name="internalModulo97" codeText="@0004" moduleName="actmod"/> <modules name="act" type="act"/>
<modules name="pty" type="pty" static="true" > <globalMethods name="isAccountTypNostro" codeText="@0005" moduleName="actmod"/>
</modules> <globalMethods name="getBranch" codeText="@0010" moduleName="actmod"/>
<modules name="pta" type="pta" > <globalMethods name="genCmpAccount" codeText="@0012" moduleName="actmod"/>
</modules> <globalMethods name="getTermTypField" codeText="@0013" moduleName="actmod"/>
<modules name="act" type="act" > <globalMethods name="getAccountBase" codeText="@0014" moduleName="actmod"/>
</modules> <globalMethods name="getAccountBranch" codeText="@0015" moduleName="actmod"/>
<globalMethods name="isAccountTypNostro" codeText="@0005" moduleName="actmod"/> <globalMethods name="checkAccount" codeText="@0016" moduleName="actmod"/>
<localMethods type="local" name="actSetFieldsForActDef" codeText="@0006" moduleName="actmod"/> <globalMethods name="setActTermCode" codeText="@0018" moduleName="actmod"/>
<localMethods type="local" name="actGetActHint" codeText="@0007" moduleName="actmod"/> <globalMethods name="actGetComCeb" codeText="@0019" moduleName="actmod"/>
<localMethods type="local" name="actGetNostroSql" codeText="@0008" moduleName="actmod"/> <globalMethods name="getComLiaActCeb" codeText="@0020" moduleName="actmod"/>
<localMethods type="local" name="actGetCurrentSql" codeText="@0009" moduleName="actmod"/> <globalMethods name="getdsp" codeText="@0021" moduleName="actmod"/>
<globalMethods name="getBranch" codeText="@0010" moduleName="actmod"/> <globalMethods name="checkAcc" codeText="@0024" moduleName="actmod"/>
<globalMethods name="getActTypField" codeText="@0011" moduleName="actmod"/> <globalMethods name="actGetNostroAccount" codeText="@0025" moduleName="actmod"/>
<globalMethods name="genCmpAccount" codeText="@0012" moduleName="actmod"/> <globalMethods name="actCal" codeText="@0026" moduleName="actmod"/>
<globalMethods name="getTermTypField" codeText="@0013" moduleName="actmod"/> <localMethods name="getActtyplst" type="local" codeText="@0000" moduleName="actmod"/>
<globalMethods name="getAccountBase" codeText="@0014" moduleName="actmod"/> <localMethods name="getSqlFromActTypLst" type="local" codeText="@0001" moduleName="actmod"/>
<globalMethods name="getAccountBranch" codeText="@0015" moduleName="actmod"/> <localMethods name="reoActOfPty" type="local" codeText="@0002" moduleName="actmod"/>
<globalMethods name="checkAccount" codeText="@0016" moduleName="actmod"/> <localMethods name="ibaNCheckSumGen" type="local" codeText="@0003" moduleName="actmod"/>
<localMethods type="local" name="chkActMac" codeText="@0017" moduleName="actmod"/> <localMethods name="internalModulo97" type="local" codeText="@0004" moduleName="actmod"/>
<globalMethods name="setActTermCode" codeText="@0018" moduleName="actmod"/> <localMethods name="actSetFieldsForActDef" type="local" codeText="@0006" moduleName="actmod"/>
<globalMethods name="actGetComCeb" codeText="@0019" moduleName="actmod"/> <localMethods name="actGetActHint" type="local" codeText="@0007" moduleName="actmod"/>
<globalMethods name="getComLiaActCeb" codeText="@0020" moduleName="actmod"/> <localMethods name="actGetNostroSql" type="local" codeText="@0008" moduleName="actmod"/>
<globalMethods name="getdsp" codeText="@0021" moduleName="actmod"/> <localMethods name="actGetCurrentSql" type="local" codeText="@0009" moduleName="actmod"/>
<localMethods type="local" name="getActMac" codeText="@0022" moduleName="actmod"/> <localMethods name="chkActMac" type="local" codeText="@0017" moduleName="actmod"/>
<localMethods type="local" name="test" codeText="@0023" moduleName="actmod"/> <localMethods name="getActMac" type="local" codeText="@0022" moduleName="actmod"/>
<globalMethods name="checkAcc" codeText="@0024" moduleName="actmod"/> <localMethods name="test" type="local" codeText="@0023" moduleName="actmod"/>
<globalMethods name="actGetNostroAccount" codeText="@0025" moduleName="actmod"/>
<globalMethods name="actCal" codeText="@0026" moduleName="actmod"/>
</eibs:Module> </eibs:Module>
script/actmod.0011.script deleted 100644 → 0
static void getActTypField(String tbltyp,Argument<String> nottyp,Argument<String> reptyp,Argument<String> term_id,Argument<String> term_nam,Argument<String> seqno,Argument<String> prttyp,Argument<String> nam)
{
//-------------------------------------------
// 获取账户信息的函数
// TBLTYP CodeTable ACTMIX 的TBL
// NOTTYP 返回新旧帐号类型 N 新帐号 O旧帐号 M 新旧帐号并存
// RepTyp 账号中机构位的生成规则 R 用当前机构替换 G 使用EXTACT中的机构 C 客户类账号
// term_id 科目代码 账号中的科目号位 5位 新帐号需要去掉前1位 08开头的仅仅取头3位
// term_nam 科目号 账号对应的科目号，打印传票时使用
// SEQNo 顺序号
// PRTTYP 传票打印类型
// NAM 该科目的名称
//-------------------------------------------
nottyp.value = "";
reptyp.value = "";
term_id.value = "";
seqno.value = "";
prttyp.value = "";
nam.value = "";
String txt = Platform.getCodetableLabelOfTd( tbltyp, "ACTMIX", Platform.getLang() );
if( ! Platform.isEmpty( txt ) )
{
nottyp.value = Platform.mid( txt, 1, 1 );
reptyp.value = Platform.mid( txt, 2, 1 );
term_id.value = Platform.mid( txt, 4, 5 );
term_nam.value = Platform.mid( txt, 10, 6 );
seqno.value = Platform.mid( txt, 17, 1 );
prttyp.value = Platform.mid( txt, 19, 2 );
nam.value = Platform.mid( txt, 22, -1 );
}
}
\ No newline at end of file
script/dtfmap.0000.script
boolean getConfig() boolean getConfig1()
{ {
//!读取ERSMAP.INI文件 //!读取ERSMAP.INI文件
//!=================================== //!===================================
......
script/dtfmod.0000.script
void mtaBUTInitProcessDDDDD() void mtaBUTInitProcessDDDDD()
{ {
Platform.streamClear( $dtfmap\resstm.getValue() ); Platform.streamClear( $dtfmap\resstm.getValue() );
boolean tag = $dtfmap.getConfig(); boolean tag = $dtfmap.getConfig()1;
String fileNam = NULLSTR; String fileNam = NULLSTR;
int err = 0; int err = 0;
if( ! Platform.isEmpty( $\sysmod\spt\inr ) ) if( ! Platform.isEmpty( $\sysmod\spt\inr ) )
......
script/edimap.0000.script
boolean getConfig() boolean getConfig1()
{ {
//!读取ERSMAP.INI文件 //!读取ERSMAP.INI文件
//!=================================== //!===================================
......
script/edimap.0009.script
...@@ -8,7 +8,7 @@ String xmlElement(String tag,String content,int fldtyp) ...@@ -8,7 +8,7 @@ String xmlElement(String tag,String content,int fldtyp)
//! Fldtyp FieldType //! Fldtyp FieldType
//!========================================== //!==========================================
String objtag = Platform.toXMLFieldName( tag ); String objtag = Platform.toXMLFieldName( tag );
if( Platform.lengths_EDI( content ) > 0 && ( ! Platform.emptyNumericField( tag, content, fldtyp ) ) ) if( Platform.lengths_EDI( content ) > 0 && ( ! Platform.emptyNumericField( tag, content, new BigDecimal(fldtyp) ) ) )
{ {
return "<" + objtag + ">" + Platform.converttoXMLString( content ) + "</" + objtag + ">"; return "<" + objtag + ">" + Platform.converttoXMLString( content ) + "</" + objtag + ">";
} }
......
script/edimod.0026.script
void mtaBUTInitProcessFFFFF() void mtaBUTInitProcessFFFFF()
{ {
Platform.streamClear( $edimap\resstm.getValue() ); Platform.streamClear( $edimap\resstm.getValue() );
boolean tag = $edimap.getConfig(); boolean tag = $edimap.getConfig1();
String filenam = NULLSTR; String filenam = NULLSTR;
int err = 0; int err = 0;
if( ! Platform.isEmpty( $\sysmod\spt\inr ) ) if( ! Platform.isEmpty( $\sysmod\spt\inr ) )
......
script/fecism.0007.script
...@@ -3,19 +3,23 @@ BigDecimal clcFecIrtcal(#setfel line,String relcur,BigDecimal relamt,String feec ...@@ -3,19 +3,23 @@ BigDecimal clcFecIrtcal(#setfel line,String relcur,BigDecimal relamt,String feec
Platform.clear( $$line\infdetstm ); Platform.clear( $$line\infdetstm );
BigDecimal fecamt = new BigDecimal("0"); BigDecimal fecamt = new BigDecimal("0");
// Check valitdity of period if both dates are set (in not calclulation from default dates has to be executed) // Check valitdity of period if both dates are set (in not calclulation from default dates has to be executed)
setfecamtLabel:
while(true){
if( ! Platform.isEmpty( $$line\dat1 ) && ! Platform.isEmpty( $$line\dat2 ) ) if( ! Platform.isEmpty( $$line\dat1 ) && ! Platform.isEmpty( $$line\dat2 ) )
{ {
if( Platform.diff($$line\dat1.getValue() , $$line\dat2.getValue())>=0 ) if( Platform.diff($$line\dat1.getValue() , $$line\dat2.getValue())>=0 )
{ {
$$line\inftxt = $$line\inftxt.getValue() + "\r\n" + Platform.getText( #CT000172 ); $$line\inftxt = $$line\inftxt.getValue() + "\r\n" + Platform.getText( #CT000172 );
return ; // #######TODO 改写 LABEL与GOTO #### goto setfecamt //return ; // #### goto setfecamt
break setfecamtLabel;
} }
} }
// if fee has been entered manually, the fee amount has to be entered manually // if fee has been entered manually, the fee amount has to be entered manually
if( Platform.compareTo($$line\src, "U" )== 0 ) if( Platform.compareTo($$line\src, "U" )== 0 )
{ {
$$line\inftxt = $$line\inftxt.getValue() + "\r\n" + Platform.getText( #CT000112 ); $$line\inftxt = $$line\inftxt.getValue() + "\r\n" + Platform.getText( #CT000112 );
return ; // #######TODO 改写 LABEL与GOTO #### goto setfecamt //return ; // #### goto setfecamt
break setfecamtLabel;
} }
// check fees already settled // check fees already settled
BigDecimal amt = new BigDecimal("0.000"); BigDecimal amt = new BigDecimal("0.000");
...@@ -100,11 +104,14 @@ BigDecimal clcFecIrtcal(#setfel line,String relcur,BigDecimal relamt,String feec ...@@ -100,11 +104,14 @@ BigDecimal clcFecIrtcal(#setfel line,String relcur,BigDecimal relamt,String feec
oldinftxt = $$line\inftxt; oldinftxt = $$line\inftxt;
Platform.clear( $$line\allcalflg ); Platform.clear( $$line\allcalflg );
Platform.streamSet( oldinfdetstm, $$line\infdetstm.getValue() ); Platform.streamSet( oldinfdetstm, $$line\infdetstm.getValue() );
// #######TODO 改写 LABEL与GOTO #### label restart // #### label restart
restartLabel:
while(true){
count = count + 1; count = count + 1;
if( count > 19 ) if( count > 19 )
{ {
return ; // #######TODO 改写 LABEL与GOTO #### goto setfecamt //return ; // #### goto setfecamt
break setfecamtLabel;
} }
$$line\inftxt = oldinftxt; $$line\inftxt = oldinftxt;
Platform.streamSet( $$line\infdetstm.getValue(), oldinfdetstm ); Platform.streamSet( $$line\infdetstm.getValue(), oldinfdetstm );
...@@ -145,7 +152,8 @@ BigDecimal clcFecIrtcal(#setfel line,String relcur,BigDecimal relamt,String feec ...@@ -145,7 +152,8 @@ BigDecimal clcFecIrtcal(#setfel line,String relcur,BigDecimal relamt,String feec
$$line\dat2 = null; $$line\dat2 = null;
$$line\nxtcomdat = enddat; $$line\nxtcomdat = enddat;
$$line\inftxt = $$line\inftxt.getValue() + "\r\n" + Platform.getText( #CT000102, $$line\nxtcomdat.getValue() ); $$line\inftxt = $$line\inftxt.getValue() + "\r\n" + Platform.getText( #CT000102, $$line\nxtcomdat.getValue() );
return ; // #######TODO 改写 LABEL与GOTO #### goto setfecamt //return ; // #### goto setfecamt
break setfecamtLabel;
} }
else else
{ {
...@@ -234,7 +242,7 @@ BigDecimal clcFecIrtcal(#setfel line,String relcur,BigDecimal relamt,String feec ...@@ -234,7 +242,7 @@ BigDecimal clcFecIrtcal(#setfel line,String relcur,BigDecimal relamt,String feec
case "D65": case "D65":
case "F60": case "F60":
case "F65": case "F65":
$$line\unt = Platform.numAdd($$line\unt.getValue() , $irtcal\irdele[i]\uni.getValue()); $$line\unt = Platform.numAdd($$line\unt.getValue() , $irtcal\irdele[i]\uni.getValue()).intValue();
break; break;
} }
// if reference rate has been used, note it in DETSTM // if reference rate has been used, note it in DETSTM
...@@ -312,7 +320,8 @@ BigDecimal clcFecIrtcal(#setfel line,String relcur,BigDecimal relamt,String feec ...@@ -312,7 +320,8 @@ BigDecimal clcFecIrtcal(#setfel line,String relcur,BigDecimal relamt,String feec
// goback one day as we use closed intervals // goback one day as we use closed intervals
$$line\dat2 = Platform.add( $$line\dat2.getValue(), -1 ); $$line\dat2 = Platform.add( $$line\dat2.getValue(), -1 );
enddat = $$line\dat2; enddat = $$line\dat2;
return ; // #######TODO 改写 LABEL与GOTO #### goto restart //return ; // #### goto restart
break restartLabel;
} }
// confirm usage of total minimum // confirm usage of total minimum
Platform.streamInsert( $$line\infdetstm.getValue(), 0, "MINCON" + "\t" + Platform.format( $$line\dat1.getValue(), "DD/MM/YYYY" ) + "\t" + Platform.format( $$line\dat2.getValue(), "DD/MM/YYYY" ) + "\t" + relcur + "\t" + Platform.toString( mintot ) ); Platform.streamInsert( $$line\infdetstm.getValue(), 0, "MINCON" + "\t" + Platform.format( $$line\dat1.getValue(), "DD/MM/YYYY" ) + "\t" + Platform.format( $$line\dat2.getValue(), "DD/MM/YYYY" ) + "\t" + relcur + "\t" + Platform.toString( mintot ) );
...@@ -321,6 +330,8 @@ BigDecimal clcFecIrtcal(#setfel line,String relcur,BigDecimal relamt,String feec ...@@ -321,6 +330,8 @@ BigDecimal clcFecIrtcal(#setfel line,String relcur,BigDecimal relamt,String feec
$$line\allcalflg = "T"; $$line\allcalflg = "T";
} }
} }
break restartLabel;
}
} }
else else
{ {
...@@ -331,7 +342,9 @@ BigDecimal clcFecIrtcal(#setfel line,String relcur,BigDecimal relamt,String feec ...@@ -331,7 +342,9 @@ BigDecimal clcFecIrtcal(#setfel line,String relcur,BigDecimal relamt,String feec
{ {
$$line\inftxt = $$line\inftxt.getValue() + "\r\n" + Platform.getText( #CT000104, addqtr ); $$line\inftxt = $$line\inftxt.getValue() + "\r\n" + Platform.getText( #CT000104, addqtr );
} }
// #######TODO 改写 LABEL与GOTO #### label setfecamt break setfecamtLabel;
}
// #### label setfecamt
Platform.saveData( $irtcal, $$line\detstm.getValue(), "IRTCALDET" ); Platform.saveData( $irtcal, $$line\detstm.getValue(), "IRTCALDET" );
Platform.streamInsert( $$line\infdetstm.getValue(), 1, "IRTMIC" + "\t" + $irtcal\irt\irtmic.getValue() ); Platform.streamInsert( $$line\infdetstm.getValue(), 1, "IRTMIC" + "\t" + $irtcal\irt\irtmic.getValue() );
Platform.streamInsert( $$line\infdetstm.getValue(), 1, "DETINF" + "\t" + $$line\wrkfec\calrul.getValue() + "\t" + Platform.toString( $$line\wrkfec\ratcal.getValue() ) + "\t" + Platform.toString( $$line\wrkfec\untamt.getValue() ) + "\t" + $$line\wrkfec\pertyp.getValue() + "\t" + $$line\allcalflg.getValue() + "\t" + Platform.toString( $$line\basamt.getValue() ) + "\t" ); Platform.streamInsert( $$line\infdetstm.getValue(), 1, "DETINF" + "\t" + $$line\wrkfec\calrul.getValue() + "\t" + Platform.toString( $$line\wrkfec\ratcal.getValue() ) + "\t" + Platform.toString( $$line\wrkfec\untamt.getValue() ) + "\t" + $$line\wrkfec\pertyp.getValue() + "\t" + $$line\allcalflg.getValue() + "\t" + Platform.toString( $$line\basamt.getValue() ) + "\t" );
......
script/fecism.0008.script
...@@ -5,13 +5,30 @@ void clcFecAmt(#setfel line,Argument<String> relcur,BigDecimal relamt,String fee ...@@ -5,13 +5,30 @@ void clcFecAmt(#setfel line,Argument<String> relcur,BigDecimal relamt,String fee
BigDecimal oldamt = new BigDecimal("0"); BigDecimal oldamt = new BigDecimal("0");
Platform.clear( $$line\minmaxflg ); Platform.clear( $$line\minmaxflg );
BigDecimal fecamt = null; BigDecimal fecamt = null;
BigDecimal lowamt = null;
BigDecimal minamt = null;
int basis = 0;
BigDecimal lftunt = null;
int oldper = 0;
BigDecimal tirunt = null;
String myDifFlg = $$line\wrkfec\clcdifflg;
String relObjtyp = "";
String relObjinr = "";
String relconInf = "";
int lin = 0;
boolean SetWrnFlag = false;
ClcMinMaxLabel:
while(true){
if( Platform.compareTo( $$line\wrkfec\calrul , "F" ) == 0 ) if( Platform.compareTo( $$line\wrkfec\calrul , "F" ) == 0 )
{ {
fecamt = new BigDecimal("0"); fecamt = new BigDecimal("0");
return ; // #######TODO 改写 LABEL与GOTO #### goto ClcMinMax //return ; // #### goto ClcMinMax
break ClcMinMaxLabel;
} }
// get old amount for diffrence calculation. Possible for liability comissions only // get old amount for diffrence calculation. Possible for liability comissions only
String myDifFlg = $$line\wrkfec\clcdifflg;
String liaallgPath = Platform.getPathofName( $$line\objmod.getValue() ); String liaallgPath = Platform.getPathofName( $$line\objmod.getValue() );
Date olddat = Platform.getContentDate( liaallgPath + "\\SETDATOLD" ); Date olddat = Platform.getContentDate( liaallgPath + "\\SETDATOLD" );
if( Platform.errorCode() > 0 ) if( Platform.errorCode() > 0 )
...@@ -35,9 +52,7 @@ void clcFecAmt(#setfel line,Argument<String> relcur,BigDecimal relamt,String fee ...@@ -35,9 +52,7 @@ void clcFecAmt(#setfel line,Argument<String> relcur,BigDecimal relamt,String fee
if(1==1) return; if(1==1) return;
} }
// clear register for relevant contract // clear register for relevant contract
String relObjtyp = "";
String relObjinr = "";
String relconInf = "";
// if from pool recalulate and recreate detailled information // if from pool recalulate and recreate detailled information
if( Platform.compareTo($$line\src, "P" )== 0 && ! Platform.isModified( $$line\feetxtinf ) ) if( Platform.compareTo($$line\src, "P" )== 0 && ! Platform.isModified( $$line\feetxtinf ) )
{ {
...@@ -149,15 +164,18 @@ void clcFecAmt(#setfel line,Argument<String> relcur,BigDecimal relamt,String fee ...@@ -149,15 +164,18 @@ void clcFecAmt(#setfel line,Argument<String> relcur,BigDecimal relamt,String fee
{ {
case 0: case 0:
wrn = Platform.getText( #CT000170, $$line\feecod.getValue() ); wrn = Platform.getText( #CT000170, $$line\feecod.getValue() );
return ; // #######TODO 改写 LABEL与GOTO #### goto SetWrn //return ; // #### goto SetWrn
break; SetWrnFlag = true;
break ClcMinMaxLabel;
case 1: case 1:
relObjtyp = "PTE"; relObjtyp = "PTE";
relObjinr = Platform.getLine( pteStm, 1 ); relObjinr = Platform.getLine( pteStm, 1 );
break; break;
default: default:
wrn = Platform.getText( #CT000171, $$line\feecod.getValue() ); wrn = Platform.getText( #CT000171, $$line\feecod.getValue() );
return ; // #######TODO 改写 LABEL与GOTO #### goto SetWrn //return ; // #### goto SetWrn
SetWrnFlag = true;
break ClcMinMaxLabel;
} }
} }
if( Platform.compareTo( relObjtyp , "PTE" ) == 0 && ! Platform.isEmpty( relObjinr ) ) if( Platform.compareTo( relObjtyp , "PTE" ) == 0 && ! Platform.isEmpty( relObjinr ) )
...@@ -246,7 +264,7 @@ void clcFecAmt(#setfel line,Argument<String> relcur,BigDecimal relamt,String fee ...@@ -246,7 +264,7 @@ void clcFecAmt(#setfel line,Argument<String> relcur,BigDecimal relamt,String fee
} }
} }
oldamt = new BigDecimal("0"); oldamt = new BigDecimal("0");
int lin = 0;
String stmlin = NULLSTR; String stmlin = NULLSTR;
String pteinr = NULLSTR; String pteinr = NULLSTR;
BigDecimal oldRelamt = null; BigDecimal oldRelamt = null;
...@@ -390,12 +408,7 @@ void clcFecAmt(#setfel line,Argument<String> relcur,BigDecimal relamt,String fee ...@@ -390,12 +408,7 @@ void clcFecAmt(#setfel line,Argument<String> relcur,BigDecimal relamt,String fee
$$line\inftxt = $$line\inftxt.getValue() + "\r\n" + Platform.getText( #CT000098, feecur, Platform.fmtAmount( clcamt, feecur ), ratuse, $$line\unt.getValue(), Platform.fmtAmount( fecamt, feecur ) ); $$line\inftxt = $$line\inftxt.getValue() + "\r\n" + Platform.getText( #CT000098, feecur, Platform.fmtAmount( clcamt, feecur ), ratuse, $$line\unt.getValue(), Platform.fmtAmount( fecamt, feecur ) );
} }
// Permille fees // Permille fees
BigDecimal lowamt = null;
BigDecimal minamt = null;
int basis = 0;
BigDecimal lftunt = null;
int oldper = 0;
BigDecimal tirunt = null;
if( Platform.compareTo( $$line\wrkfec\calrul , "1" ) == 0 || Platform.compareTo( $$line\wrkfec\calrul , "4" ) == 0 || Platform.compareTo( $$line\wrkfec\calrul , "%" ) == 0 ) if( Platform.compareTo( $$line\wrkfec\calrul , "1" ) == 0 || Platform.compareTo( $$line\wrkfec\calrul , "4" ) == 0 || Platform.compareTo( $$line\wrkfec\calrul , "%" ) == 0 )
{ {
$$line\inftxt = $$line\inftxt.getValue() + "\r\n" + Platform.getText( #CT000080, Platform.getCodetableLabelOfTd( $$line\wrkfec\calcbs.getValue(), "FECAMT", Platform.getLang() ), relcur.value, Platform.fmtAmount( clcamt, relcur.value ) ); $$line\inftxt = $$line\inftxt.getValue() + "\r\n" + Platform.getText( #CT000080, Platform.getCodetableLabelOfTd( $$line\wrkfec\calcbs.getValue(), "FECAMT", Platform.getLang() ), relcur.value, Platform.fmtAmount( clcamt, relcur.value ) );
...@@ -403,7 +416,7 @@ void clcFecAmt(#setfel line,Argument<String> relcur,BigDecimal relamt,String fee ...@@ -403,7 +416,7 @@ void clcFecAmt(#setfel line,Argument<String> relcur,BigDecimal relamt,String fee
{ {
if( ! Platform.isEmpty( $$line\wrkfec\pertyp ) ) if( ! Platform.isEmpty( $$line\wrkfec\pertyp ) )
{ {
if( !( Platform.compareTo( $$line\wrkfec\pertyp , "f") ) == 0 ) if( !( Platform.compareTo( $$line\wrkfec\pertyp , "f") == 0 ) )
{ {
pertyp = $$line\wrkfec\pertyp; pertyp = $$line\wrkfec\pertyp;
/** /**
...@@ -461,7 +474,7 @@ void clcFecAmt(#setfel line,Argument<String> relcur,BigDecimal relamt,String fee ...@@ -461,7 +474,7 @@ void clcFecAmt(#setfel line,Argument<String> relcur,BigDecimal relamt,String fee
{ {
basis = 100; basis = 100;
} }
lftunt = $$new BigDecimal(line\unt); lftunt = new BigDecimal($$line\unt);
if( ! Platform.isEmpty( $begcnfdat ) && Platform.diff($begcnfdat.getValue() , $$line\dat1.getValue())<0 ) if( ! Platform.isEmpty( $begcnfdat ) && Platform.diff($begcnfdat.getValue() , $$line\dat1.getValue())<0 )
{ {
oldper = Platform.getNrOfPeriodsPermille( $begcnfdat.getValue(), $$line\dat1.getValue(), pertyp ); oldper = Platform.getNrOfPeriodsPermille( $begcnfdat.getValue(), $$line\dat1.getValue(), pertyp );
...@@ -539,7 +552,7 @@ void clcFecAmt(#setfel line,Argument<String> relcur,BigDecimal relamt,String fee ...@@ -539,7 +552,7 @@ void clcFecAmt(#setfel line,Argument<String> relcur,BigDecimal relamt,String fee
$$line\unt = 0; $$line\unt = 0;
for(int i = 1;i <= Platform.gridCount( $irtcal\irdele );i++) for(int i = 1;i <= Platform.gridCount( $irtcal\irdele );i++)
{ {
$$line\unt = Platform.numAdd($$line\unt.getValue() , $irtcal\irdele[i]\uni.getValue()); $$line\unt = Platform.numAdd($$line\unt.getValue() , $irtcal\irdele[i]\uni.getValue()).intValue();
} }
} }
$$line\inftxt = $$line\inftxt.getValue() + "\r\n" + Platform.getText( #CT000090, ratuse, Platform.fmtAmount( clcamt, feccur ), $$line\unt.getValue() ); $$line\inftxt = $$line\inftxt.getValue() + "\r\n" + Platform.getText( #CT000090, ratuse, Platform.fmtAmount( clcamt, feccur ), $$line\unt.getValue() );
...@@ -618,7 +631,7 @@ void clcFecAmt(#setfel line,Argument<String> relcur,BigDecimal relamt,String fee ...@@ -618,7 +631,7 @@ void clcFecAmt(#setfel line,Argument<String> relcur,BigDecimal relamt,String fee
getFepCur = $\trnmod.getTextOfInrTable( "FEP", fepinr, "CUR" ); getFepCur = $\trnmod.getTextOfInrTable( "FEP", fepinr, "CUR" );
if( Platform.compareTo( feecur , getFepCur ) == 0 && ! Platform.isEmpty( getFepAmt ) ) if( Platform.compareTo( feecur , getFepCur ) == 0 && ! Platform.isEmpty( getFepAmt ) )
{ {
$$line\ogiamt = $\cbsmod\xrtmod.amtRndUnt( Platform.parseInt( getFepAmt ), feecur ); $$line\ogiamt = $\cbsmod\xrtmod.amtRndUnt( new BigDecimal(Platform.parseInt( getFepAmt )), feecur );
$$line\amt = $\cbsmod\xrtmod.amtRndUnt( Platform.numSub(Platform.parseInt( getFepAmt ) , $$line\dctamt.getValue()), feecur ); $$line\amt = $\cbsmod\xrtmod.amtRndUnt( Platform.numSub(Platform.parseInt( getFepAmt ) , $$line\dctamt.getValue()), feecur );
} }
} }
...@@ -628,7 +641,10 @@ void clcFecAmt(#setfel line,Argument<String> relcur,BigDecimal relamt,String fee ...@@ -628,7 +641,10 @@ void clcFecAmt(#setfel line,Argument<String> relcur,BigDecimal relamt,String fee
$$line\ogiamt = fecamt; $$line\ogiamt = fecamt;
$$line\amt = Platform.numSub(fecamt , $$line\dctamt.getValue()); $$line\amt = Platform.numSub(fecamt , $$line\dctamt.getValue());
} }
// #######TODO 改写 LABEL与GOTO #### label ClcMinMax break ClcMinMaxLabel;
}
// #### label ClcMinMax
if(!SetWrnFlag){
// Minimum/Maximum cut ( done here to allow supporter to adapt this (eg. appliing MIN/MAX per unit or differently depending on calculation rule) // Minimum/Maximum cut ( done here to allow supporter to adapt this (eg. appliing MIN/MAX per unit or differently depending on calculation rule)
int minmaxunits = 0; int minmaxunits = 0;
String mincur = NULLSTR; String mincur = NULLSTR;
...@@ -927,7 +943,8 @@ void clcFecAmt(#setfel line,Argument<String> relcur,BigDecimal relamt,String fee ...@@ -927,7 +943,8 @@ void clcFecAmt(#setfel line,Argument<String> relcur,BigDecimal relamt,String fee
} }
} }
} }
// #######TODO 改写 LABEL与GOTO #### label SetWrn }
// #### label SetWrn
$\trnmod\mtabut\syswrn.sysWarningSet( SYSWRNTypeWarning, wrn, "ClcFeacmt" + Platform.getModuleInfo( line, tdModuleInfoFullName ) ); $\trnmod\mtabut\syswrn.sysWarningSet( SYSWRNTypeWarning, wrn, "ClcFeacmt" + Platform.getModuleInfo( line, tdModuleInfoFullName ) );
// syndication comission is a payment to party // syndication comission is a payment to party
if( Platform.streamSearch( $$line\fepinrlst, "TRNSYN" ) > 0 ) if( Platform.streamSearch( $$line\fepinrlst, "TRNSYN" ) > 0 )
......
script/fecism.0012.script
...@@ -135,6 +135,8 @@ BigDecimal clcFec_P(#setfel line,String relcur,BigDecimal relamt,String feecur) ...@@ -135,6 +135,8 @@ BigDecimal clcFec_P(#setfel line,String relcur,BigDecimal relamt,String feecur)
} }
} }
// if more periods to be calculated, calculate and add the additional periods. // if more periods to be calculated, calculate and add the additional periods.
setitLabel:
while(true){
if( perprv <= peruse ) if( perprv <= peruse )
{ {
$$line\unt = 1; $$line\unt = 1;
...@@ -168,13 +170,15 @@ BigDecimal clcFec_P(#setfel line,String relcur,BigDecimal relamt,String feecur) ...@@ -168,13 +170,15 @@ BigDecimal clcFec_P(#setfel line,String relcur,BigDecimal relamt,String feecur)
{ {
fecamt = new BigDecimal("0"); fecamt = new BigDecimal("0");
$$line\inftxt = $$line\inftxt.getValue() + "\r\n" + Platform.getText( #CT000129 ); $$line\inftxt = $$line\inftxt.getValue() + "\r\n" + Platform.getText( #CT000129 );
return ; // #######TODO 改写 LABEL与GOTO #### goto setit //return ; // #### goto setit
break setitLabel;
} }
if( Platform.compareTo($$line\wrkfec\pertyp, "n" )== 0 ) if( Platform.compareTo($$line\wrkfec\pertyp, "n" )== 0 )
{ {
fecamt = new BigDecimal("0"); fecamt = new BigDecimal("0");
$$line\inftxt = $$line\inftxt.getValue() + "\r\n" + Platform.getText( #CT000131 ); $$line\inftxt = $$line\inftxt.getValue() + "\r\n" + Platform.getText( #CT000131 );
return ; // #######TODO 改写 LABEL与GOTO #### goto setit //return ; // #### goto setit
break setitLabel;
} }
if( Platform.diff(adddat , $$line\dat2.getValue())>=0 ) if( Platform.diff(adddat , $$line\dat2.getValue())>=0 )
{ {
...@@ -190,7 +194,8 @@ BigDecimal clcFec_P(#setfel line,String relcur,BigDecimal relamt,String feecur) ...@@ -190,7 +194,8 @@ BigDecimal clcFec_P(#setfel line,String relcur,BigDecimal relamt,String feecur)
{ {
$$line\inftxt = $$line\inftxt.getValue() + "\r\n" + Platform.getText( #CT000120, $$line\wrkfec\maxpercov.getValue() ); $$line\inftxt = $$line\inftxt.getValue() + "\r\n" + Platform.getText( #CT000120, $$line\wrkfec\maxpercov.getValue() );
fecamt = new BigDecimal("0"); fecamt = new BigDecimal("0");
return ; // #######TODO 改写 LABEL与GOTO #### goto setit //return ; // #### goto setit
break setitLabel;
} }
// calculate permille amount for that periods. // calculate permille amount for that periods.
clcamt = Platform.numDiv(Platform.numMul(Platform.numMul(relFeecurAmt , $$line\ratcal.getValue()) , $$line\unt.getValue()) , 1000); clcamt = Platform.numDiv(Platform.numMul(Platform.numMul(relFeecurAmt , $$line\ratcal.getValue()) , $$line\unt.getValue()) , 1000);
...@@ -294,7 +299,10 @@ BigDecimal clcFec_P(#setfel line,String relcur,BigDecimal relamt,String feecur) ...@@ -294,7 +299,10 @@ BigDecimal clcFec_P(#setfel line,String relcur,BigDecimal relamt,String feecur)
break; break;
} }
$$line\inftxt = $$line\inftxt.getValue() + "\r\n" + Platform.getText( #CT000124, feecur, Platform.fmtAmount( fecamt, feecur ) ); $$line\inftxt = $$line\inftxt.getValue() + "\r\n" + Platform.getText( #CT000124, feecur, Platform.fmtAmount( fecamt, feecur ) );
// #######TODO 改写 LABEL与GOTO #### label setit break setitLabel;
}
// #### label setit
} }
} }
return fecamt; return fecamt;
......
script/fecmod.0006.script
...@@ -9,7 +9,6 @@ boolean isUNTAMTValid(#fec argfec) ...@@ -9,7 +9,6 @@ boolean isUNTAMTValid(#fec argfec)
case "0": case "0":
return true; return true;
// else not // else not
break;
default: default:
return false; return false;
} }
......
script/glemod.0010.script
...@@ -138,7 +138,7 @@ void gleSavSetmod() ...@@ -138,7 +138,7 @@ void gleSavSetmod()
String pandscCor = NULLSTR; String pandscCor = NULLSTR;
String sftmt = NULLSTR; String sftmt = NULLSTR;
String rcvbic = NULLSTR; String rcvbic = NULLSTR;
boolean true = false; boolean trueFlag = false;
if( gridcnt > 0 ) if( gridcnt > 0 )
{ {
for(int i = 1;i <= gridcnt;i++) for(int i = 1;i <= gridcnt;i++)
...@@ -147,9 +147,9 @@ void gleSavSetmod() ...@@ -147,9 +147,9 @@ void gleSavSetmod()
{ {
Platform.clear( $gle ); Platform.clear( $gle );
$gle\cur = $setglg\setgll[i]\acccur; $gle\cur = $setglg\setgll[i]\acccur;
$gle\amt = new BigDecimal(Platform.abs( $setglg\setgll[i]\accamt.getValue() )); $gle\amt = Platform.abs( $setglg\setgll[i]\accamt.getValue() );
$gle\syscur = $setglg\setgll[i]\cur; $gle\syscur = $setglg\setgll[i]\cur;
$gle\sysamt = new BigDecimal(Platform.abs( $setglg\setgll[i]\amt.getValue() )); $gle\sysamt = Platform.abs( $setglg\setgll[i]\amt.getValue() );
$gle\dbtcdt = $setglg\setgll[i]\debcdtflg; $gle\dbtcdt = $setglg\setgll[i]\debcdtflg;
$gle\act = $setglg\setgll[i]\act; $gle\act = $setglg\setgll[i]\act;
$gle\valdat = $setglg\setgll[i]\valdat; $gle\valdat = $setglg\setgll[i]\valdat;
...@@ -210,7 +210,7 @@ void gleSavSetmod() ...@@ -210,7 +210,7 @@ void gleSavSetmod()
} }
else else
{ {
if( Platform.getTransName() = "BPTOPN" ) if( Platform.getTransName().equals("BPTOPN") )
{ {
fftflag = Platform.getContent( "\\FFTFLAG" ); fftflag = Platform.getContent( "\\FFTFLAG" );
err = Platform.errorCode(); err = Platform.errorCode();
...@@ -513,14 +513,14 @@ void gleSavSetmod() ...@@ -513,14 +513,14 @@ void gleSavSetmod()
default: default:
if( Platform.compareTo( $setglg\setgll[i]\dsp , "CAC" ) == 0 ) if( Platform.compareTo( $setglg\setgll[i]\dsp , "CAC" ) == 0 )
{ {
true = false; trueFlag = false;
frm = Platform.getIniBlock( "CLEAR.INI", "CLEAROUTFRAME", "FRM" ); frm = Platform.getIniBlock( "CLEAR.INI", "CLEAROUTFRAME", "FRM" );
err = Platform.errorCode(); err = Platform.errorCode();
if( Platform.searchBlock( frm, Platform.getTransName() ) > 0 ) if( Platform.searchBlock( frm, Platform.getTransName() ) > 0 )
{ {
true = true; trueFlag = true;
} }
if( true ) if( trueFlag )
{ {
//保存外币流水 //保存外币流水
addFCU( i ); addFCU( i );
......
script/glemod.0013.script
...@@ -36,7 +36,7 @@ void liaglesavCeb(String cur,BigDecimal amt,String engact,String engcat,String r ...@@ -36,7 +36,7 @@ void liaglesavCeb(String cur,BigDecimal amt,String engact,String engcat,String r
GLE\DBTCDT = "C" GLE\DBTCDT = "C"
endif**/ endif**/
$gle\cur = cur; $gle\cur = cur;
$gle\amt = new BigDecimal(Platform.abs( amt )); $gle\amt = Platform.abs( amt );
$gle\act = engact; $gle\act = engact;
$gle\valdat = value; $gle\valdat = value;
$gle\prn = "00001"; $gle\prn = "00001";
......
script/glemod.0018.script
...@@ -308,7 +308,7 @@ String actgetsql(String ptyinr,String dsp,String cur,IModule mod,String term) ...@@ -308,7 +308,7 @@ String actgetsql(String ptyinr,String dsp,String cur,IModule mod,String term)
} }
else else
{ {
if( sptsta = "PEN" ) if( sptsta.equals("PEN") )
{ {
if( Platform.compareTo( creobjtype , "TRN" ) == 0 && ! Platform.isEmpty( creobjinr ) ) if( Platform.compareTo( creobjtype , "TRN" ) == 0 && ! Platform.isEmpty( creobjinr ) )
{ {
...@@ -326,7 +326,7 @@ String actgetsql(String ptyinr,String dsp,String cur,IModule mod,String term) ...@@ -326,7 +326,7 @@ String actgetsql(String ptyinr,String dsp,String cur,IModule mod,String term)
} }
else else
{ {
if( sptsta = "COR" ) if( sptsta.equals("COR") )
{ {
if( ! Platform.isEmpty( $\sysmod\spt\ownref ) ) if( ! Platform.isEmpty( $\sysmod\spt\ownref ) )
{ {
......
script/glemod.0024.script
...@@ -9,8 +9,7 @@ String cutComAct(String act,String cut) ...@@ -9,8 +9,7 @@ String cutComAct(String act,String cut)
act = Platform.mid( act, 2 ); act = Platform.mid( act, 2 );
} }
} }
while ( Platform.compareTo( acc , cut ); while ( Platform.compareTo( acc , cut ) == 0);
) == 0
return act; return act;
} }
\ No newline at end of file
script/glemod.0025.script
...@@ -415,9 +415,9 @@ void getHangZhouProcesscode(String option,String extkey,#gle entry) ...@@ -415,9 +415,9 @@ void getHangZhouProcesscode(String option,String extkey,#gle entry)
} }
break; break;
case "BTAVS": case "BTAVS":
case "BEAKZ": //case "BEAKZ":
case "BEDPU": //case "BEDPU":
case "BEDPZ": //case "BEDPZ":
if( Platform.compareTo( $$entry\dbtcdt , "C" ) == 0 ) if( Platform.compareTo( $$entry\dbtcdt , "C" ) == 0 )
{ {
/** /**
......
script/glemod.0026.script
...@@ -121,8 +121,8 @@ void gleSavSetmodold() ...@@ -121,8 +121,8 @@ void gleSavSetmodold()
Platform.clear( $gle ); Platform.clear( $gle );
$gle\cur = $setglg\setgll[i]\acccur; $gle\cur = $setglg\setgll[i]\acccur;
$gle\syscur = $\cbsmod\xrtmod.sysiso(); $gle\syscur = $\cbsmod\xrtmod.sysiso();
$gle\amt = new BigDecimal(Platform.abs( $setglg\setgll[i]\accamt.getValue() )); $gle\amt = Platform.abs( $setglg\setgll[i]\accamt.getValue() );
$gle\sysamt = new BigDecimal(Platform.abs( $setglg\setgll[i]\xrfamt.getValue() )); $gle\sysamt = Platform.abs( $setglg\setgll[i]\xrfamt.getValue() );
$gle\dbtcdt = $setglg\setgll[i]\debcdtflg; $gle\dbtcdt = $setglg\setgll[i]\debcdtflg;
$gle\act = Platform.mid( $setglg\setgll[i]\act.getValue(), 1, 21 ); // 光大账号位数为21位 $gle\act = Platform.mid( $setglg\setgll[i]\act.getValue(), 1, 21 ); // 光大账号位数为21位
$gle\valdat = $setglg\setgll[i]\valdat; $gle\valdat = $setglg\setgll[i]\valdat;
...@@ -157,17 +157,17 @@ void gleSavSetmodold() ...@@ -157,17 +157,17 @@ void gleSavSetmodold()
$gle\syscur = $\cbsmod\xrtmod.sysiso(); $gle\syscur = $\cbsmod\xrtmod.sysiso();
if( Platform.compareTo( dCFlag , "D" ) == 0 ) if( Platform.compareTo( dCFlag , "D" ) == 0 )
{ {
$gle\amt = new BigDecimal(Platform.abs( accAmt )); $gle\amt = Platform.abs( accAmt );
$gle\cur = accCur; $gle\cur = accCur;
conCur = cur; conCur = cur;
} }
else else
{ {
$gle\amt = new BigDecimal(Platform.abs( amt )); $gle\amt = Platform.abs( amt );
$gle\cur = cur; $gle\cur = cur;
conCur = accCur; conCur = accCur;
} }
$gle\sysamt = new BigDecimal(Platform.abs( sysAmt )); $gle\sysamt = Platform.abs( sysAmt );
$gle\dbtcdt = "C"; $gle\dbtcdt = "C";
trmTyp = getFXTerm( accCur, cur, $gle\cur.getValue(), $gle\dbtcdt.getValue() ); trmTyp = getFXTerm( accCur, cur, $gle\cur.getValue(), $gle\dbtcdt.getValue() );
$gle\act = getAvailAcc( trmTyp, $gle\cur.getValue() + conCur, "", this, $gle\amt.getValue() ); $gle\act = getAvailAcc( trmTyp, $gle\cur.getValue() + conCur, "", this, $gle\amt.getValue() );
...@@ -183,17 +183,17 @@ void gleSavSetmodold() ...@@ -183,17 +183,17 @@ void gleSavSetmodold()
$gle\syscur = $\cbsmod\xrtmod.sysiso(); $gle\syscur = $\cbsmod\xrtmod.sysiso();
if( Platform.compareTo( dCFlag , "C" ) == 0 ) if( Platform.compareTo( dCFlag , "C" ) == 0 )
{ {
$gle\amt = new BigDecimal(Platform.abs( accAmt )); $gle\amt = Platform.abs( accAmt );
$gle\cur = accCur; $gle\cur = accCur;
conCur = cur; conCur = cur;
} }
else else
{ {
$gle\amt = new BigDecimal(Platform.abs( amt )); $gle\amt = Platform.abs( amt );
$gle\cur = cur; $gle\cur = cur;
conCur = accCur; conCur = accCur;
} }
$gle\sysamt = new BigDecimal(Platform.abs( sysAmt )); $gle\sysamt = Platform.abs( sysAmt );
$gle\dbtcdt = "D"; $gle\dbtcdt = "D";
trmTyp = getFXTerm( accCur, cur, $gle\cur.getValue(), $gle\dbtcdt.getValue() ); trmTyp = getFXTerm( accCur, cur, $gle\cur.getValue(), $gle\dbtcdt.getValue() );
$gle\act = getAvailAcc( trmTyp, $gle\cur.getValue() + conCur, "", this, $gle\amt.getValue() ); $gle\act = getAvailAcc( trmTyp, $gle\cur.getValue() + conCur, "", this, $gle\amt.getValue() );
...@@ -217,19 +217,19 @@ void gleSavSetmodold() ...@@ -217,19 +217,19 @@ void gleSavSetmodold()
$gle\syscur = $\cbsmod\xrtmod.sysiso(); $gle\syscur = $\cbsmod\xrtmod.sysiso();
if( Platform.compareTo( dCFlag , "D" ) == 0 ) if( Platform.compareTo( dCFlag , "D" ) == 0 )
{ {
$gle\amt = new BigDecimal(Platform.abs( accAmt )); $gle\amt = Platform.abs( accAmt );
$gle\cur = accCur; $gle\cur = accCur;
conCur = accCur; conCur = accCur;
othCur = cur; othCur = cur;
} }
else else
{ {
$gle\amt = new BigDecimal(Platform.abs( amt )); $gle\amt = Platform.abs( amt );
$gle\cur = cur; $gle\cur = cur;
conCur = cur; conCur = cur;
othCur = accCur; othCur = accCur;
} }
$gle\sysamt = new BigDecimal(Platform.abs( sysAmt )); $gle\sysamt = Platform.abs( sysAmt );
$gle\dbtcdt = "C"; $gle\dbtcdt = "C";
trmTyp = getFXTerm( accCur, cur, $gle\cur.getValue(), $gle\dbtcdt.getValue() ); trmTyp = getFXTerm( accCur, cur, $gle\cur.getValue(), $gle\dbtcdt.getValue() );
$gle\act = getAvailAcc( trmTyp, $gle\cur.getValue() + "CNY", "", this, $gle\amt.getValue() ); $gle\act = getAvailAcc( trmTyp, $gle\cur.getValue() + "CNY", "", this, $gle\amt.getValue() );
...@@ -251,7 +251,7 @@ void gleSavSetmodold() ...@@ -251,7 +251,7 @@ void gleSavSetmodold()
// 第二条，人民币 // 第二条，人民币
$gle\cur = "CNY"; $gle\cur = "CNY";
$gle\amt = $\cbsmod\xrtmod.amtRnd( Platform.numMul($gle\amt.getValue() , $gle\rat.getValue()), $gle\cur.getValue() ); $gle\amt = $\cbsmod\xrtmod.amtRnd( Platform.numMul($gle\amt.getValue() , $gle\rat.getValue()), $gle\cur.getValue() );
$gle\sysamt = new BigDecimal(Platform.abs( sysAmt )); $gle\sysamt = Platform.abs( sysAmt );
$gle\dbtcdt = "D"; $gle\dbtcdt = "D";
trmTyp = getFXTerm( accCur, cur, $gle\cur.getValue(), $gle\dbtcdt.getValue() ); trmTyp = getFXTerm( accCur, cur, $gle\cur.getValue(), $gle\dbtcdt.getValue() );
$gle\act = getAvailAcc( trmTyp, $gle\cur.getValue() + conCur, "", this, $gle\amt.getValue() ); $gle\act = getAvailAcc( trmTyp, $gle\cur.getValue() + conCur, "", this, $gle\amt.getValue() );
...@@ -292,12 +292,12 @@ void gleSavSetmodold() ...@@ -292,12 +292,12 @@ void gleSavSetmodold()
// 第四条，外币 // 第四条，外币
if( Platform.compareTo( dCFlag , "C" ) == 0 ) if( Platform.compareTo( dCFlag , "C" ) == 0 )
{ {
$gle\amt = new BigDecimal(Platform.abs( accAmt )); $gle\amt = Platform.abs( accAmt );
$gle\cur = accCur; $gle\cur = accCur;
} }
else else
{ {
$gle\amt = new BigDecimal(Platform.abs( amt )); $gle\amt = Platform.abs( amt );
$gle\cur = cur; $gle\cur = cur;
} }
$gle\dbtcdt = "D"; $gle\dbtcdt = "D";
......
script/glemod.0054.script
...@@ -4,9 +4,9 @@ void addgleforclr(int i,Argument<Integer> prnnum) ...@@ -4,9 +4,9 @@ void addgleforclr(int i,Argument<Integer> prnnum)
//Debit SPD //Debit SPD
Platform.clear( $gle ); Platform.clear( $gle );
$gle\cur = $setglg\setgll[i]\acccur; $gle\cur = $setglg\setgll[i]\acccur;
$gle\amt = new BigDecimal(Platform.abs( $setglg\setgll[i]\accamt.getValue() )); $gle\amt = Platform.abs( $setglg\setgll[i]\accamt.getValue() );
$gle\syscur = $setglg\setgll[i]\cur; $gle\syscur = $setglg\setgll[i]\cur;
$gle\sysamt = new BigDecimal(Platform.abs( $setglg\setgll[i]\amt.getValue() )); $gle\sysamt = Platform.abs( $setglg\setgll[i]\amt.getValue() );
$gle\dbtcdt = "D"; $gle\dbtcdt = "D";
//$Acc = GetAvailAcc( "SPD", \SETMOD\DOCCUR, "", self, \SETMOD\SETAMT ) //$Acc = GetAvailAcc( "SPD", \SETMOD\DOCCUR, "", self, \SETMOD\SETAMT )
$gle\act = $setglg\setgll[i]\act; $gle\act = $setglg\setgll[i]\act;
...@@ -32,9 +32,9 @@ void addgleforclr(int i,Argument<Integer> prnnum) ...@@ -32,9 +32,9 @@ void addgleforclr(int i,Argument<Integer> prnnum)
//credit PAC //credit PAC
Platform.clear( $gle ); Platform.clear( $gle );
$gle\cur = $setglg\setgll[i]\acccur; $gle\cur = $setglg\setgll[i]\acccur;
$gle\amt = new BigDecimal(Platform.abs( $setglg\setgll[i]\accamt.getValue() )); $gle\amt = Platform.abs( $setglg\setgll[i]\accamt.getValue() );
$gle\syscur = $setglg\setgll[i]\cur; $gle\syscur = $setglg\setgll[i]\cur;
$gle\sysamt = new BigDecimal(Platform.abs( $setglg\setgll[i]\amt.getValue() )); $gle\sysamt = Platform.abs( $setglg\setgll[i]\amt.getValue() );
$gle\dbtcdt = "C"; $gle\dbtcdt = "C";
//$ACTPTAINR = \SETMOD\SETGLG\SETGLL.getACTPTAINR ( "PAC" ) //$ACTPTAINR = \SETMOD\SETGLG\SETGLL.getACTPTAINR ( "PAC" )
//$ACTPTYINR = GetTextOfInrTable( "PTA", $ACTPTAINR, "PTYINR" ) //$ACTPTYINR = GetTextOfInrTable( "PTA", $ACTPTAINR, "PTYINR" )
......
script/glemod.0060.script
...@@ -43,7 +43,7 @@ void addFCU(int i) ...@@ -43,7 +43,7 @@ void addFCU(int i)
$fcu[count]\branchinr = $\trnmod\trn\branchinr; $fcu[count]\branchinr = $\trnmod\trn\branchinr;
$fcu[count]\bch = $\sysmod.getBchcode ( $\trnmod\trn\bchkeyinr.getValue() ); $fcu[count]\bch = $\sysmod.getBchcode ( $\trnmod\trn\bchkeyinr.getValue() );
$fcu[count]\cur = $\setmod\setglg\setgll[j]\cur; $fcu[count]\cur = $\setmod\setglg\setgll[j]\cur;
$fcu[count]\amt = new BigDecimal(Platform.abs( $\setmod\setglg\setgll[j]\fmtamt.getValue() )); $fcu[count]\amt = Platform.abs( $\setmod\setglg\setgll[j]\fmtamt.getValue() );
$fcu[count]\dbtcdt = "C"; $fcu[count]\dbtcdt = "C";
$fcu[count]\orcact = $\setmod\setglg\setgll[j]\act; $fcu[count]\orcact = $\setmod\setglg\setgll[j]\act;
$fcu[count]\orcbic = ownbic; $fcu[count]\orcbic = ownbic;
...@@ -103,7 +103,7 @@ void addFCU(int i) ...@@ -103,7 +103,7 @@ void addFCU(int i)
$fcu[count]\branchinr = $\trnmod\trn\branchinr; $fcu[count]\branchinr = $\trnmod\trn\branchinr;
$fcu[count]\bch = $\sysmod.getBchcode ( $\trnmod\trn\bchkeyinr.getValue() ); $fcu[count]\bch = $\sysmod.getBchcode ( $\trnmod\trn\bchkeyinr.getValue() );
$fcu[count]\cur = $\setmod\setglg\setgll[j]\cur; $fcu[count]\cur = $\setmod\setglg\setgll[j]\cur;
$fcu[count]\amt = new BigDecimal(Platform.abs( $\setmod\setglg\setgll[j]\fmtamt.getValue() )); $fcu[count]\amt = Platform.abs( $\setmod\setglg\setgll[j]\fmtamt.getValue() );
$fcu[count]\dbtcdt = "C"; $fcu[count]\dbtcdt = "C";
$fcu[count]\orcact = $\setmod\setglg\setgll[j]\act; $fcu[count]\orcact = $\setmod\setglg\setgll[j]\act;
$fcu[count]\orcbic = ownbic; $fcu[count]\orcbic = ownbic;
......
script/hmdsnd.0002.script
...@@ -5,5 +5,5 @@ String transmitMessage(#trn argtrn) ...@@ -5,5 +5,5 @@ String transmitMessage(#trn argtrn)
{ {
return "D"; return "D";
} }
return "";
} }
\ No newline at end of file
script/hmtp.0004.script
...@@ -30,5 +30,5 @@ String getTrsUsrForSig(String argsigidx) ...@@ -30,5 +30,5 @@ String getTrsUsrForSig(String argsigidx)
} }
} }
} }
return "";
} }
\ No newline at end of file
script/imgmod.0006.script
...@@ -20,7 +20,8 @@ String getDcref(String trn,String dcinr) ...@@ -20,7 +20,8 @@ String getDcref(String trn,String dcinr)
dcref = $scatfwrk\ownref; dcref = $scatfwrk\ownref;
if( ! Platform.isEmpty( dcref ) ) if( ! Platform.isEmpty( dcref ) )
{ {
return ; // #######TODO 改写 LABEL与GOTO #### goto done //return ; // #### goto done
return dcref;
} }
} }
dcref = ""; dcref = "";
...@@ -171,7 +172,7 @@ String getDcref(String trn,String dcinr) ...@@ -171,7 +172,7 @@ String getDcref(String trn,String dcinr)
dcref = Platform.mid( dcref, 1, Platform.len( dcref ) - 1 ); dcref = Platform.mid( dcref, 1, Platform.len( dcref ) - 1 );
} }
} }
// #######TODO 改写 LABEL与GOTO #### label done // #### label done
return dcref; return dcref;
} }
\ No newline at end of file
script/imgmod.0013.script
...@@ -9,7 +9,7 @@ void callImageRoute(String apptyp) ...@@ -9,7 +9,7 @@ void callImageRoute(String apptyp)
if( ! Platform.isEmpty( $errtxt ) ) if( ! Platform.isEmpty( $errtxt ) )
{ {
prompt = Platform.prompt( #CT000086, $errtxt.getValue() ); prompt = Platform.prompt( #CT000086, $errtxt.getValue() );
if( prompt == 2 ) if( prompt )
{ {
Platform.exitEvent(); Platform.exitEvent();
} }
......
script/imgmod.0017.script
...@@ -22,7 +22,6 @@ String getScanFileDll(String filtyp) ...@@ -22,7 +22,6 @@ String getScanFileDll(String filtyp)
{ {
return "C:\\WINDOWS\\SYSTEM32\\bin\\" + filename; return "C:\\WINDOWS\\SYSTEM32\\bin\\" + filename;
} }
break;
default: default:
return "client:" + filename; return "client:" + filename;
} }
......
script/imgmod.0020.script
...@@ -60,7 +60,6 @@ String getDcrefchild(String trn,String dcinr,Argument<String> childtyp) ...@@ -60,7 +60,6 @@ String getDcrefchild(String trn,String dcinr,Argument<String> childtyp)
break; break;
case "LITDAV": case "LITDAV":
case "LITDCK": case "LITDCK":
case "LITROG":
dcref = Platform.getContent( "\\BRDGRP\\REC\\OWNREF" ); dcref = Platform.getContent( "\\BRDGRP\\REC\\OWNREF" );
a = Platform.errorCode(); a = Platform.errorCode();
if( Platform.isEmpty( dcref ) ) if( Platform.isEmpty( dcref ) )
...@@ -101,7 +100,7 @@ String getDcrefchild(String trn,String dcinr,Argument<String> childtyp) ...@@ -101,7 +100,7 @@ String getDcrefchild(String trn,String dcinr,Argument<String> childtyp)
childtyp.value = ""; childtyp.value = "";
} }
} }
// #######TODO 改写 LABEL与GOTO #### label done // #### label done
return dcref; return dcref;
} }
\ No newline at end of file
script/imgmod.0030.script
...@@ -9,7 +9,7 @@ void callImageRouteForAtt(String apptyp) ...@@ -9,7 +9,7 @@ void callImageRouteForAtt(String apptyp)
if( ! Platform.isEmpty( $errtxt ) ) if( ! Platform.isEmpty( $errtxt ) )
{ {
prompt = Platform.prompt( #CT000100, $errtxt.getValue() ); prompt = Platform.prompt( #CT000100, $errtxt.getValue() );
if( prompt == 2 ) if( prompt )
{ {
Platform.exitEvent(); Platform.exitEvent();
} }
......
script/imgmod.0040.script
...@@ -7,7 +7,7 @@ void imageDLLclose() ...@@ -7,7 +7,7 @@ void imageDLLclose()
picViewer = getScanFileDll( "C" ); picViewer = getScanFileDll( "C" );
Platform.DLLPushWORD( 0 ); Platform.DLLPushWORD( 0 );
Platform.dllCallByName( picViewer, "Close" ); Platform.dllCallByName( picViewer, "Close" );
rtn = Platform.DLLGetWORD( 0 ); Platform.DLLGetWORD( 0 );
Platform.DLLClose( picViewer ); Platform.DLLClose( picViewer );
err = Platform.errorCode(); err = Platform.errorCode();
Platform.clear( $dllloadflg ); Platform.clear( $dllloadflg );
......
script/irtcal.0010.script
...@@ -22,7 +22,7 @@ void calcIrp() ...@@ -22,7 +22,7 @@ void calcIrp()
} }
else else
{ {
if( Platform.abs( $irdele[irdidx]\amt.getValue() ) > Platform.abs( $irpele[irpidx]\amt.getValue() ) ) if( Platform.abs( $irdele[irdidx]\amt.getValue() ).compareTo(Platform.abs( $irpele[irpidx]\amt.getValue() ) ) > 0)
{ {
$irpele[irpidx]\amt = $irdele[irdidx]\amt; $irpele[irpidx]\amt = $irdele[irdidx]\amt;
} }
......
script/irtcal.0014.script
...@@ -20,7 +20,8 @@ int addIRDELE(Date dat) ...@@ -20,7 +20,8 @@ int addIRDELE(Date dat)
{ {
// there exists already an IRDELE with the required end date // there exists already an IRDELE with the required end date
idx = iRDidx; idx = iRDidx;
return ; // #######TODO 改写 LABEL与GOTO #### goto done //return ; // #### goto done
return idx;
} }
if( Platform.diff(dat , $irdele[iRDidx]\enddat.getValue())<0 ) if( Platform.diff(dat , $irdele[iRDidx]\enddat.getValue())<0 )
{ {
...@@ -43,13 +44,14 @@ int addIRDELE(Date dat) ...@@ -43,13 +44,14 @@ int addIRDELE(Date dat)
Platform.GridSort( $irdele, "BEGDAT" ); Platform.GridSort( $irdele, "BEGDAT" );
// after sort, new element will be insert after $IRDidx // after sort, new element will be insert after $IRDidx
idx = iRDidx + 1; idx = iRDidx + 1;
return ; // #######TODO 改写 LABEL与GOTO #### goto done //return ; // #### goto done
return idx;
} }
} }
// as range from CALBEGDAT until CALENDDAT is covered by IRDELE // as range from CALBEGDAT until CALENDDAT is covered by IRDELE
// DAT must be found, so loop should never be left at the end // DAT must be found, so loop should never be left at the end
Platform.setErrorCode( 1000, "Internal Error in IRTCAL.AddIRDELE" ); Platform.setErrorCode( 1000, "Internal Error in IRTCAL.AddIRDELE" );
// #######TODO 改写 LABEL与GOTO #### label done // #### label done
return idx; return idx;
} }
\ No newline at end of file
script/itfmap.0000.script
boolean getConfig() boolean getConfig1()
{ {
//!读取ITFMAP.INI文件 //!读取ITFMAP.INI文件
//!=================================== //!===================================
......
script/letp0.0003.script
...@@ -22,7 +22,7 @@ default $cnftxt order 1000 ...@@ -22,7 +22,7 @@ default $cnftxt order 1000
case "Y": case "Y":
if( Platform.compareTo($ledgrp\rec\partcon.getValue(), 0) != 0 && Platform.compareTo($ledgrp\rec\partcon.getValue(), 100) != 0 ) if( Platform.compareTo($ledgrp\rec\partcon.getValue(), 0) != 0 && Platform.compareTo($ledgrp\rec\partcon.getValue(), 100) != 0 )
{ {
if( Platform.compareTo($\trnmod\liaget.trnmodGetTenorAmount( $ledgrp, "AVL" ) , Platform.numMul(( $\trnmod\liaget.trnmodGetTenorAmount( $ledgrp, "INT" ) + $\trnmod\liaget.trnmodGetTenorAmount( $ledgrp, "AVL" ) ) , ( Platform.numDiv($ledgrp\rec\partcon.getValue() , 100) ))<0) ) if( Platform.compareTo($\trnmod\liaget.trnmodGetTenorAmount( $ledgrp, "AVL" ) , Platform.numMul(( $\trnmod\liaget.trnmodGetTenorAmount( $ledgrp, "INT" ) + $\trnmod\liaget.trnmodGetTenorAmount( $ledgrp, "AVL" ) ) , ( Platform.numDiv($ledgrp\rec\partcon.getValue() , 100) )))<0 )
{ {
$cnftxt = #CT000021 + Platform.toString( Platform.toInt( $ledgrp\rec\partcon.getValue() ) ) + #CT000022; $cnftxt = #CT000021 + Platform.toString( Platform.toInt( $ledgrp\rec\partcon.getValue() ) ) + #CT000022;
} }
...@@ -46,7 +46,7 @@ default $cnftxt order 1000 ...@@ -46,7 +46,7 @@ default $cnftxt order 1000
case "S": case "S":
if( Platform.compareTo($ledgrp\rec\partcon.getValue(), 0) != 0 && Platform.compareTo($ledgrp\rec\partcon.getValue(), 100) != 0 ) if( Platform.compareTo($ledgrp\rec\partcon.getValue(), 0) != 0 && Platform.compareTo($ledgrp\rec\partcon.getValue(), 100) != 0 )
{ {
if( Platform.compareTo($\trnmod\liaget.trnmodGetTenorAmount( $ledgrp, "AVS" ) , Platform.numMul(( $\trnmod\liaget.trnmodGetTenorAmount( $ledgrp, "INT" ) + $\trnmod\liaget.trnmodGetTenorAmount( $ledgrp, "AVS" ) ) , ( Platform.numDiv($ledgrp\rec\partcon.getValue() , 100) ))<0) ) if( Platform.compareTo($\trnmod\liaget.trnmodGetTenorAmount( $ledgrp, "AVS" ) , Platform.numMul(( $\trnmod\liaget.trnmodGetTenorAmount( $ledgrp, "INT" ) + $\trnmod\liaget.trnmodGetTenorAmount( $ledgrp, "AVS" ) ) , ( Platform.numDiv($ledgrp\rec\partcon.getValue() , 100) ))) <0)
{ {
$cnftxt = #CT000027 + Platform.toString( Platform.toInt( $ledgrp\rec\partcon.getValue() ) ) + #CT000028; $cnftxt = #CT000027 + Platform.toString( Platform.toInt( $ledgrp\rec\partcon.getValue() ) ) + #CT000028;
} }
......
script/liaallg.0000.script
...@@ -15,7 +15,7 @@ default $acc order 1000 ...@@ -15,7 +15,7 @@ default $acc order 1000
{ {
Platform.enable($acc); Platform.enable($acc);
} }
if( ( ! Platform.isModified( $acc ) ) || Platform.pos( actval, $acc.getValue() ) == 0 ) if( ( ! Platform.isModified( $acc ) ) || Platform.pos( actval.getValue(), $acc.getValue() ) == 0 )
{ {
Platform.resetModified( $acc.getValue() ); Platform.resetModified( $acc.getValue() );
$acc = Platform.getLine( actval, 1 ); $acc = Platform.getLine( actval, 1 );
......
script/liaallg.0001.script
...@@ -7,7 +7,7 @@ default $acc2 order 1000 ...@@ -7,7 +7,7 @@ default $acc2 order 1000
if( Platform.compareTo($amt.getValue() , 0)>0 && ( ! Platform.isEmpty( $rol ) ) ) if( Platform.compareTo($amt.getValue() , 0)>0 && ( ! Platform.isEmpty( $rol ) ) )
{ {
// enable account only of more than one option // enable account only of more than one option
if( Platform.isEmpty( Platform.getLine( actval, 2 ) ) ) if( Platform.isEmpty( Platform.getLine( actval.getValue(), 2 ) ) )
{ {
Platform.disable($acc2); Platform.disable($acc2);
} }
...@@ -15,7 +15,7 @@ default $acc2 order 1000 ...@@ -15,7 +15,7 @@ default $acc2 order 1000
{ {
Platform.enable($acc2); Platform.enable($acc2);
} }
if( ! Platform.isModified( $acc2 ) || Platform.pos( actval, $acc2.getValue() ) == 0 ) if( ! Platform.isModified( $acc2 ) || Platform.pos( actval.getValue(), $acc2.getValue() ) == 0 )
{ {
Platform.resetModified( $acc2.getValue() ); Platform.resetModified( $acc2.getValue() );
$acc2 = Platform.getLine( actval, 1 ); $acc2 = Platform.getLine( actval, 1 );
......
script/liaallg.0015.script
...@@ -83,7 +83,7 @@ void setFec() ...@@ -83,7 +83,7 @@ void setFec()
if( endidx > 0 ) if( endidx > 0 )
{ {
Platform.streamDelete( valstm, endidx ); Platform.streamDelete( valstm, endidx );
valblk = Platform.toString( valstm ); valblk.setValue(Platform.toString( valstm ));
} }
} }
// Remove selection "1 to three quartes", if no rate and period type is year // Remove selection "1 to three quartes", if no rate and period type is year
...@@ -105,7 +105,7 @@ void setFec() ...@@ -105,7 +105,7 @@ void setFec()
{ {
Platform.streamDelete( valstm, endidx ); Platform.streamDelete( valstm, endidx );
} }
valblk = Platform.toString( valstm ); valblk.setValue(Platform.toString( valstm ));
} }
Platform.setFieldValue( $fec\setperflg, valblk ); Platform.setFieldValue( $fec\setperflg, valblk );
// Check if option from condition or manually selected option is available // Check if option from condition or manually selected option is available
......
script/liaccv.0013.script
...@@ -22,6 +22,7 @@ void sesmodGetAvbFCD(String cur,String ptyinr,IStream cvstm,IStream valstm) ...@@ -22,6 +22,7 @@ void sesmodGetAvbFCD(String cur,String ptyinr,IStream cvstm,IStream valstm)
if( Platform.errorCode() > 0 ) if( Platform.errorCode() > 0 )
{ {
Platform.streamClear( $\trnmod\wrkstm\cacstm.getValue() ); Platform.streamClear( $\trnmod\wrkstm\cacstm.getValue() );
IStream retstream = new StreamImpl();
Platform.dbExecuteSql( sql, retstream ); Platform.dbExecuteSql( sql, retstream );
while( Platform.errorCode() <= 0 ) while( Platform.errorCode() <= 0 )
{ {
......
script/liaccv.0015.script
...@@ -32,7 +32,7 @@ void registersettlement() ...@@ -32,7 +32,7 @@ void registersettlement()
} }
hldKey = $\setmod\setglg.setglgAddAmount ( "CCV" + Platform.toString( i, -3 ), $liaccvg[i]\rol.getValue(), $liaccvg[i]\concur.getValue(), $liaccvg[i]\acccovamt.getValue().negate(), "HLD", "CCD", "F", $liaccvg[i]\acc.getValue(), "CCV" + Platform.toString( i, -3 ) ); hldKey = $\setmod\setglg.setglgAddAmount ( "CCV" + Platform.toString( i, -3 ), $liaccvg[i]\rol.getValue(), $liaccvg[i]\concur.getValue(), $liaccvg[i]\acccovamt.getValue().negate(), "HLD", "CCD", "F", $liaccvg[i]\acc.getValue(), "CCV" + Platform.toString( i, -3 ) );
$\setmod\setglg.setglgAddAmtFldAccCur ( "CCV" + Platform.toString( i, -3 ), hldKey, $liaccvg[i]\cur.getValue() ); $\setmod\setglg.setglgAddAmtFldAccCur ( "CCV" + Platform.toString( i, -3 ), hldKey, $liaccvg[i]\cur.getValue() );
$\setmod\setglg.setglgAddAmtFldExtRat ( "CCV" + Platform.toString( i, -3 ), hldKey, 1.00, $liaccvg[i]\rat.getValue() ); $\setmod\setglg.setglgAddAmtFldExtRat ( "CCV" + Platform.toString( i, -3 ), hldKey, new BigDecimal(1), $liaccvg[i]\rat.getValue() );
} }
else else
{ {
......
script/liaccv.0020.script
...@@ -43,7 +43,7 @@ default $relcshpct order 1000 ...@@ -43,7 +43,7 @@ default $relcshpct order 1000
{ {
if( Platform.compareTo( maxamt , 0 ) == 0 ) if( Platform.compareTo( maxamt , 0 ) == 0 )
{ {
$relcshpct = 0; $relcshpct = BigDecimal.ZERO;
} }
} }
// endif // endif
......
script/liaccv.0034.script
...@@ -2,7 +2,7 @@ default $pctresamt order 1000 ...@@ -2,7 +2,7 @@ default $pctresamt order 1000
{ {
if( Platform.compareTo( Platform.getTransName() , "BRTSET" ) == 0 || Platform.compareTo( Platform.getTransName() , "GITSET" ) == 0 || Platform.compareTo( Platform.getTransName() , "DITSET" ) == 0 ) if( Platform.compareTo( Platform.getTransName() , "BRTSET" ) == 0 || Platform.compareTo( Platform.getTransName() , "GITSET" ) == 0 || Platform.compareTo( Platform.getTransName() , "DITSET" ) == 0 )
{ {
$pctresamt = new BigDecimal(Platform.abs( Platform.numDiv(Platform.numMul($cshpct.getValue() , ( Platform.numAdd($chgamt.getValue() , $chgresamt.getValue()) )) , 100) )); $pctresamt = Platform.abs( Platform.numDiv(Platform.numMul($cshpct.getValue() , ( Platform.numAdd($chgamt.getValue() , $chgresamt.getValue()) )) , 100) );
} }
else else
{ {
......
script/liaccvg.0022.script
...@@ -28,7 +28,7 @@ default covamts ($covamt,$acccovamt,$amt) order 500 ...@@ -28,7 +28,7 @@ default covamts ($covamt,$acccovamt,$amt) order 500
{ {
Argument<String> refcurBox = new Argument<String>("",refcur); Argument<String> refcurBox = new Argument<String>("",refcur);
Argument<BigDecimal> refamtBox = new Argument<BigDecimal>("",refamt); Argument<BigDecimal> refamtBox = new Argument<BigDecimal>("",refamt);
$amt = $\cbsmod\xrtmod.amtConvRates( $acccovamt.getValue(), $rat.getValue(), 1.00, $concur.getValue(), $cur.getValue(), refcurBox, refamtBox ); $amt = $\cbsmod\xrtmod.amtConvRates( $acccovamt.getValue(), $rat.getValue(), new BigDecimal("1.00"), $concur.getValue(), $cur.getValue(), refcurBox, refamtBox );
refcur = refcurBox.value; refcur = refcurBox.value;
refamt = refamtBox.value; refamt = refamtBox.value;
...@@ -43,7 +43,7 @@ default covamts ($covamt,$acccovamt,$amt) order 500 ...@@ -43,7 +43,7 @@ default covamts ($covamt,$acccovamt,$amt) order 500
} }
Argument<String> refcurBox1 = new Argument<String>("",refcur); Argument<String> refcurBox1 = new Argument<String>("",refcur);
Argument<BigDecimal> refamtBox1 = new Argument<BigDecimal>("",refamt); Argument<BigDecimal> refamtBox1 = new Argument<BigDecimal>("",refamt);
$covamt = $\cbsmod\xrtmod.amtConvRates( Platform.numAdd($amt.getValue() , $oldamt.getValue()), 1.00, $rat.getValue(), $cur.getValue(), $concur.getValue(), refcurBox1, refamtBox1 ); $covamt = $\cbsmod\xrtmod.amtConvRates( Platform.numAdd($amt.getValue() , $oldamt.getValue()), new BigDecimal("1.00"), $rat.getValue(), $cur.getValue(), $concur.getValue(), refcurBox1, refamtBox1 );
refcur = refcurBox1.value; refcur = refcurBox1.value;
refamt = refamtBox1.value; refamt = refamtBox1.value;
...@@ -94,14 +94,14 @@ default covamts ($covamt,$acccovamt,$amt) order 500 ...@@ -94,14 +94,14 @@ default covamts ($covamt,$acccovamt,$amt) order 500
{ {
Argument<String> refcurBox2 = new Argument<String>("",refcur); Argument<String> refcurBox2 = new Argument<String>("",refcur);
Argument<BigDecimal> refamtBox2 = new Argument<BigDecimal>("",refamt); Argument<BigDecimal> refamtBox2 = new Argument<BigDecimal>("",refamt);
$acccovamt = $\cbsmod\xrtmod.amtConvRates( $amt.getValue(), 1.00, $rat.getValue(), $cur.getValue(), $concur.getValue(), refcurBox2, refamtBox2 ); $acccovamt = $\cbsmod\xrtmod.amtConvRates( $amt.getValue(), new BigDecimal("1.00"), $rat.getValue(), $cur.getValue(), $concur.getValue(), refcurBox2, refamtBox2 );
refcur = refcurBox2.value; refcur = refcurBox2.value;
refamt = refamtBox2.value; refamt = refamtBox2.value;
Argument<String> refcurBox3 = new Argument<String>("",refcur); Argument<String> refcurBox3 = new Argument<String>("",refcur);
Argument<BigDecimal> refamtBox3 = new Argument<BigDecimal>("",refamt); Argument<BigDecimal> refamtBox3 = new Argument<BigDecimal>("",refamt);
$covamt = $\cbsmod\xrtmod.amtConvRates( Platform.numAdd($amt.getValue() , $oldamt.getValue()), 1.00, $rat.getValue(), $cur.getValue(), $concur.getValue(), refcurBox3, refamtBox3 ); $covamt = $\cbsmod\xrtmod.amtConvRates( Platform.numAdd($amt.getValue() , $oldamt.getValue()),new BigDecimal("1.00"), $rat.getValue(), $cur.getValue(), $concur.getValue(), refcurBox3, refamtBox3 );
refcur = refcurBox3.value; refcur = refcurBox3.value;
refamt = refamtBox3.value; refamt = refamtBox3.value;
......
script/liaccvg.0031.script
...@@ -8,7 +8,7 @@ event $amt order 1500 ...@@ -8,7 +8,7 @@ event $amt order 1500
{ {
Argument<String> refcurBox = new Argument<String>("",refcur); Argument<String> refcurBox = new Argument<String>("",refcur);
Argument<BigDecimal> refamtBox = new Argument<BigDecimal>("",refamt); Argument<BigDecimal> refamtBox = new Argument<BigDecimal>("",refamt);
$acccovamt = $\cbsmod\xrtmod.amtConvRates( $amt.getValue(), 1.00, $rat.getValue(), $cur.getValue(), $concur.getValue(), refcurBox, refamtBox ); $acccovamt = $\cbsmod\xrtmod.amtConvRates( $amt.getValue(), new BigDecimal("1.00"), $rat.getValue(), $cur.getValue(), $concur.getValue(), refcurBox, refamtBox );
refcur = refcurBox.value; refcur = refcurBox.value;
refamt = refamtBox.value; refamt = refamtBox.value;
...@@ -28,7 +28,7 @@ event $amt order 1500 ...@@ -28,7 +28,7 @@ event $amt order 1500
if( Platform.compareTo(realAmt, $amt.getValue()) != 0 ) if( Platform.compareTo(realAmt, $amt.getValue()) != 0 )
{ {
perAmt = 0; perAmt = 0;
if( Platform.abs( realAmt ) > Platform.abs( $amt.getValue() ) ) if( Platform.abs( realAmt ).compareTo(Platform.abs( $amt.getValue() )) > 0 )
{ {
Platform.streamClear( curStm ); Platform.streamClear( curStm );
curblk = Platform.getIniBlock( "TDPARA.INI", "CURRENCY", "CURRENCY" ); curblk = Platform.getIniBlock( "TDPARA.INI", "CURRENCY", "CURRENCY" );
......
script/liaccvg.0033.script
...@@ -48,7 +48,7 @@ event $rat order 1000 ...@@ -48,7 +48,7 @@ event $rat order 1000
} }
Argument<String> refcurBox1 = new Argument<String>("",refcur); Argument<String> refcurBox1 = new Argument<String>("",refcur);
Argument<BigDecimal> refamtBox = new Argument<BigDecimal>("",refamt); Argument<BigDecimal> refamtBox = new Argument<BigDecimal>("",refamt);
$covamt = $\cbsmod\xrtmod.amtConvRates( Platform.numAdd($oldamt.getValue() , $amt.getValue()), 1, rate, $cur.getValue(), $concur.getValue(), refcurBox1, refamtBox ); $covamt = $\cbsmod\xrtmod.amtConvRates( Platform.numAdd($oldamt.getValue() , $amt.getValue()), new BigDecimal(1), rate, $cur.getValue(), $concur.getValue(), refcurBox1, refamtBox );
refcur = refcurBox1.value; refcur = refcurBox1.value;
refamt = refamtBox.value; refamt = refamtBox.value;
......
script/liaccvg.0034.script
...@@ -47,7 +47,7 @@ check $amt order 1001 ...@@ -47,7 +47,7 @@ check $amt order 1001
} }
Argument<String> refcurBox1 = new Argument<String>("",refcur); Argument<String> refcurBox1 = new Argument<String>("",refcur);
Argument<BigDecimal> refamtBox = new Argument<BigDecimal>("",refamt); Argument<BigDecimal> refamtBox = new Argument<BigDecimal>("",refamt);
amt = $\cbsmod\xrtmod.amtConvRates( $acccovamt.getValue(), rate, 1.00, $concur.getValue(), $cur.getValue(), refcurBox1, refamtBox ); amt = $\cbsmod\xrtmod.amtConvRates( $acccovamt.getValue(), rate, new BigDecimal("1.00"), $concur.getValue(), $cur.getValue(), refcurBox1, refamtBox );
refcur = refcurBox1.value; refcur = refcurBox1.value;
refamt = refamtBox.value; refamt = refamtBox.value;
......
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