Commit 182d2d81 by Gan

A-D T-V Update

parent 0f6cd0df
...@@ -34,7 +34,6 @@ void insertNewACG(int index,String ownref,String trninr,String frm,String objinr ...@@ -34,7 +34,6 @@ void insertNewACG(int index,String ownref,String trninr,String frm,String objinr
String guojia = NULLSTR; String guojia = NULLSTR;
String daima = NULLSTR; String daima = NULLSTR;
String shenbao = NULLSTR; String shenbao = NULLSTR;
String v$daima = NULLSTR;
String transact_code = NULLSTR; String transact_code = NULLSTR;
String ap_number = NULLSTR; String ap_number = NULLSTR;
String authority_code = NULLSTR; String authority_code = NULLSTR;
...@@ -152,7 +151,7 @@ void insertNewACG(int index,String ownref,String trninr,String frm,String objinr ...@@ -152,7 +151,7 @@ void insertNewACG(int index,String ownref,String trninr,String frm,String objinr
ssta = "O"; ssta = "O";
in = "Q"; in = "Q";
guojia = Platform.getContent( "\\SETMOD\\ABQGET\\ABQP\\ABQSEL\\COUNTRY" ); guojia = Platform.getContent( "\\SETMOD\\ABQGET\\ABQP\\ABQSEL\\COUNTRY" );
v$daima = Platform.getContent( "\\SETMOD\\ABQGET\\ABQP\\ABQSEL\\COD" ); daima = Platform.getContent( "\\SETMOD\\ABQGET\\ABQP\\ABQSEL\\COD" );
shenbao = Platform.getContent( "\\SETMOD\\ABQGET\\ABQP\\RPTNO" ); shenbao = Platform.getContent( "\\SETMOD\\ABQGET\\ABQP\\RPTNO" );
break; break;
case "1": case "1":
......
...@@ -58,7 +58,6 @@ void getaboqdate(int index,String ownref,String trninr,String frm,String objinr, ...@@ -58,7 +58,6 @@ void getaboqdate(int index,String ownref,String trninr,String frm,String objinr,
String daima = NULLSTR; String daima = NULLSTR;
String shenbao = NULLSTR; String shenbao = NULLSTR;
String in = NULLSTR; String in = NULLSTR;
String v$daima = NULLSTR;
if( err == 27 ) if( err == 27 )
{ {
ssta = "O"; ssta = "O";
...@@ -83,7 +82,7 @@ void getaboqdate(int index,String ownref,String trninr,String frm,String objinr, ...@@ -83,7 +82,7 @@ void getaboqdate(int index,String ownref,String trninr,String frm,String objinr,
ssta = "O"; ssta = "O";
in = "Q"; in = "Q";
guojia = Platform.getContent( "\\SETMOD\\ABQGET\\ABQP\\ABQSEL\\COUNTRY" ); guojia = Platform.getContent( "\\SETMOD\\ABQGET\\ABQP\\ABQSEL\\COUNTRY" );
v$daima = Platform.getContent( "\\SETMOD\\ABQGET\\ABQP\\ABQSEL\\COD" ); daima = Platform.getContent( "\\SETMOD\\ABQGET\\ABQP\\ABQSEL\\COD" );
shenbao = Platform.getContent( "\\SETMOD\\ABQGET\\ABQP\\RPTNO" ); shenbao = Platform.getContent( "\\SETMOD\\ABQGET\\ABQP\\RPTNO" );
break; break;
case "1": case "1":
......
...@@ -15,7 +15,8 @@ void checkADRBIC(String argbic) ...@@ -15,7 +15,8 @@ void checkADRBIC(String argbic)
String num = "0123456789"; String num = "0123456789";
// position 1-4 Bank-Code A-Z are allowed // position 1-4 Bank-Code A-Z are allowed
// position 5-6 Country-Code A-Z are allowed // position 5-6 Country-Code A-Z are allowed
for(int i = 1;i <= 6;i++) int i = 1;
for(i = 1;i <= 6;i++)
{ {
if( Platform.pos( let, Platform.mid( bic, i, 1 ) ) == 0 ) if( Platform.pos( let, Platform.mid( bic, i, 1 ) ) == 0 )
{ {
...@@ -39,7 +40,7 @@ void checkADRBIC(String argbic) ...@@ -39,7 +40,7 @@ void checkADRBIC(String argbic)
// position 9-11 Branch-Code A-Z and 0-9 are allowed // position 9-11 Branch-Code A-Z and 0-9 are allowed
if( Platform.len( bic ) > 8 ) if( Platform.len( bic ) > 8 )
{ {
for(int i = 9;i <= 11;i++) for(i = 9;i <= 11;i++)
{ {
if( Platform.pos( let, Platform.mid( bic, i, 1 ) ) == 0 && Platform.pos( num, Platform.mid( bic, i, 1 ) ) == 0 ) if( Platform.pos( let, Platform.mid( bic, i, 1 ) ) == 0 && Platform.pos( num, Platform.mid( bic, i, 1 ) ) == 0 )
{ {
......
...@@ -4,7 +4,7 @@ boolean atcConditionTrue(String argignflg,String argcnd,String argcndfld1typ,Str ...@@ -4,7 +4,7 @@ boolean atcConditionTrue(String argignflg,String argcnd,String argcndfld1typ,Str
if( ! Platform.isEmpty( argignflg ) ) if( ! Platform.isEmpty( argignflg ) )
{ {
res = false; res = false;
return ; // #######TODO 改写 LABEL与GOTO #### goto done return res; // #######TODO 改写 LABEL与GOTO #### goto done
} }
String field1 = ""; String field1 = "";
String errTxt = NULLSTR; String errTxt = NULLSTR;
...@@ -22,7 +22,7 @@ boolean atcConditionTrue(String argignflg,String argcnd,String argcndfld1typ,Str ...@@ -22,7 +22,7 @@ boolean atcConditionTrue(String argignflg,String argcnd,String argcndfld1typ,Str
errTxt = Platform.getErrorText(); errTxt = Platform.getErrorText();
atcCallSysdumpInfo( "ATC\\CNDFLD1", argcndfld1, errTxt ); atcCallSysdumpInfo( "ATC\\CNDFLD1", argcndfld1, errTxt );
res = false; res = false;
return ; // #######TODO 改写 LABEL与GOTO #### goto done return res; // #######TODO 改写 LABEL与GOTO #### goto done
} }
} }
} }
...@@ -41,7 +41,7 @@ boolean atcConditionTrue(String argignflg,String argcnd,String argcndfld1typ,Str ...@@ -41,7 +41,7 @@ boolean atcConditionTrue(String argignflg,String argcnd,String argcndfld1typ,Str
errTxt = Platform.getErrorText(); errTxt = Platform.getErrorText();
atcCallSysdumpInfo( "ATC\\CNDFLD2", argcndfld2, errTxt ); atcCallSysdumpInfo( "ATC\\CNDFLD2", argcndfld2, errTxt );
res = false; res = false;
return ; // #######TODO 改写 LABEL与GOTO #### goto done return res; // #######TODO 改写 LABEL与GOTO #### goto done
} }
} }
} }
......
...@@ -7,7 +7,7 @@ String bolPrintHeader(String msgtype) ...@@ -7,7 +7,7 @@ String bolPrintHeader(String msgtype)
if( Platform.isEmpty( rid ) ) if( Platform.isEmpty( rid ) )
{ {
Platform.setErrorCode( 810, "Empty own RID" ); Platform.setErrorCode( 810, "Empty own RID" );
if(1==1) return; if(1==1) return "";
} }
Platform.printTemp( "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"); Platform.printTemp( "<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
Platform.printTemp( "<Message ProtocolVersion=\"3.0\" ClientSoftware=\"DOKA Bolero Interface Version: 2.0.0.1 (Mon Jun 27 18:00:00 2005) by: DOS GmbH\">"); Platform.printTemp( "<Message ProtocolVersion=\"3.0\" ClientSoftware=\"DOKA Bolero Interface Version: 2.0.0.1 (Mon Jun 27 18:00:00 2005) by: DOS GmbH\">");
......
...@@ -8,7 +8,7 @@ String bolPrintRef(String rid,String reftyp,String refnum,String refsco) ...@@ -8,7 +8,7 @@ String bolPrintRef(String rid,String reftyp,String refnum,String refsco)
if( idx > 0 ) if( idx > 0 )
{ {
// reference already printed // reference already printed
if(1==1) return; if(1==1) return "";
} }
else else
{ {
...@@ -17,13 +17,13 @@ String bolPrintRef(String rid,String reftyp,String refnum,String refsco) ...@@ -17,13 +17,13 @@ String bolPrintRef(String rid,String reftyp,String refnum,String refsco)
if( $refcnt.getValue() >= 30 ) if( $refcnt.getValue() >= 30 )
{ {
Platform.setErrorCode( 802, "More then 29 references" ); Platform.setErrorCode( 802, "More then 29 references" );
if(1==1) return; if(1==1) return "";
} }
$refcnt = $refcnt.getValue() + 1; $refcnt = $refcnt.getValue() + 1;
if( Platform.isEmpty( rid ) ) if( Platform.isEmpty( rid ) )
{ {
Platform.setErrorCode( 810, "Empty receiver RID" ); Platform.setErrorCode( 810, "Empty receiver RID" );
if(1==1) return; if(1==1) return "";
} }
Platform.printTemp( " <Reference>"); Platform.printTemp( " <Reference>");
Platform.printTemp( " <RID>" , rid , "</RID>"); Platform.printTemp( " <RID>" , rid , "</RID>");
......
...@@ -5,7 +5,7 @@ String bolPrintSubject(String subject) ...@@ -5,7 +5,7 @@ String bolPrintSubject(String subject)
if( Platform.isEmpty( subject ) ) if( Platform.isEmpty( subject ) )
{ {
Platform.setErrorCode( 999, "subject missing for message" ); Platform.setErrorCode( 999, "subject missing for message" );
if(1==1) return; if(1==1) return "";
} }
String vsubject = subject; String vsubject = subject;
if( Platform.len( vsubject ) > 80 ) if( Platform.len( vsubject ) > 80 )
......
...@@ -20,14 +20,14 @@ String bolPrintReceiver(String rid) ...@@ -20,14 +20,14 @@ String bolPrintReceiver(String rid)
if( Platform.isEmpty( vrid ) ) if( Platform.isEmpty( vrid ) )
{ {
Platform.setErrorCode( 999, "empty receiver RID" ); Platform.setErrorCode( 999, "empty receiver RID" );
if(1==1) return; if(1==1) return "";
} }
// avoid duplicate insertion of same receiver // avoid duplicate insertion of same receiver
int idx = Platform.streamSearch( $recstream, vrid ); int idx = Platform.streamSearch( $recstream, vrid );
if( idx > 0 ) if( idx > 0 )
{ {
// rid already printed // rid already printed
if(1==1) return; if(1==1) return "";
} }
else else
{ {
...@@ -36,7 +36,7 @@ String bolPrintReceiver(String rid) ...@@ -36,7 +36,7 @@ String bolPrintReceiver(String rid)
if( $reccnt.getValue() >= 30 ) if( $reccnt.getValue() >= 30 )
{ {
Platform.setErrorCode( 800, "More then 29 receiver" ); Platform.setErrorCode( 800, "More then 29 receiver" );
if(1==1) return; if(1==1) return "";
} }
$reccnt = $reccnt.getValue() + 1; $reccnt = $reccnt.getValue() + 1;
Platform.printTemp( " <Receiver>"); Platform.printTemp( " <Receiver>");
......
...@@ -28,11 +28,11 @@ void bolOther(String arginfo) ...@@ -28,11 +28,11 @@ void bolOther(String arginfo)
} }
if( ! Platform.isEmpty( appRul ) ) if( ! Platform.isEmpty( appRul ) )
{ {
switch( $\sysmod\atp\cod.getValue() ) String busamt = ctx.absGet(Sysmod.class).getAtp().getBus() + "TAME";
{ String busram = ctx.absGet(Sysmod.class).getAtp().getBus() + "TRAM";
case $\sysmod\atp\bus.getValue() + "TAME": String busopn = ctx.absGet(Sysmod.class).getAtp().getBus() + "TOPN";
case $\sysmod\atp\bus.getValue() + "TRAM": String atpcod = ctx.absGet(Sysmod.class).getAtp().getCod();
case $\sysmod\atp\bus.getValue() + "TOPN": if(atpcod.equals(busamt) || atpcod.equals(busram) || atpcod.equals(busopn)){
if( Platform.compareTo(Platform.getContent( $grppth.getValue() + "\\" + $\sysmod\atp\bus.getValue() + "DGRP\\REC\\APPRUL" ), Platform.getContent( $grppth.getValue() + "\\OLD" + $\sysmod\atp\bus.getValue() + "DGRP\\REC\\APPRUL" )) != 0 ) if( Platform.compareTo(Platform.getContent( $grppth.getValue() + "\\" + $\sysmod\atp\bus.getValue() + "DGRP\\REC\\APPRUL" ), Platform.getContent( $grppth.getValue() + "\\OLD" + $\sysmod\atp\bus.getValue() + "DGRP\\REC\\APPRUL" )) != 0 )
{ {
if( ! done ) if( ! done )
...@@ -43,9 +43,6 @@ void bolOther(String arginfo) ...@@ -43,9 +43,6 @@ void bolOther(String arginfo)
bolTextTag( "otherType", "documentaryCreditRulesType" ); bolTextTag( "otherType", "documentaryCreditRulesType" );
bolLines( appRul ); bolLines( appRul );
} }
break;
default:
// nothing to do
} }
} }
if( done ) if( done )
......
...@@ -3,7 +3,7 @@ void bolAmountTag(String tag,String argcurrency,BigDecimal argamount) ...@@ -3,7 +3,7 @@ void bolAmountTag(String tag,String argcurrency,BigDecimal argamount)
//! Print amount with currency in Bolero XML Format xxxx.xx //! Print amount with currency in Bolero XML Format xxxx.xx
//! If no tag is omitted, the tag will not printed //! If no tag is omitted, the tag will not printed
// convert amount into BOL format // convert amount into BOL format
int absAmt = Platform.abs( argamount ); int absAmt = Platform.abs( argamount ).intValue();
String dectxt = Platform.fmtAmount( absAmt - Platform.floor( absAmt ), argcurrency, "EN" ); String dectxt = Platform.fmtAmount( absAmt - Platform.floor( absAmt ), argcurrency, "EN" );
dectxt = Platform.mid( dectxt, 3, Platform.len( dectxt ) - 2 ); dectxt = Platform.mid( dectxt, 3, Platform.len( dectxt ) - 2 );
String amount = Platform.toString( Platform.floor( absAmt ) ) + "." + dectxt; String amount = Platform.toString( Platform.floor( absAmt ) ) + "." + dectxt;
......
...@@ -15,7 +15,7 @@ void bolDocumentaryCreditAmountChange(String argcur,int argamt) ...@@ -15,7 +15,7 @@ void bolDocumentaryCreditAmountChange(String argcur,int argamt)
{ {
tag = "IncreaseAmount"; tag = "IncreaseAmount";
} }
bolAmountTag( tag, argcur, Platform.abs( argamt ) ); bolAmountTag( tag, argcur, Platform.abs( new BigDecimal(argamt ) ) );
Platform.printTemp( "</DocumentaryCreditAmountChange>"); Platform.printTemp( "</DocumentaryCreditAmountChange>");
} }
......
...@@ -4,7 +4,7 @@ void bolDocumentaryCreditSettlementAmount(String argcur,int argamt) ...@@ -4,7 +4,7 @@ void bolDocumentaryCreditSettlementAmount(String argcur,int argamt)
//! ArgAmt : Defines the amount //! ArgAmt : Defines the amount
if( argamt != 0 ) if( argamt != 0 )
{ {
bolAmountTag( "DocumentaryCreditSettlementAmount", argcur, argamt ); bolAmountTag( "DocumentaryCreditSettlementAmount", argcur, new BigDecimal(argamt ) );
} }
} }
\ No newline at end of file
...@@ -13,7 +13,7 @@ void bolGuaranteeAmountChange(String argcur,int argamt) ...@@ -13,7 +13,7 @@ void bolGuaranteeAmountChange(String argcur,int argamt)
{ {
tag = "DecreaseAmount"; tag = "DecreaseAmount";
} }
bolAmountTag( tag, argcur, Platform.abs( argamt ) ); bolAmountTag( tag, argcur, Platform.abs( new BigDecimal(argamt ) ) );
Platform.printTemp( "</GuaranteeAmountChange>"); Platform.printTemp( "</GuaranteeAmountChange>");
} }
......
...@@ -3,7 +3,7 @@ void bolGuaranteeObject(String argcur,int argamt,int argpercent,String argothert ...@@ -3,7 +3,7 @@ void bolGuaranteeObject(String argcur,int argamt,int argpercent,String argothert
Platform.printTemp( "<GuaranteeObject>"); Platform.printTemp( "<GuaranteeObject>");
if( ! Platform.isEmpty( argcur ) ) if( ! Platform.isEmpty( argcur ) )
{ {
bolAmountTag( "GuaranteeObjectAmount", argcur, argamt ); bolAmountTag( "GuaranteeObjectAmount", argcur, new BigDecimal(argamt ) );
} }
if( argpercent != 0 ) if( argpercent != 0 )
{ {
......
...@@ -19,7 +19,7 @@ String cbsGetAllExtIds(IModule obj,String cbcarg) ...@@ -19,7 +19,7 @@ String cbsGetAllExtIds(IModule obj,String cbcarg)
Platform.dbSelectCursor( $cbb, sql ); Platform.dbSelectCursor( $cbb, sql );
// #######TODO 改写 LABEL与GOTO #### label CBBLoop // #######TODO 改写 LABEL与GOTO #### label CBBLoop
Platform.DBFetch( $cbb ); Platform.DBFetch( $cbb );
if( Platform.errorCode() <= 0 ) while( Platform.errorCode() <= 0 )
{ {
if( Platform.compareTo(lastId, $cbb\extid.getValue()) != 0 ) if( Platform.compareTo(lastId, $cbb\extid.getValue()) != 0 )
{ {
...@@ -40,7 +40,7 @@ String cbsGetAllExtIds(IModule obj,String cbcarg) ...@@ -40,7 +40,7 @@ String cbsGetAllExtIds(IModule obj,String cbcarg)
} }
lastId = $cbb\extid; lastId = $cbb\extid;
} }
return ; // #######TODO 改写 LABEL与GOTO #### goto CBBLoop continue ; // #######TODO 改写 LABEL与GOTO #### goto CBBLoop
} }
if( ! Platform.isEmpty( emptyId ) ) if( ! Platform.isEmpty( emptyId ) )
{ {
......
...@@ -14,7 +14,7 @@ String cbsGetUnbalancedExtIds(IModule obj,String cbcarg) ...@@ -14,7 +14,7 @@ String cbsGetUnbalancedExtIds(IModule obj,String cbcarg)
Platform.dbSelectCursor( $cbb, sql ); Platform.dbSelectCursor( $cbb, sql );
// #######TODO 改写 LABEL与GOTO #### label CBBLoop // #######TODO 改写 LABEL与GOTO #### label CBBLoop
Platform.DBFetch( $cbb ); Platform.DBFetch( $cbb );
if( Platform.errorCode() <= 0 ) while( Platform.errorCode() <= 0 )
{ {
if( Platform.compareTo(lastId, $cbb\extid.getValue()) != 0 ) if( Platform.compareTo(lastId, $cbb\extid.getValue()) != 0 )
{ {
...@@ -38,7 +38,7 @@ String cbsGetUnbalancedExtIds(IModule obj,String cbcarg) ...@@ -38,7 +38,7 @@ String cbsGetUnbalancedExtIds(IModule obj,String cbcarg)
} }
lastId = $cbb\extid; lastId = $cbb\extid;
} }
return ; // #######TODO 改写 LABEL与GOTO #### goto CBBLoop continue ; // #######TODO 改写 LABEL与GOTO #### goto CBBLoop
} }
if( ! Platform.isEmpty( emptyId ) ) if( ! Platform.isEmpty( emptyId ) )
{ {
......
...@@ -10,40 +10,42 @@ String internalGenSqlSet(String argliste) ...@@ -10,40 +10,42 @@ String internalGenSqlSet(String argliste)
// from "Arg1,Arg2,..." in " IN (`Arg1`, `Arg2`,...)" // from "Arg1,Arg2,..." in " IN (`Arg1`, `Arg2`,...)"
// Initialize workregister // Initialize workregister
int begPos = 1; int begPos = 1;
String rtn = NULLSTR;
IStream argstm = new StreamImpl(); IStream argstm = new StreamImpl();
Platform.streamClear( argstm ); Platform.streamClear( argstm );
// #######TODO 改写 LABEL与GOTO #### label NxtElm // #######TODO 改写 LABEL与GOTO #### label NxtElm
// Search for next delimiter // Search for next delimiter
int len = Platform.pos( Platform.mid( argliste, begPos ), "," ); while(begPos <= MdaUtilsEx.len(argliste)) {
String rtn = NULLSTR; int len = Platform.pos( Platform.mid( argliste, begPos ), "," );
if( len == 0 ) if( len == 0 )
{ {
// if no delimiter found, check whether first arg to avoid // if no delimiter found, check whether first arg to avoid
// "IN set" construct and take "= literal" // "IN set" construct and take "= literal"
if( begPos == 1 ) if( begPos == 1 )
{ {
rtn = " = " + Platform.sqlLit( argliste ); rtn = " = " + Platform.sqlLit( argliste );
return ; // #######TODO 改写 LABEL与GOTO #### goto Done return rtn; // #######TODO 改写 LABEL与GOTO #### goto Done
} }
// if no delimiter found, take rest // if no delimiter found, take rest
len = Platform.len( Platform.mid( argliste, begPos ) ) + 1; len = Platform.len( Platform.mid( argliste, begPos ) ) + 1;
} }
// If a value has to be processed // If a value has to be processed
String elm = NULLSTR; String elm = NULLSTR;
if( len > 1 ) if( len > 1 )
{ {
// eliminate leading and trailing spaces // eliminate leading and trailing spaces
elm = Platform.trim( Platform.mid( argliste, begPos, len - 1 ) ); elm = Platform.trim( Platform.mid( argliste, begPos, len - 1 ) );
// search for double entries and include only new entries // search for double entries and include only new entries
if( Platform.streamSearch( argstm, elm ) == 0 ) if( Platform.streamSearch( argstm, elm ) == 0 )
{ {
Platform.streamInsert( argstm, -1, elm ); Platform.streamInsert( argstm, -1, elm );
} }
begPos = begPos + len; begPos = begPos + len;
if( begPos <= Platform.len( argliste ) ) if( begPos <= Platform.len( argliste ) )
{ {
return ; // #######TODO 改写 LABEL与GOTO #### goto NxtElm continue; // #######TODO 改写 LABEL与GOTO #### goto NxtElm
} }
}
} }
// transform list of values into the set format // transform list of values into the set format
String list = ""; String list = "";
......
...@@ -2,7 +2,7 @@ event $hotsub1 order 1000 ...@@ -2,7 +2,7 @@ event $hotsub1 order 1000
{ {
if( ! Platform.isEmpty( $subtrn1 ) ) if( ! Platform.isEmpty( $subtrn1 ) )
{ // may be header { // may be header
if( !( Platform.compareTo( Platform.getAttributeText( $subtxt1.getValue(), "Style" ) , "Disabled") ) == 0 ) if( ( Platform.compareTo( Platform.getAttributeText( $subtxt1.getValue(), "Style" ) , "Disabled") ) != 0 )
{ {
saveConDataAndCallTrn( $subtrn1.getValue() ); saveConDataAndCallTrn( $subtrn1.getValue() );
} }
......
event $hotsub2 order 1000 event $hotsub2 order 1000
{ {
if( !( Platform.compareTo( Platform.getAttributeText( $subtxt2.getValue(), "Style" ) , "Disabled") ) == 0 ) if( ( Platform.compareTo( Platform.getAttributeText( $subtxt2.getValue(), "Style" ) , "Disabled") ) != 0 )
{ {
saveConDataAndCallTrn( $subtrn2.getValue() ); saveConDataAndCallTrn( $subtrn2.getValue() );
} }
......
event $hotsub10 order 1000 event $hotsub10 order 1000
{ {
if( !( Platform.compareTo( Platform.getAttributeText( $subtxt10.getValue(), "Style" ) , "Disabled") ) == 0 ) if( ( Platform.compareTo( Platform.getAttributeText( $subtxt10.getValue(), "Style" ) , "Disabled") ) != 0 )
{ {
saveConDataAndCallTrn( $subtrn10.getValue() ); saveConDataAndCallTrn( $subtrn10.getValue() );
} }
......
event $hotsub11 order 1000 event $hotsub11 order 1000
{ {
if( !( Platform.compareTo( Platform.getAttributeText( $subtxt11.getValue(), "Style" ) , "Disabled") ) == 0 ) if( ( Platform.compareTo( Platform.getAttributeText( $subtxt11.getValue(), "Style" ) , "Disabled") ) != 0 )
{ {
saveConDataAndCallTrn( $subtrn11.getValue() ); saveConDataAndCallTrn( $subtrn11.getValue() );
} }
......
event $hotsub3 order 1000 event $hotsub3 order 1000
{ {
if( !( Platform.compareTo( Platform.getAttributeText( $subtxt3.getValue(), "Style" ) , "Disabled") ) == 0 ) if( ( Platform.compareTo( Platform.getAttributeText( $subtxt3.getValue(), "Style" ) , "Disabled") ) != 0 )
{ {
saveConDataAndCallTrn( $subtrn3.getValue() ); saveConDataAndCallTrn( $subtrn3.getValue() );
} }
......
event $hotsub4 order 1000 event $hotsub4 order 1000
{ {
if( !( Platform.compareTo( Platform.getAttributeText( $subtxt4.getValue(), "Style" ) , "Disabled") ) == 0 ) if( ( Platform.compareTo( Platform.getAttributeText( $subtxt4.getValue(), "Style" ) , "Disabled") ) != 0 )
{ {
saveConDataAndCallTrn( $subtrn4.getValue() ); saveConDataAndCallTrn( $subtrn4.getValue() );
} }
......
event $hotsub5 order 1000 event $hotsub5 order 1000
{ {
if( !( Platform.compareTo( Platform.getAttributeText( $subtxt5.getValue(), "Style" ) , "Disabled") ) == 0 ) if( ( Platform.compareTo( Platform.getAttributeText( $subtxt5.getValue(), "Style" ) , "Disabled") ) != 0 )
{ {
saveConDataAndCallTrn( $subtrn5.getValue() ); saveConDataAndCallTrn( $subtrn5.getValue() );
} }
......
event $hotsub6 order 1000 event $hotsub6 order 1000
{ {
if( !( Platform.compareTo( Platform.getAttributeText( $subtxt6.getValue(), "Style" ) , "Disabled") ) == 0 ) if( ( Platform.compareTo( Platform.getAttributeText( $subtxt6.getValue(), "Style" ) , "Disabled") ) != 0 )
{ {
saveConDataAndCallTrn( $subtrn6.getValue() ); saveConDataAndCallTrn( $subtrn6.getValue() );
} }
......
event $hotsub7 order 1000 event $hotsub7 order 1000
{ {
if( !( Platform.compareTo( Platform.getAttributeText( $subtxt7.getValue(), "Style" ) , "Disabled") ) == 0 ) if( ( Platform.compareTo( Platform.getAttributeText( $subtxt7.getValue(), "Style" ) , "Disabled") ) != 0 )
{ {
saveConDataAndCallTrn( $subtrn7.getValue() ); saveConDataAndCallTrn( $subtrn7.getValue() );
} }
......
event $hotsub8 order 1000 event $hotsub8 order 1000
{ {
if( !( Platform.compareTo( Platform.getAttributeText( $subtxt8.getValue(), "Style" ) , "Disabled") ) == 0 ) if( ( Platform.compareTo( Platform.getAttributeText( $subtxt8.getValue(), "Style" ) , "Disabled") ) != 0 )
{ {
saveConDataAndCallTrn( $subtrn8.getValue() ); saveConDataAndCallTrn( $subtrn8.getValue() );
} }
......
event $hotsub9 order 1000 event $hotsub9 order 1000
{ {
if( !( Platform.compareTo( Platform.getAttributeText( $subtxt9.getValue(), "Style" ) , "Disabled") ) == 0 ) if( ( Platform.compareTo( Platform.getAttributeText( $subtxt9.getValue(), "Style" ) , "Disabled") ) != 0 )
{ {
saveConDataAndCallTrn( $subtrn9.getValue() ); saveConDataAndCallTrn( $subtrn9.getValue() );
} }
......
...@@ -19,12 +19,12 @@ void saveConDataAndCallTrn(String argtrn) ...@@ -19,12 +19,12 @@ void saveConDataAndCallTrn(String argtrn)
if( Platform.errorCode() <= 0 ) if( Platform.errorCode() <= 0 )
{ {
que = Platform.prompt( #CT000024, $\sysmod\spt\dattim.getValue() ); que = Platform.prompt( #CT000024, $\sysmod\spt\dattim.getValue() );
if( que == tdPromptYes ) if( que )
{ {
Platform.dbLock( $\sysmod\spt ); Platform.dbLock( $\sysmod\spt );
if( Platform.errorCode() == tdOdbcLocked || Platform.errorCode() == tdOdbcHeld ) if( Platform.errorCode() == tdOdbcLocked || Platform.errorCode() == tdOdbcHeld )
{ {
if( Platform.prompt( #CT000025, $\sysmod\spt\objnam.getValue(), GetLockUID, Platform.fmtTime( GetLockTime ) ) == tdPromptCancel ) if( !que )
{ {
Platform.clear( $\sysmod\spt ); Platform.clear( $\sysmod\spt );
return ; // #######TODO 改写 LABEL与GOTO #### goto LblEnd return ; // #######TODO 改写 LABEL与GOTO #### goto LblEnd
......
...@@ -23,11 +23,11 @@ void xmlStartElement(String elementname,IStream attr) ...@@ -23,11 +23,11 @@ void xmlStartElement(String elementname,IStream attr)
} }
if( ! Platform.isEmpty( $lasttag ) ) if( ! Platform.isEmpty( $lasttag ) )
{ {
printElement( $lev.getValue(), $lasttag.getValue(), "" ); printElement( (int)$lev.getValue(), $lasttag.getValue(), "" );
} }
Platform.clear( $lasttag ); Platform.clear( $lasttag );
pos = Platform.pos( line, "=" ); pos = Platform.pos( line, "=" );
printElement( $lev.getValue() + 1, tag, Platform.mid( line, pos + 1 ) ); printElement( (int)$lev.getValue() + 1, tag, Platform.mid( line, pos + 1 ) );
} }
$lasttag = " content"; $lasttag = " content";
} }
......
...@@ -9,12 +9,12 @@ void xmlEndElement(String elementname) ...@@ -9,12 +9,12 @@ void xmlEndElement(String elementname)
{ {
if( Platform.compareTo(Platform.trim( $lasttag.getValue() ), "content") != 0 ) if( Platform.compareTo(Platform.trim( $lasttag.getValue() ), "content") != 0 )
{ {
printElement( $lev.getValue(), $lasttag.getValue(), "" ); printElement( (int)$lev.getValue(), $lasttag.getValue(), "" );
} }
} }
else else
{ {
printElement( $lev.getValue() - 1, $prelasttag.getValue(), $lasttag.getValue() ); printElement( (int)$lev.getValue() - 1, $prelasttag.getValue(), $lasttag.getValue() );
} }
} }
$lev = $lev.getValue() - 1; $lev = $lev.getValue() - 1;
......
...@@ -10,7 +10,7 @@ void xmlCharacterData(String content) ...@@ -10,7 +10,7 @@ void xmlCharacterData(String content)
} }
else else
{ {
printElement( $lev.getValue(), $lasttag.getValue(), content ); printElement( (int)$lev.getValue(), $lasttag.getValue(), content );
} }
Platform.clear( $lasttag ); Platform.clear( $lasttag );
......
void bolStripContent(Argument<String> content) void bolStripContent(String content)
{ {
String charVar = NULLSTR; String charVar = NULLSTR;
while( true ) while( true )
{ {
charVar = Platform.mid( content.value, 1, 1 ); charVar = Platform.mid( content, 1, 1 );
if( Platform.compareTo(charVar , " ")<0 ) if( Platform.compareTo(charVar , " ")<0 )
{ {
content.value = Platform.mid( content.value, 2 ); content = Platform.mid( content, 2 );
} }
else else
{ {
......
...@@ -37,7 +37,7 @@ void savdoc(#smh argsmh) ...@@ -37,7 +37,7 @@ void savdoc(#smh argsmh)
Platform.sysDump( "Cannot get \\TRNMOD\\TRN\\INR" ); Platform.sysDump( "Cannot get \\TRNMOD\\TRN\\INR" );
Platform.clear( $$argsmh\trninr ); Platform.clear( $$argsmh\trninr );
} }
$$argsmh\trnsub = Platform.getContentNumeric( "\\TRNMOD\\TRN\\SMHNXT" ); $$argsmh\trnsub = Platform.getContentNumeric( "\\TRNMOD\\TRN\\SMHNXT" ).intValue();
if( Platform.errorCode() != 0 ) if( Platform.errorCode() != 0 )
{ {
Platform.sysDump( "Cannot get \\TRNMOD\\TRN\\SMHNXT" ); Platform.sysDump( "Cannot get \\TRNMOD\\TRN\\SMHNXT" );
...@@ -116,7 +116,7 @@ void savdoc(#smh argsmh) ...@@ -116,7 +116,7 @@ void savdoc(#smh argsmh)
Platform.sdbInsert( argsmh ); Platform.sdbInsert( argsmh );
$smhinr = $$argsmh\inr; $smhinr = $$argsmh\inr;
return ; // #######TODO 改写 LABEL与GOTO #### goto done return ; // #######TODO 改写 LABEL与GOTO #### goto done
break; //break;
case "FIL": case "FIL":
$$argsmh\cortyp = "FIL"; $$argsmh\cortyp = "FIL";
$$argsmh\inr = Platform.toString( Platform.dbCounter( "SMH" ), -8 ); $$argsmh\inr = Platform.toString( Platform.dbCounter( "SMH" ), -8 );
...@@ -152,7 +152,7 @@ void savdoc(#smh argsmh) ...@@ -152,7 +152,7 @@ void savdoc(#smh argsmh)
Platform.dbInsert( argsmh ); Platform.dbInsert( argsmh );
$smhinr = $$argsmh\inr; $smhinr = $$argsmh\inr;
return ; // #######TODO 改写 LABEL与GOTO #### goto done return ; // #######TODO 改写 LABEL与GOTO #### goto done
break; //break;
case "INT": case "INT":
// document from this transaction just created or still to be created // document from this transaction just created or still to be created
$$argsmh\orismhinr = $\trnmod\trndoc.docEOTGetORISMHINR( $idref.getValue() ); $$argsmh\orismhinr = $\trnmod\trndoc.docEOTGetORISMHINR( $idref.getValue() );
...@@ -388,7 +388,7 @@ void savdoc(#smh argsmh) ...@@ -388,7 +388,7 @@ void savdoc(#smh argsmh)
case "TCO": case "TCO":
case "TCA": case "TCA":
$\trnmod\trnism.wfmAdd_Tradeconnect ( $$argsmh\cortypsub.getValue() ); $\trnmod\trnism.wfmAdd_Tradeconnect ( $$argsmh\cortypsub.getValue() );
break; //break;
default: default:
proc = "\\TRNMOD\\TRNISM.WfmAdd_" + $$argsmh\cortyp.getValue() + "( \"" + $$argsmh\cortypsub.getValue() + "\")"; proc = "\\TRNMOD\\TRNISM.WfmAdd_" + $$argsmh\cortyp.getValue() + "( \"" + $$argsmh\cortypsub.getValue() + "\")";
Platform.invokeModulePath( proc, -1 ); Platform.invokeModulePath( proc, -1 );
......
...@@ -39,7 +39,7 @@ String getDocRul(String argdocnam,String structure,String execution) ...@@ -39,7 +39,7 @@ String getDocRul(String argdocnam,String structure,String execution)
{ {
return "\\." + pfx + structure + nbr; return "\\." + pfx + structure + nbr;
} }
break; //break;
case "S": // static text function case "S": // static text function
// to extract function name, search for last occurence of backslash // to extract function name, search for last occurence of backslash
for(int idx = Platform.len( pfx );idx >= 1;idx+=-1) for(int idx = Platform.len( pfx );idx >= 1;idx+=-1)
......
...@@ -97,7 +97,7 @@ void make999fromStream() ...@@ -97,7 +97,7 @@ void make999fromStream()
if( Platform.compareTo($cortyp.getValue(), "TCO") != 0 ) if( Platform.compareTo($cortyp.getValue(), "TCO") != 0 )
{ {
reference = $\trnmod\trndoc.swtPrtReference( ":21:", "", $role.getValue() ); reference = $\trnmod\trndoc.swtPrtReference( ":21:", "", $role.getValue() );
if( !( Platform.compareTo( Platform.mid( reference, 5, 6 ) , "NONREF") ) == 0 ) if( ( Platform.compareTo( Platform.mid( reference, 5, 6 ) , "NONREF") ) != 0 )
{ {
Platform.streamInsert( $doctxt.getValue(), 2, Platform.trim( Platform.convertBlock( $\trnmod\trndoc.swtPrtReference( ":21:", "", $role.getValue() ), 1 ) ) ); Platform.streamInsert( $doctxt.getValue(), 2, Platform.trim( Platform.convertBlock( $\trnmod\trndoc.swtPrtReference( ":21:", "", $role.getValue() ), 1 ) ) );
} }
......
...@@ -81,6 +81,6 @@ void popupADD() ...@@ -81,6 +81,6 @@ void popupADD()
Platform.popupTitledFrame( $addinf, Platform.getText( #CT000081, $pandsc.getValue() ) ); Platform.popupTitledFrame( $addinf, Platform.getText( #CT000081, $pandsc.getValue() ) );
} }
// Recalc ADDTXTTXM\BUTTXMSEL to ensure that button is enabled // Recalc ADDTXTTXM\BUTTXMSEL to ensure that button is enabled
Platform.recalc( $addtxttxm\buttxmsel.getValue() ); //Platform.recalc( $addtxttxm\buttxmsel.getValue() );
} }
\ No newline at end of file
...@@ -90,6 +90,7 @@ void setApf(boolean panelvisibleflag) ...@@ -90,6 +90,7 @@ void setApf(boolean panelvisibleflag)
String typ = NULLSTR; String typ = NULLSTR;
int cnt = 0; int cnt = 0;
String edtflg = NULLSTR; String edtflg = NULLSTR;
int nxt = 1;
if( ! Platform.isEmpty( $apf ) ) if( ! Platform.isEmpty( $apf ) )
{ {
etySql = Platform.sdbEtyGenTblSql( "APF", "", "", "" ); etySql = Platform.sdbEtyGenTblSql( "APF", "", "", "" );
...@@ -106,7 +107,7 @@ void setApf(boolean panelvisibleflag) ...@@ -106,7 +107,7 @@ void setApf(boolean panelvisibleflag)
typ = ""; typ = "";
cnt = 0; cnt = 0;
edtflg = ""; edtflg = "";
Platform.dbExecuteSql( sql, msg ); Platform.dbExecuteSql( sql );
while( Platform.errorCode() <= 0 ) while( Platform.errorCode() <= 0 )
{ {
Platform.dbFetchFields( "TYP", typ, "CNT", cnt, "EDTFLG", edtflg ); Platform.dbFetchFields( "TYP", typ, "CNT", cnt, "EDTFLG", edtflg );
...@@ -129,7 +130,7 @@ void setApf(boolean panelvisibleflag) ...@@ -129,7 +130,7 @@ void setApf(boolean panelvisibleflag)
} }
} }
stmCnt = Platform.streamCount( apfstream ); stmCnt = Platform.streamCount( apfstream );
for(int nxt = 1;nxt <= stmCnt;nxt++) for(nxt = 1;nxt <= stmCnt;nxt++)
{ {
line = Platform.getLine( apfstream, nxt ); line = Platform.getLine( apfstream, nxt );
typ = Platform.mid( line, 1, 3 ); typ = Platform.mid( line, 1, 3 );
......
...@@ -2,17 +2,17 @@ default $butdel order 1000 ...@@ -2,17 +2,17 @@ default $butdel order 1000
{ {
if( Platform.compareTo($delflg, "D" )== 0 ) if( Platform.compareTo($delflg, "D" )== 0 )
{ {
Platform.setDescription( $butdel.getValue(), #CT000077 ); //Platform.setDescription( $butdel.getValue(), #CT000077 );
} }
else else
{ {
if( Platform.compareTo($lev, "1" )== 0 || ! Platform.isEmpty( $mliflg ) ) if( Platform.compareTo($lev, "1" )== 0 || ! Platform.isEmpty( $mliflg ) )
{ {
Platform.setDescription( $butdel.getValue(), #CT000078 ); //Platform.setDescription( $butdel.getValue(), #CT000078 );
} }
else else
{ {
Platform.setDescription( $butdel.getValue(), #CT000079 ); //Platform.setDescription( $butdel.getValue(), #CT000079 );
} }
} }
......
...@@ -2,11 +2,11 @@ default $pandsc order 1000 ...@@ -2,11 +2,11 @@ default $pandsc order 1000
{ {
if( Platform.compareTo($delflg, "D" )== 0 ) if( Platform.compareTo($delflg, "D" )== 0 )
{ {
Platform.setTDStyle( "Disabled", $pandsc, $role, $cortyp, $docsnf, $docuil, $apf, $apfcpy1, $apfcpy2, $butshw, $butsnd ); //Platform.setTDStyle( "Disabled", $pandsc, $role, $cortyp, $docsnf, $docuil, $apf, $apfcpy1, $apfcpy2, $butshw, $butsnd );
} }
else else
{ {
Platform.setTDStyle( "", $pandsc, $role, $cortyp, $docsnf, $docuil, $apf, $apfcpy1, $apfcpy2, $butshw, $butsnd ); //Platform.setTDStyle( "", $pandsc, $role, $cortyp, $docsnf, $docuil, $apf, $apfcpy1, $apfcpy2, $butshw, $butsnd );
} }
} }
\ No newline at end of file
void setInvisible() void setInvisible()
{ {
//! Set this DOCEOT (i.e. line inmessage grid) to invisible (as far as possible) //! Set this DOCEOT (i.e. line inmessage grid) to invisible (as far as possible)
Platform.invisible( this ); //Platform.invisible( this );
Platform.disable( $cortyp, $docsnf, $docuil, $apf, $butshw, $butadd ); //Platform.disable( $cortyp, $docsnf, $docuil, $apf, $butshw, $butadd );
} }
\ No newline at end of file
...@@ -11,7 +11,7 @@ String getCORTYPValuesPopup() ...@@ -11,7 +11,7 @@ String getCORTYPValuesPopup()
{ {
if( Platform.searchBlock( $valcortyp.getValue(), cortyp ) == 0 ) if( Platform.searchBlock( $valcortyp.getValue(), cortyp ) == 0 )
{ {
return ; // #######TODO 改写 LABEL与GOTO #### goto NextIdx return setval = setval + cortyp + "\r\n"; // #######TODO 改写 LABEL与GOTO #### goto NextIdx
} }
} }
setval = setval + cortyp + "\r\n"; setval = setval + cortyp + "\r\n";
......
...@@ -44,12 +44,12 @@ void setLang() ...@@ -44,12 +44,12 @@ void setLang()
panref = Platform.getPanel( docruluse ); panref = Platform.getPanel( docruluse );
if( Platform.errorCode() == 0 ) if( Platform.errorCode() == 0 )
{ {
languages = Platform.getPanelInfo( panref, 6 ); languages = Platform.getPanelInfo( panref, "6" );
Platform.setFieldValue( $docuil, languages ); Platform.setFieldValue( $docuil, languages );
if( Platform.pos( languages, $docuil.getValue() ) == 0 ) if( Platform.pos( languages, $docuil.getValue() ) == 0 )
{ {
// if language is not available, use default language // if language is not available, use default language
$docuil = Platform.getPanelInfo( panref, 5 ); $docuil = Platform.getPanelInfo( panref, "5" );
} }
} }
} }
......
...@@ -59,15 +59,15 @@ String determineConversion() ...@@ -59,15 +59,15 @@ String determineConversion()
return ""; return "";
} }
$docexe = pathBox2.value; //$docexe = pathBox2.value;
} }
$docexe = pathBox1.value; //$docexe = pathBox1.value;
} }
$docexe = pathBox.value; //$docexe = pathBox.value;
break; break;
case "TLX": // Telex case "TLX": // Telex
...@@ -99,17 +99,17 @@ String determineConversion() ...@@ -99,17 +99,17 @@ String determineConversion()
return ""; return "";
} }
$docexe = pathBox5.value; //$docexe = pathBox5.value;
} }
$docexe = pathBox4.value; //$docexe = pathBox4.value;
} }
$docexe = pathBox3.value; //$docexe = pathBox3.value;
break; //break;
case "TCO": // TradeConnect case "TCO": // TradeConnect
$docstr = "T"; $docstr = "T";
Argument<String> pathBox6 = new Argument<String>("",$docexe.getValue()); Argument<String> pathBox6 = new Argument<String>("",$docexe.getValue());
...@@ -138,13 +138,13 @@ String determineConversion() ...@@ -138,13 +138,13 @@ String determineConversion()
return ""; return "";
} }
$docexe = pathBox7.value; //$docexe = pathBox7.value;
} }
$docexe = pathBox6.value; //$docexe = pathBox6.value;
break; //break;
case "DTA": // DTA case "DTA": // DTA
$docstr = "A"; $docstr = "A";
Argument<String> pathBox8 = new Argument<String>("",$docexe.getValue()); Argument<String> pathBox8 = new Argument<String>("",$docexe.getValue());
...@@ -165,9 +165,9 @@ String determineConversion() ...@@ -165,9 +165,9 @@ String determineConversion()
return ""; return "";
} }
$docexe = pathBox8.value; //$docexe = pathBox8.value;
break; //break;
case "DTE": // DTE case "DTE": // DTE
$docstr = "E"; $docstr = "E";
Argument<String> pathBox9 = new Argument<String>("",$docexe.getValue()); Argument<String> pathBox9 = new Argument<String>("",$docexe.getValue());
...@@ -188,9 +188,9 @@ String determineConversion() ...@@ -188,9 +188,9 @@ String determineConversion()
return ""; return "";
} }
$docexe = pathBox9.value; //$docexe = pathBox9.value;
break; //break;
case "RTG": case "RTG":
case "TAR": // RTGSplus case "TAR": // RTGSplus
$docstr = "R"; $docstr = "R";
...@@ -200,9 +200,9 @@ String determineConversion() ...@@ -200,9 +200,9 @@ String determineConversion()
return "SetSwift ExecRule"; return "SetSwift ExecRule";
} }
$docexe = pathBox10.value; //$docexe = pathBox10.value;
break; //break;
case "BOL": // Bolero case "BOL": // Bolero
$docstr = "B"; $docstr = "B";
Argument<String> pathBox11 = new Argument<String>("",$docexe.getValue()); Argument<String> pathBox11 = new Argument<String>("",$docexe.getValue());
...@@ -211,9 +211,9 @@ String determineConversion() ...@@ -211,9 +211,9 @@ String determineConversion()
return ""; return "";
} }
$docexe = pathBox11.value; //$docexe = pathBox11.value;
break; //break;
case "IZV": // DTAUS/IZV case "IZV": // DTAUS/IZV
$docstr = "Z"; $docstr = "Z";
Argument<String> pathBox12 = new Argument<String>("",$docexe.getValue()); Argument<String> pathBox12 = new Argument<String>("",$docexe.getValue());
...@@ -222,9 +222,9 @@ String determineConversion() ...@@ -222,9 +222,9 @@ String determineConversion()
return "SetSwift ExecRule"; return "SetSwift ExecRule";
} }
$docexe = pathBox12.value; //$docexe = pathBox12.value;
break; //break;
case "TXT": // ASCII Text case "TXT": // ASCII Text
$docstr = "J"; $docstr = "J";
Argument<String> pathBox13 = new Argument<String>("",$docexe.getValue()); Argument<String> pathBox13 = new Argument<String>("",$docexe.getValue());
...@@ -233,14 +233,14 @@ String determineConversion() ...@@ -233,14 +233,14 @@ String determineConversion()
return ""; return "";
} }
$docexe = pathBox13.value; //$docexe = pathBox13.value;
break; //break;
case "LET": // Letter is handled directly case "LET": // Letter is handled directly
Platform.setErrorCode( 995, "\'DetermineConversion\' was called with CORTYP=\'LET\'" ); Platform.setErrorCode( 995, "\'DetermineConversion\' was called with CORTYP=\'LET\'" );
return ""; return "";
//Add by byte for EDI Factoring //Add by byte for EDI Factoring
break; //break;
case "EDI": //EDI Factoring case "EDI": //EDI Factoring
$docstr = "F"; $docstr = "F";
Argument<String> pathBox14 = new Argument<String>("",$docexe.getValue()); Argument<String> pathBox14 = new Argument<String>("",$docexe.getValue());
...@@ -249,10 +249,10 @@ String determineConversion() ...@@ -249,10 +249,10 @@ String determineConversion()
return "ExecRule"; return "ExecRule";
} }
$docexe = pathBox14.value; //$docexe = pathBox14.value;
//####### //#######
break; //break;
case "DTF": case "DTF":
$docstr = "D"; $docstr = "D";
Argument<String> pathBox15 = new Argument<String>("",$docexe.getValue()); Argument<String> pathBox15 = new Argument<String>("",$docexe.getValue());
...@@ -261,12 +261,12 @@ String determineConversion() ...@@ -261,12 +261,12 @@ String determineConversion()
return "ExecRule"; return "ExecRule";
} }
$docexe = pathBox15.value; //$docexe = pathBox15.value;
break; //break;
default: default:
Platform.setErrorCode( 994, Platform.formatText( "Conversion for destination CORTYP $1 not specified in \'DetermineConversion\'", $cortyp.getValue() ) ); Platform.setErrorCode( 994, Platform.formatText( "Conversion for destination CORTYP $1 not specified in \'DetermineConversion\'", $cortyp.getValue() ) );
return ""; return "";
} }
return "";
} }
\ No newline at end of file
...@@ -54,7 +54,7 @@ String determineMsgTyp() ...@@ -54,7 +54,7 @@ String determineMsgTyp()
if( Platform.compareTo( Platform.toUpper( Platform.mid( line, 1, 4 ) ) , ":MT:" ) == 0 ) if( Platform.compareTo( Platform.toUpper( Platform.mid( line, 1, 4 ) ) , ":MT:" ) == 0 )
{ {
return Platform.mid( line, 5, 3 ); return Platform.mid( line, 5, 3 );
break; //break;
} }
/** /**
else else
......
...@@ -75,8 +75,8 @@ void printAllTags() ...@@ -75,8 +75,8 @@ void printAllTags()
printMT( oriMT, msgidx ); // if MT was before `EOH` printMT( oriMT, msgidx ); // if MT was before `EOH`
} }
} }
Argument<Integer> pathBox = new Argument<Integer>("",$smh\msgpos.getValue()); Argument<Integer> pathBox = new Argument<Integer>("",(int)$smh\msgpos.getValue());
Argument<Integer> pathBox1 = new Argument<Integer>("",$smh\msglen.getValue()); Argument<Integer> pathBox1 = new Argument<Integer>("",(int)$smh\msglen.getValue());
analyseSwiftStream( pathBox, pathBox1, $smh\cortyp.getValue() ); analyseSwiftStream( pathBox, pathBox1, $smh\cortyp.getValue() );
$smh\msgpos = pathBox.value; $smh\msgpos = pathBox.value;
......
...@@ -4,11 +4,11 @@ void menuSwiftasRaw() ...@@ -4,11 +4,11 @@ void menuSwiftasRaw()
// MenuSwiftasRaw is static to allow call from menu DOCPopup // MenuSwiftasRaw is static to allow call from menu DOCPopup
if( Platform.isEmpty( $ascin ) ) if( Platform.isEmpty( $ascin ) )
{ {
Platform.promptok ( #CT000315 ); //Platform.promptok ( #CT000315 );
} }
else else
{ {
Platform.popupTitledFrame( $prtswtr, Platform.gettext ( #CT000033, $title.getValue() ) ); //Platform.popupTitledFrame( $prtswtr, Platform.gettext ( #CT000033, $title.getValue() ) );
} }
} }
\ No newline at end of file
...@@ -5,7 +5,7 @@ void popupStreamAsSwift(IStream docstream,String intitle,String indir,String inc ...@@ -5,7 +5,7 @@ void popupStreamAsSwift(IStream docstream,String intitle,String indir,String inc
Platform.streamSet( $ascin.getValue(), docstream ); Platform.streamSet( $ascin.getValue(), docstream );
Platform.clear( $filename ); Platform.clear( $filename );
Platform.clear( $msgtxt ); Platform.clear( $msgtxt );
Platform.clear( $cn ); Platform.setCn( 0 );
Platform.clear( $smh ); Platform.clear( $smh );
$lastfilename = $filename; $lastfilename = $filename;
$smh\msgpos = 0; $smh\msgpos = 0;
......
...@@ -11,8 +11,8 @@ void includeStreamAsSwift(IStream docstream,String argcortyp) ...@@ -11,8 +11,8 @@ void includeStreamAsSwift(IStream docstream,String argcortyp)
Platform.streamSet( $ascin.getValue(), docstream ); Platform.streamSet( $ascin.getValue(), docstream );
// in order to be able to hanlde multi messages in a stream // in order to be able to hanlde multi messages in a stream
$swtdspflg.setValue ( "A" ); $swtdspflg.setValue ( "A" );
Argument<Integer> pathBox = new Argument<Integer>("",$smh\msgpos.getValue()); Argument<Integer> pathBox = new Argument<Integer>("",(int)$smh\msgpos.getValue());
Argument<Integer> pathBox1 = new Argument<Integer>("",$smh\msglen.getValue()); Argument<Integer> pathBox1 = new Argument<Integer>("",(int)$smh\msglen.getValue());
analyseSwiftStream( pathBox, pathBox1, argcortyp ); analyseSwiftStream( pathBox, pathBox1, argcortyp );
$smh\msgpos = pathBox.value; $smh\msgpos = pathBox.value;
......
...@@ -9,8 +9,8 @@ void makeStreamFromSwt(IStream docstream) ...@@ -9,8 +9,8 @@ void makeStreamFromSwt(IStream docstream)
$smh\msglen = 0; $smh\msglen = 0;
$smh\dir = ""; $smh\dir = "";
$smh\cortyp = "SWT"; $smh\cortyp = "SWT";
Argument<Integer> pathBox = new Argument<Integer>("",$smh\msgpos.getValue()); Argument<Integer> pathBox = new Argument<Integer>("",(int)$smh\msgpos.getValue());
Argument<Integer> pathBox1 = new Argument<Integer>("",$smh\msglen.getValue()); Argument<Integer> pathBox1 = new Argument<Integer>("",(int)$smh\msglen.getValue());
analyseSwiftStream( pathBox, pathBox1, $smh\cortyp.getValue() ); analyseSwiftStream( pathBox, pathBox1, $smh\cortyp.getValue() );
$smh\msgpos = pathBox.value; $smh\msgpos = pathBox.value;
......
...@@ -10,6 +10,7 @@ int splitMsg(IStream msg) ...@@ -10,6 +10,7 @@ int splitMsg(IStream msg)
// tag 20 and 21 are repeated, an additonal tag 79 with no/total is added // tag 20 and 21 are repeated, an additonal tag 79 with no/total is added
// MT760 is split within tag 72C (place for trailing tag 72 is always reserved // MT760 is split within tag 72C (place for trailing tag 72 is always reserved
// tag 20 and 23 are repeated, tag 79 is updated // tag 20 and 23 are repeated, tag 79 is updated
int idx = 1;
int len = 0; // Position of first byte of current line int len = 0; // Position of first byte of current line
int nextidx = 0; // $idx of last tag start int nextidx = 0; // $idx of last tag start
int nextpos = 0; // Byteposition for $nextidx int nextpos = 0; // Byteposition for $nextidx
...@@ -43,7 +44,7 @@ int splitMsg(IStream msg) ...@@ -43,7 +44,7 @@ int splitMsg(IStream msg)
Platform.setContext( tdContextMAXSTEPCOUNT, -1, true ); Platform.setContext( tdContextMAXSTEPCOUNT, -1, true );
String line = NULLSTR; String line = NULLSTR;
String mt = NULLSTR; String mt = NULLSTR;
for(int idx = 1;idx <= Platform.streamCount( $ascin.getValue() );idx++) for(idx = 1;idx <= Platform.streamCount( $ascin.getValue() );idx++)
{ {
line = Platform.trim( Platform.getLine( $ascin.getValue(), idx ) ); line = Platform.trim( Platform.getLine( $ascin.getValue(), idx ) );
if( Platform.compareTo( Platform.mid( line, 1, 5 ) , ":EOH:" ) == 0 ) if( Platform.compareTo( Platform.mid( line, 1, 5 ) , ":EOH:" ) == 0 )
...@@ -196,7 +197,7 @@ int splitMsg(IStream msg) ...@@ -196,7 +197,7 @@ int splitMsg(IStream msg)
int idx72Sub = 0; int idx72Sub = 0;
int idx26E = 0; int idx26E = 0;
int stmCnt = 0; int stmCnt = 0;
for(int idx = 1;idx <= Platform.streamCount( $ascin.getValue() );idx++) for(idx = 1;idx <= Platform.streamCount( $ascin.getValue() );idx++)
{ {
line = rtrim( Platform.getLine( $ascin.getValue(), idx ) ); line = rtrim( Platform.getLine( $ascin.getValue(), idx ) );
// trailing space would lead to differences between Len and ConvertSwift // trailing space would lead to differences between Len and ConvertSwift
...@@ -418,7 +419,7 @@ int splitMsg(IStream msg) ...@@ -418,7 +419,7 @@ int splitMsg(IStream msg)
{ {
// as a split is necessary in case a tag exceeds the 100 lines independent of the size call the split rule anyway // as a split is necessary in case a tag exceeds the 100 lines independent of the size call the split rule anyway
// As the splitting rule might create additional MSGCTL entries directly use the streamcount and no register // As the splitting rule might create additional MSGCTL entries directly use the streamcount and no register
for(int idx = 1;idx <= Platform.streamCount( $msgctl.getValue() );idx++) for(idx = 1;idx <= Platform.streamCount( $msgctl.getValue() );idx++)
{ {
splitMTSwt2018( idx, heaLen ); splitMTSwt2018( idx, heaLen );
} }
...@@ -473,7 +474,7 @@ int splitMsg(IStream msg) ...@@ -473,7 +474,7 @@ int splitMsg(IStream msg)
{ // first message { // first message
if( total > 1 ) if( total > 1 )
{ // replace tag 27 and store tag 20 { // replace tag 27 and store tag 20
for(int idx = startidx;idx <= lastidx;idx++) for(idx = startidx;idx <= lastidx;idx++)
{ {
line = Platform.getLine( $ascin.getValue(), idx ); line = Platform.getLine( $ascin.getValue(), idx );
if( Platform.compareTo( Platform.mid( line, 1, 4 ) , ":27:" ) == 0 ) if( Platform.compareTo( Platform.mid( line, 1, 4 ) , ":27:" ) == 0 )
......
...@@ -18,7 +18,6 @@ String getNewMT(String orimt,int index) ...@@ -18,7 +18,6 @@ String getNewMT(String orimt,int index)
{ {
return "799"; return "799";
} }
break;
case "710": case "710":
return "711"; return "711";
case "720": case "720":
......
...@@ -31,7 +31,7 @@ String getViewerFromSMH(#smh argsmh) ...@@ -31,7 +31,7 @@ String getViewerFromSMH(#smh argsmh)
{ {
return "RAW"; return "RAW";
} }
break; //break;
case "FAX": case "FAX":
if( Platform.compareTo( $$argsmh\dir , ">" ) == 0 && Platform.compareTo( Platform.toLower( $$argsmh\docfxt.getValue() ) , "xml" ) == 0 ) if( Platform.compareTo( $$argsmh\dir , ">" ) == 0 && Platform.compareTo( Platform.toLower( $$argsmh\docfxt.getValue() ) , "xml" ) == 0 )
{ {
...@@ -41,7 +41,7 @@ String getViewerFromSMH(#smh argsmh) ...@@ -41,7 +41,7 @@ String getViewerFromSMH(#smh argsmh)
{ {
return "RAW"; return "RAW";
} }
break; //break;
case "TLX": case "TLX":
return "RAW"; return "RAW";
case "DSP": case "DSP":
......
...@@ -13,8 +13,8 @@ void popupStreamAsSWIFTWithSMH() ...@@ -13,8 +13,8 @@ void popupStreamAsSWIFTWithSMH()
{ {
// display tagged format as `formatted view` // display tagged format as `formatted view`
msglen = $smh\msglen; msglen = $smh\msglen;
Argument<Integer> pathBox = new Argument<Integer>("",$smh\msgpos.getValue()); Argument<Integer> pathBox = new Argument<Integer>("",(int)$smh\msgpos.getValue());
Argument<Integer> msglenBox = new Argument<Integer>("",msglen); Argument<Integer> msglenBox = new Argument<Integer>("",(int)msglen);
analyseSwiftStream( pathBox, msglenBox, $smh\cortyp.getValue() ); analyseSwiftStream( pathBox, msglenBox, $smh\cortyp.getValue() );
$smh\msgpos = pathBox.value; $smh\msgpos = pathBox.value;
......
...@@ -16,7 +16,7 @@ int splitMsgDTAInc() ...@@ -16,7 +16,7 @@ int splitMsgDTAInc()
start = nextA1; start = nextA1;
if( nextA1 > 0 ) if( nextA1 > 0 )
{ {
return ; // #######TODO 改写 LABEL与GOTO #### goto SearchNextA1 return MdaUtils.streamCount(this.getMsgctl()); // #######TODO 改写 LABEL与GOTO #### goto SearchNextA1
} }
return Platform.streamCount( $msgctl.getValue() ); return Platform.streamCount( $msgctl.getValue() );
......
...@@ -213,7 +213,7 @@ void printAllFldStream(boolean printfooterflag) ...@@ -213,7 +213,7 @@ void printAllFldStream(boolean printfooterflag)
{ {
if( ! Platform.isEmpty( exeheader ) || ! Platform.isEmpty( exetag ) || ! Platform.isEmpty( execontent ) ) if( ! Platform.isEmpty( exeheader ) || ! Platform.isEmpty( exetag ) || ! Platform.isEmpty( execontent ) )
{ {
Platform.streamInsert( $msgtxt.getValue(), $cn.getValue(), exetag + "\t" + exeheader + "\r\n" + execontent ); Platform.streamInsert( $msgtxt.getValue(), (int)$cn.getValue(), exetag + "\t" + exeheader + "\r\n" + execontent );
printSwiftLine( exeheader, exetag, execontent, printseparate ); printSwiftLine( exeheader, exetag, execontent, printseparate );
$cn = $cn.getValue() + 1; $cn = $cn.getValue() + 1;
} }
......
...@@ -24,7 +24,7 @@ void printMT(String orimt,int msgidx) ...@@ -24,7 +24,7 @@ void printMT(String orimt,int msgidx)
{ {
content = mt + " " + content; content = mt + " " + content;
} }
Platform.streamInsert( $msgtxt.getValue(), $cn.getValue(), mt + ":" + "\t" + content + "\r\n" + header ); Platform.streamInsert( $msgtxt.getValue(), (int)$cn.getValue(), mt + ":" + "\t" + content + "\r\n" + header );
$cn = $cn.getValue() + 1; $cn = $cn.getValue() + 1;
printSwiftLine( header, mt + ":", content, true ); printSwiftLine( header, mt + ":", content, true );
} }
......
...@@ -54,7 +54,7 @@ void printTimeStamp(String labeltext,String dattag,String timtag) ...@@ -54,7 +54,7 @@ void printTimeStamp(String labeltext,String dattag,String timtag)
time = ""; time = "";
} }
$cn = 1; $cn = 1;
Platform.streamInsert( $msgtxt.getValue(), $cn.getValue(), Platform.mid( dattag, 1, 2 ) + ":" + "\t" + labeltext + "\r\n" + datestring + " " + time ); Platform.streamInsert( $msgtxt.getValue(), (int)$cn.getValue(), Platform.mid( dattag, 1, 2 ) + ":" + "\t" + labeltext + "\r\n" + datestring + " " + time );
printSwiftLine( labeltext, Platform.mid( dattag, 1, 2 ) + ":", datestring + " " + time, true ); printSwiftLine( labeltext, Platform.mid( dattag, 1, 2 ) + ":", datestring + " " + time, true );
$cn = $cn.getValue() + 1; $cn = $cn.getValue() + 1;
} }
......
...@@ -4,7 +4,7 @@ void printAllTagsTCO(IStream docstream,String intitle,String indir,String incort ...@@ -4,7 +4,7 @@ void printAllTagsTCO(IStream docstream,String intitle,String indir,String incort
Platform.streamSet( $ascin.getValue(), docstream ); Platform.streamSet( $ascin.getValue(), docstream );
Platform.clear( $filename ); Platform.clear( $filename );
Platform.clear( $msgtxt ); Platform.clear( $msgtxt );
Platform.clear( $cn ); this.setCn(0);
Platform.clear( $smh ); Platform.clear( $smh );
$smh\dir = indir; $smh\dir = indir;
$smh\cortyp = incortyp; $smh\cortyp = incortyp;
...@@ -70,8 +70,8 @@ void printAllTagsTCO(IStream docstream,String intitle,String indir,String incort ...@@ -70,8 +70,8 @@ void printAllTagsTCO(IStream docstream,String intitle,String indir,String incort
} }
} }
} }
Argument<Integer> pathBox = new Argument<Integer>("",$smh\msgpos.getValue()); Argument<Integer> pathBox = new Argument<Integer>("",(int)$smh\msgpos.getValue());
Argument<Integer> pathBox1 = new Argument<Integer>("",$smh\msglen.getValue()); Argument<Integer> pathBox1 = new Argument<Integer>("",(int)$smh\msglen.getValue());
analyseSwiftStream( pathBox, pathBox1, "SWT" ); analyseSwiftStream( pathBox, pathBox1, "SWT" );
$smh\msgpos = pathBox.value; $smh\msgpos = pathBox.value;
......
...@@ -213,7 +213,7 @@ void printAllFldStreamTCO(boolean printfooterflag) ...@@ -213,7 +213,7 @@ void printAllFldStreamTCO(boolean printfooterflag)
{ {
if( ! Platform.isEmpty( exeheader ) || ! Platform.isEmpty( exetag ) || ! Platform.isEmpty( execontent ) ) if( ! Platform.isEmpty( exeheader ) || ! Platform.isEmpty( exetag ) || ! Platform.isEmpty( execontent ) )
{ {
Platform.streamInsert( $msgtxt.getValue(), $cn.getValue(), exetag + "\t" + exeheader + "\r\n" + execontent ); Platform.streamInsert( $msgtxt.getValue(), (int)$cn.getValue(), exetag + "\t" + exeheader + "\r\n" + execontent );
//PrintSwiftLine( $exeheader, $exetag, $execontent, $printseparate ) //PrintSwiftLine( $exeheader, $exetag, $execontent, $printseparate )
$cn = $cn.getValue() + 1; $cn = $cn.getValue() + 1;
} }
......
...@@ -54,7 +54,7 @@ void printTimeStampTCO(String labeltext,String dattag,String timtag) ...@@ -54,7 +54,7 @@ void printTimeStampTCO(String labeltext,String dattag,String timtag)
time = ""; time = "";
} }
$cn = 1; $cn = 1;
Platform.streamInsert( $msgtxt.getValue(), $cn.getValue(), Platform.mid( dattag, 1, 2 ) + ":" + "\t" + labeltext + "\r\n" + datestring + " " + time ); Platform.streamInsert( $msgtxt.getValue(), (int)$cn.getValue(), Platform.mid( dattag, 1, 2 ) + ":" + "\t" + labeltext + "\r\n" + datestring + " " + time );
//PrintSwiftLine( labeltext, Mid( DatTag, 1, 2 ) + ":", $datestring + " " + $time, TRUE ) //PrintSwiftLine( labeltext, Mid( DatTag, 1, 2 ) + ":", $datestring + " " + $time, TRUE )
$cn = $cn.getValue() + 1; $cn = $cn.getValue() + 1;
} }
......
...@@ -24,7 +24,7 @@ void printMTTCO(String orimt,int msgidx) ...@@ -24,7 +24,7 @@ void printMTTCO(String orimt,int msgidx)
{ {
content = mt + " " + content; content = mt + " " + content;
} }
Platform.streamInsert( $msgtxt.getValue(), $cn.getValue(), mt + ":" + "\t" + content + "\r\n" + header ); Platform.streamInsert( $msgtxt.getValue(), (int)$cn.getValue(), mt + ":" + "\t" + content + "\r\n" + header );
$cn = $cn.getValue() + 1; $cn = $cn.getValue() + 1;
} }
......
...@@ -75,8 +75,8 @@ void printAllTagsTCO1() ...@@ -75,8 +75,8 @@ void printAllTagsTCO1()
printMT( oriMT, msgidx ); // if MT was before `EOH` printMT( oriMT, msgidx ); // if MT was before `EOH`
} }
} }
Argument<Integer> pathBox = new Argument<Integer>("",$smh\msgpos.getValue()); Argument<Integer> pathBox = new Argument<Integer>("",(int)$smh\msgpos.getValue());
Argument<Integer> pathBox1 = new Argument<Integer>("",$smh\msglen.getValue()); Argument<Integer> pathBox1 = new Argument<Integer>("",(int)$smh\msglen.getValue());
analyseSwiftStream( pathBox, pathBox1, $smh\cortyp.getValue() ); analyseSwiftStream( pathBox, pathBox1, $smh\cortyp.getValue() );
$smh\msgpos = pathBox.value; $smh\msgpos = pathBox.value;
......
...@@ -145,19 +145,16 @@ void splitMTSwt2018(int argidx,int arghealen) ...@@ -145,19 +145,16 @@ void splitMTSwt2018(int argidx,int arghealen)
while( sftIdx >= sftBegIdx && Platform.isEmpty( cod ) ) while( sftIdx >= sftBegIdx && Platform.isEmpty( cod ) )
{ {
chkLin = Platform.getLine( $ascin.getValue(), sftIdx ); chkLin = Platform.getLine( $ascin.getValue(), sftIdx );
String subChkLin = Platform.MdaUtilsEx( chkLin, 1, 3 );
String subTagLin = MdaUtilsEx.mid(tagLin,1,3);
// set the continuation code to be used // set the continuation code to be used
switch( Platform.mid( chkLin, 1, 3 ) ) if(subChkLin == "/AD")
{ cod = "/ADD/";
case "/AD": else if(subChkLin == "/RE")
cod = "/ADD/";
break;
case "/RE":
cod = "/REPALL/"; cod = "/REPALL/";
break; else if(subChkLin == "/DE")
case "/DE":
cod = "/DELETE/"; cod = "/DELETE/";
break; else if(subChkLin == subTagLin){
case Platform.mid( tagLin, 1, 3 ):
// if the line holding the tag holds no /code/ do not set the code // if the line holding the tag holds no /code/ do not set the code
if( Platform.compareTo( Platform.mid( chkLin, 6, 1 ) , "/" ) == 0 ) if( Platform.compareTo( Platform.mid( chkLin, 6, 1 ) , "/" ) == 0 )
{ {
......
...@@ -20,7 +20,7 @@ String dtaPrtTagM19(String argmod) ...@@ -20,7 +20,7 @@ String dtaPrtTagM19(String argmod)
if( Platform.errorCode() > 0 ) if( Platform.errorCode() > 0 )
{ {
Platform.reraise(); Platform.reraise();
if(1==1) return; return "";
} }
} }
// name and phone number (2*35) // name and phone number (2*35)
......
void resetFieldsDTATAG() void resetFieldsDTATAG()
{ {
//! Clear all fields on panel DTATAG and set ResetModified() //! Clear all fields on panel DTATAG and set ResetModified()
String flds = Platform.getPanelInfo( $dtatag, 7 ); String flds = Platform.getPanelInfo( $dtatag, "7" );
IStream fldstm = new StreamImpl(); IStream fldstm = new StreamImpl();
Platform.streamSet( fldstm, flds ); Platform.streamSet( fldstm, flds );
int fldcnt = Platform.streamCount( fldstm ); int fldcnt = Platform.streamCount( fldstm );
......
...@@ -9,14 +9,14 @@ String dtaPrtTagM26orM27(String argdoctypcod,Date argmatdat,String argcur,int ar ...@@ -9,14 +9,14 @@ String dtaPrtTagM26orM27(String argdoctypcod,Date argmatdat,String argcur,int ar
{ {
// sight payment // sight payment
case "P": case "P":
Platform.printTemp( $\trnmod\trndoc.swtPrtTagAmount( ":M26:", argcur, argamt ) ); Platform.printTemp( $\trnmod\trndoc.swtPrtTagAmount( ":M26:", argcur, new BigDecimal(argamt ) ) );
// all other payment type // all other payment type
break; break;
default: default:
// date defined // date defined
if( ! Platform.isEmpty( argmatdat ) ) if( ! Platform.isEmpty( argmatdat ) )
{ {
Platform.printTemp( $\trnmod\trndoc.swtPrtTagField( ":M27:", $\trnmod\trndoc.dtaFmtDate( argmatdat ) + argcur + $\trnmod.fmtAmountSwift( argamt, argcur ) ) ); Platform.printTemp( $\trnmod\trndoc.swtPrtTagField( ":M27:", $\trnmod\trndoc.dtaFmtDate( argmatdat ) + argcur + $\trnmod.fmtAmountSwift( new BigDecimal(argamt ), argcur ) ) );
} }
} }
} }
......
void resetFieldsDTETAG() void resetFieldsDTETAG()
{ {
//! Clear all fields on panel DTETAG and set ResetModified() //! Clear all fields on panel DTETAG and set ResetModified()
String flds = Platform.getPanelInfo( $dtetag, 7 ); String flds = Platform.getPanelInfo( $dtetag, "7" );
IStream fldstm = new StreamImpl(); IStream fldstm = new StreamImpl();
Platform.streamSet( fldstm, flds ); Platform.streamSet( fldstm, flds );
int fldcnt = Platform.streamCount( fldstm ); int fldcnt = Platform.streamCount( fldstm );
......
...@@ -14,7 +14,7 @@ String dtePrtTagM55(String argdoctypcod,Date argmatdat,String argcur,int argamt) ...@@ -14,7 +14,7 @@ String dtePrtTagM55(String argdoctypcod,Date argmatdat,String argcur,int argamt)
// date defined // date defined
if( ! Platform.isEmpty( argmatdat ) ) if( ! Platform.isEmpty( argmatdat ) )
{ {
Platform.printTemp( $\trnmod\trndoc.swtPrtTagField( ":M55:", $\trnmod\trndoc.dtaFmtDate( argmatdat ) + argcur + $\trnmod.fmtAmountSwift( argamt, argcur ) ) ); Platform.printTemp( $\trnmod\trndoc.swtPrtTagField( ":M55:", $\trnmod\trndoc.dtaFmtDate( argmatdat ) + argcur + $\trnmod.fmtAmountSwift( new BigDecimal(argamt ), argcur ) ) );
} }
break; break;
default: default:
......
...@@ -14,7 +14,7 @@ String dtePrtTagM56(String argdoctypcod,Date argmatdat,String argcur,int argamt) ...@@ -14,7 +14,7 @@ String dtePrtTagM56(String argdoctypcod,Date argmatdat,String argcur,int argamt)
// date undefined // date undefined
if( Platform.isEmpty( argmatdat ) ) if( Platform.isEmpty( argmatdat ) )
{ {
Platform.printTemp( $\trnmod\trndoc.swtPrtTagAmount( ":M56:", argcur, argamt ) ); Platform.printTemp( $\trnmod\trndoc.swtPrtTagAmount( ":M56:", argcur, new BigDecimal(argamt ) ) );
} }
break; break;
default: default:
......
...@@ -9,7 +9,7 @@ String dtePrtTagM29(String argdoctypcod,Date argmatdat,String argcur,int argamt) ...@@ -9,7 +9,7 @@ String dtePrtTagM29(String argdoctypcod,Date argmatdat,String argcur,int argamt)
{ {
// sight payment // sight payment
case "P": case "P":
Platform.printTemp( $\trnmod\trndoc.swtPrtTagAmount( ":M29:", argcur, argamt ) ); Platform.printTemp( $\trnmod\trndoc.swtPrtTagAmount( ":M29:", argcur, new BigDecimal(argamt ) ) );
break; break;
default: default:
// nothing to output // nothing to output
......
boolean getConfig() boolean getConfigB()
{ {
//!读取ERSMAP.INI文件 //!读取ERSMAP.INI文件
//!=================================== //!===================================
......
...@@ -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 = toXMLFieldName( tag ); String objtag = 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 + ">";
} }
......
void mtaBUTInitProcessDDDDD() void mtaBUTInitProcessDDDDD()
{ {
Platform.streamClear( $dtfmap\resstm.getValue() ); Platform.streamClear( $dtfmap\resstm.getValue() );
boolean tag = $dtfmap.getConfig(); boolean tag = $dtfmap.getConfigB();
String fileNam = NULLSTR; String fileNam = NULLSTR;
int err = 0; int err = 0;
if( ! Platform.isEmpty( $\sysmod\spt\inr ) ) if( ! Platform.isEmpty( $\sysmod\spt\inr ) )
......
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