Commit 905f72e5 by wangguangchao

ditopn office trnrel sptsel交易报错修改

parent e0a20f6d
......@@ -283,7 +283,6 @@
<components path="hotwdg" width="106" required="true" left="636" top="368" height="22"/>
<components path="hotque" width="106" required="true" left="128" top="476" height="22"/>
</panels>
<globalMethods name="getStreamfield" codeText="@0008" moduleName="office"/>
<globalMethods name="formatDate" codeText="@0011" moduleName="office"/>
<localMethods name="appendSql" type="local" codeText="@0003" moduleName="office"/>
<localMethods name="getbchsql" type="local" codeText="@0004" moduleName="office"/>
......
......@@ -18,7 +18,7 @@ void liaallSetTransaction()
}
else
{
$liaall.liaallSetCbeAmount( rol, 3, $oldlidgrp\cbs\max\cur.getValue(), -$trnmod\liaget.trnmodGetTenorAmount( $lidgrp\rec, "AVL" ), "AVL", $\lidgrp\rec );
$liaall.liaallSetCbeAmount( rol, 3, $oldlidgrp\cbs\max\cur.getValue(), new BigDecimal(-$trnmod\liaget.trnmodGetTenorAmount( $lidgrp\rec, "AVL" )), "AVL", $\lidgrp\rec );
$liaall.liaallSetCbeAmountDbtCdt( rol, 3, "", $lidgrp\cbs\max\cur.getValue(), Platform.numAdd($lidgrp\cbs\max\amt.getValue() , $lidgrp\cbs\max2\amt.getValue()), "AVL", $\lidgrp\rec, "1" );
$liaall.liaallSetCoverChangeAmount( rol, $lidgrp\cbs\max\cur.getValue(), Platform.numAdd($lidgrp\cbs\max\amt.getValue() , $lidgrp\cbs\max2\amt.getValue()), $\lidgrp\rec );
}
......
......@@ -20,7 +20,6 @@ String getAMTwrd(int amt,String cur)
case "EN":
return cur + " " + Platform.amtWrd( Platform.toInt( amt ), Platform.getLang() ) + fractiontext;
// else english
break;
default:
return cur + " " + Platform.amtWrd( Platform.toInt( amt ), Platform.getLang() ) + fractiontext;
}
......
......@@ -13,7 +13,7 @@ event $mtabut\sav order 4
{
Platform.visible( $recpan\gkp );
num = Platform.prompt( #CT000637 );
if( num == 1 )
if( num )
{
$recpan\casgrp\rec\jjh = jjh;
Platform.disable( $recpan\casgrp\rec\jjh );
......
static String getStreamfield(String line,int posi,String sep)
{
//!获取Line 指定位置的数据域
//!=========================================
//! 返回值: 数据域内容
//! 变量: Line 数据Line
//! Posi 数据域位置(第Posi个数据)
//! Created by zdg
//!=========================================
String txt = "";
String vline = line;
String vsep = sep;
int pos = 0;
for(int i = 1;i <= posi - 1;i++)
{
pos = Platform.pos( vline, vsep );
if( pos == 0 )
{
break;
}
vline = Platform.mid( vline, pos + 1 );
}
if( i < posi - 1 )
{
txt = "";
}
else
{
pos = Platform.pos( vline, vsep );
txt = Platform.mid( vline, 1, pos - 1 );
}
return txt;
}
\ No newline at end of file
......@@ -12,7 +12,8 @@ void checkusrdia()
if( cou > 0 )
{
que = Platform.prompt( #CT000309 );
if( que < tdPromptCancel )
//if( que < tdPromptCancel )
if(que)
{
Platform.lnkCallTransaction( "DIASEL" );
}
......
......@@ -2,13 +2,16 @@ void initializeCheck()
{
//! Initialize the time interval for the check routines
initializeCheckRoutine( "checkfile", 0 );
initializeCheckRoutine( "checkrelfolder", 0.5 );
//initializeCheckRoutine( "checkrelfolder", 0.5 );
initializeCheckRoutine( "checkrelfolder", 0 );
initializeCheckRoutine( "checkgar", 1 );
initializeCheckRoutine( "checkdia", 1.5 );
//initializeCheckRoutine( "checkdia", 1.5 );
initializeCheckRoutine( "checkdia", 1 );
initializeCheckRoutine( "checkscr", 2 );
if( Platform.isEmpty( $envtxt ) )
{
initializeCheckRoutine( "ShowVideo", 2.5 );
//initializeCheckRoutine( "ShowVideo", 2.5 );
initializeCheckRoutine( "ShowVideo", 2 );
}
}
\ No newline at end of file
......@@ -4,7 +4,7 @@ void executeCheck(String argroutine,int arginterval)
//! post this check routine
// Execute routine
Platform.invokeModulePath( argroutine, -1 );
int interval = arginterval + Platform.toInt( Random * 5 );
int interval = arginterval + Platform.toInt( Math.random() * 5 );
Platform.invokeModulePath( "ExecuteCheck( \"" + argroutine + "\" , " + Platform.toString( arginterval ) + " )", interval );
}
\ No newline at end of file
void sethints()
{
/**
Platform.setHint( $hotcalc.getValue(), #CT000334 );
Platform.setHint( $hotfil1.getValue(), "$1", $cfgfil\fil1hnt.getValue() );
Platform.setHint( $hotfil2.getValue(), "$1", $cfgfil\fil2hnt.getValue() );
......@@ -10,23 +11,30 @@ void sethints()
Platform.setHint( $hotreg.getValue(), #CT000350 );
Platform.setHint( $hotman.getValue(), #CT000351 );
Platform.setHint( $hotwdg.getValue(), #CT000352 );
**/
if( Platform.isEmpty( $doorsta ) )
{
/**
Platform.setHint( $hotrat.getValue(), #CT000339 );
Platform.setHint( $hotadr.getValue(), #CT000340 );
Platform.setHint( $hotstd.getValue(), #CT000348 );
Platform.setHint( $hotsta.getValue(), #CT000349 );
**/
}
String relhint = #CT000343;
/**
Platform.setHint( $hotrel.getValue(), "$1", relhint );
Platform.setHint( $hotrel1.getValue(), "$1", relhint );
Platform.setHint( $hotrel2.getValue(), "$1", relhint );
Platform.setHint( $hotrel3.getValue(), "$1", relhint );
**/
String infhint = #CT000354;
/**
Platform.setHint( $hotinf1.getValue(), "$1", infhint );
Platform.setHint( $hotinf2.getValue(), "$1", infhint );
Platform.setHint( $hotinf3.getValue(), "$1", infhint );
Platform.setHint( $hotinf1.getValue(), #CT000353 );
Platform.setHint( $hotque.getValue(), #CT000355 );
**/
}
\ No newline at end of file
......@@ -29,7 +29,7 @@ void updateSptSpr(#spt argspt,String argsptsta,String argsprsta)
}
// update SPR
$spr\reldat = Platform.today();
$spr\reltim = Platform.Time( 4 );
$spr\reltim = new BigDecimal(Platform.Time( 4 ));
$spr\relusr = Platform.getLoginUser();
$spr\relssninr = $\sysmod\ssn\inr;
$spr\relsta = argsprsta;
......
......@@ -15,23 +15,23 @@ default $selrow order 1000
{
Platform.enable( $bind );
// multi select, no row selected
$selrow = 0;
$selrow = BigDecimal.ZERO;
}
else
{
line = Platform.getLine( lineidx, 1 );
inr = Platform.mid( line, 1, Platform.pos( line, "\t" ) - 1 );
$selrow = Platform.streamSearch( $sptstm, inr );
$selrow = new BigDecimal(Platform.streamSearch( $sptstm, inr ));
}
}
else
{
$selrow = 0;
$selrow = BigDecimal.ZERO;
}
}
else
{
$selrow = 0;
$selrow = BigDecimal.ZERO;
}
}
\ No newline at end of file
......@@ -17,10 +17,12 @@ void autoBindCshMsg()
can = Platform.promptYesNo( #CT000148 );
switch( can )
{
case tdPromptYes:
//case tdPromptYes:
case 1:
bindCshMsg( sptinr202, smhinr202, $\spt\smhinr.getValue() );
break;
case tdPromptNo:
//case tdPromptNo:
case 0:
break;
default:
// NtfCheck will be started
......
......@@ -7,7 +7,7 @@ event $bind order 1000
int selCnt = 0;
String line = NULLSTR;
String sptInr = NULLSTR;
if( Platform.prompt( #CT000149 ) == tdPromptYes )
if( Platform.prompt( #CT000149 ) )
{
Platform.GetAttributeStream( selStm, $sptstm.getValue(), tdAttrSelected );
selCnt = Platform.streamCount( selStm );
......
......@@ -30,7 +30,7 @@ event $unbind order 1000
if(1==1) return;
}
String inr = #CT000152;
if( Platform.prompt( #CT000151 ) == tdPromptYes )
if( Platform.prompt( #CT000151 ) )
{
Platform.dbExecuteSQL( "select inr from smh where grpinr = ? and msgtyp in ('202','910')", $\spt\smhinr.getValue() );
Platform.dbFetchFields( "", inr );
......
......@@ -2,13 +2,13 @@ default setclearkey ($chkinc,$chkrim,$chkpen,$chkcor,$chkaut,$chkdel,$chkclr,$ch
{
//default setClearKey ( CHKINC, CHKRIM, CHKPEN, CHKCOR, CHKAUT, CHKDEL, CHKCLR, CHKTCO, CHKCORE, CHKNRA ) order 1100
/**
if GetFocusField == "\CHKCLR" or GetFocusField == "\CHKTCO" then
if Platform.GetFocusField() == "\CHKCLR" or Platform.GetFocusField() == "\CHKTCO" then
**/
/**
if GetFocusField == "\CHKTCO" then
if Platform.GetFocusField() == "\CHKTCO" then
if CHKTCO == "Y" then
**/
if( Platform.compareTo( GetFocusField , "\\CHKCLR" ) == 0 )
if( Platform.compareTo( Platform.GetFocusField() , "\\CHKCLR" ) == 0 )
{
if( Platform.compareTo( $chkclr.getValue() , "Y" ) == 0 )
{
......@@ -30,7 +30,7 @@ default setclearkey ($chkinc,$chkrim,$chkpen,$chkcor,$chkaut,$chkdel,$chkclr,$ch
if( ! ( Platform.isEmpty( $chkinc ) && Platform.isEmpty( $chkrim ) && Platform.isEmpty( $chkpen ) && Platform.isEmpty( $chkcor ) && Platform.isEmpty( $chkaut ) && Platform.isEmpty( $chkdel ) ) )
{
Platform.clear( $chkclr );
if( Platform.compareTo( GetFocusField , "\\CHKCOR" ) == 0 || Platform.compareTo( GetFocusField , "\\CHKPEN" ) == 0 || Platform.compareTo( GetFocusField , "\\CHKINC" ) == 0 )
if( Platform.compareTo( Platform.GetFocusField() , "\\CHKCOR" ) == 0 || Platform.compareTo( Platform.GetFocusField() , "\\CHKPEN" ) == 0 || Platform.compareTo( Platform.GetFocusField() , "\\CHKINC" ) == 0 )
{
Platform.clear( $chktco );
//新增大额
......@@ -40,7 +40,7 @@ default setclearkey ($chkinc,$chkrim,$chkpen,$chkcor,$chkaut,$chkdel,$chkclr,$ch
Platform.clear( $chknra );
}
}
if( Platform.compareTo( GetFocusField , "\\CHKTCO" ) == 0 )
if( Platform.compareTo( Platform.GetFocusField() , "\\CHKTCO" ) == 0 )
{
if( Platform.compareTo( $chktco.getValue() , "Y" ) == 0 )
{
......@@ -64,7 +64,7 @@ default setclearkey ($chkinc,$chkrim,$chkpen,$chkcor,$chkaut,$chkdel,$chkclr,$ch
endif
**/
}
if( Platform.compareTo( GetFocusField , "\\CHKCOR" ) == 0 )
if( Platform.compareTo( Platform.GetFocusField() , "\\CHKCOR" ) == 0 )
{
if( Platform.compareTo( $chkcor.getValue() , "Y" ) == 0 )
{
......@@ -77,7 +77,7 @@ default setclearkey ($chkinc,$chkrim,$chkpen,$chkcor,$chkaut,$chkdel,$chkclr,$ch
}
}
//核心汇出汇款
if( Platform.compareTo( GetFocusField , "\\CHKCORE" ) == 0 )
if( Platform.compareTo( Platform.GetFocusField() , "\\CHKCORE" ) == 0 )
{
if( Platform.compareTo( $chkcore.getValue() , "Y" ) == 0 )
{
......@@ -95,7 +95,7 @@ default setclearkey ($chkinc,$chkrim,$chkpen,$chkcor,$chkaut,$chkdel,$chkclr,$ch
}
}
//NRA
if( Platform.compareTo( GetFocusField , "\\CHKNRA" ) == 0 )
if( Platform.compareTo( Platform.GetFocusField() , "\\CHKNRA" ) == 0 )
{
if( Platform.compareTo( $chknra.getValue() , "Y" ) == 0 )
{
......@@ -112,7 +112,7 @@ default setclearkey ($chkinc,$chkrim,$chkpen,$chkcor,$chkaut,$chkdel,$chkclr,$ch
Platform.clear( $chkcmt );
}
}
if( Platform.compareTo( GetFocusField , "\\CHKCMT" ) == 0 )
if( Platform.compareTo( Platform.GetFocusField() , "\\CHKCMT" ) == 0 )
{
if( Platform.compareTo( $chkcmt.getValue() , "Y" ) == 0 )
{
......
default setkey ($chkinc,$chkrim,$chkpen,$chkcor,$chkcore) order 1200
{
java.lang.String key = GetFocusField;
java.lang.String key = Platform.GetFocusField();
switch( key )
{
case "\\CHKINC":
......
......@@ -13,7 +13,8 @@ event $prtctl order 1000
String line2 = NULLSTR;
String getsmhinr = NULLSTR;
int err = 0;
if( can != tdPromptCancel )
//if( can != tdPromptCancel )
if( can )
{
if( Platform.isEmpty( $\prt ) )
{
......
......@@ -13,8 +13,8 @@ void printStreamAsSWIFTWithSMH()
{
// display tagged format as `formatted view`
msglen = $docimm\smh\msglen;
Argument<Integer> pathBox = new Argument<Integer>("",$docimm\smh\msgpos.getValue());
Argument<Integer> msglenBox = new Argument<Integer>("",msglen);
Argument<Integer> pathBox = new Argument<Integer>("",new Integer((int)$docimm\smh\msgpos.getValue()));
Argument<Integer> msglenBox = new Argument<Integer>("",new Integer((int)msglen));
$docimm.analyseSwiftStream ( pathBox, msglenBox, $docimm\smh\cortyp.getValue() );
$docimm\smh\msgpos = pathBox.value;
......
......@@ -85,7 +85,6 @@ String getSptSql(String argsql)
= "Select distinct SPT.INR, SPT.STA, SMHINR, INFDSP, FRM, OBJNAM, TXT, DATTIM, USR, DATTIM, INFTXT, OWNUSR, OBJTYP, OBJINR, DELFLG, WRKUSR, LSTUSR, (SELECT BCHNAME FROM BCH WHERE INR=WRKGRP) BCHNAME, RMTFLG,ACT59,NAM59,OWNUSG,RELAMT,RELCUR from SPT where to_char(dattim,'yyyymmdd')>'20180920' order BY SPT.INR DESC "
**/
}
break;
default:
//---------非经办行
/**
......
......@@ -30,7 +30,7 @@ event $udapl order 1000
selCnt = Platform.streamCount( selStm );
if( selCnt > 1 )
{
if( Platform.prompt( #CT001041, selCnt ) == tdPromptYes )
if( Platform.prompt( #CT001041, selCnt ) )
{
for(int i = 1;i <= selCnt;i++)
{
......@@ -60,7 +60,7 @@ event $udapl order 1000
{
Platform.reraise();
}
if( Platform.prompt( #CT001043, $spt\objnam.getValue(), $spt\txt.getValue() ) == tdPromptYes )
if( Platform.prompt( #CT001043, $spt\objnam.getValue(), $spt\txt.getValue() ) )
{
line = Platform.getLine( selStm, 1 );
inifrm = Platform.getStreamfieldforacg( line, 5 );
......
......@@ -41,7 +41,7 @@ event $delapl order 1000
if( selCnt > 1 )
{
Platform.closePanel( $chkpan );
if( Platform.prompt( #CT000313, selCnt ) == tdPromptYes )
if( Platform.prompt( #CT000313, selCnt ) )
{
for(int i = 1;i <= selCnt;i++)
{
......@@ -72,7 +72,7 @@ event $delapl order 1000
Platform.reraise();
}
Platform.closePanel( $chkpan );
if( Platform.prompt( #CT000315, $spt\objnam.getValue(), $spt\txt.getValue() ) == tdPromptYes )
if( Platform.prompt( #CT000315, $spt\objnam.getValue(), $spt\txt.getValue() ) )
{
executeDelete( $selsptinr.getValue() );
if( Platform.compareTo( $sysmod\bch\bchtyp , "7" ) == 0 )
......
......@@ -63,14 +63,14 @@ event onPanelShow $nracpol2 order 100
}
else
{
if( sta = "J" )
if( sta.equals("J") )
{
Platform.printTempUsing( "sptsel.CUSTNM", "审核状态 : 拒绝 ");
Platform.printTemp( Platform.vertical ( 1, tdUnitem, tdPosCurrent ));
}
else
{
if( sta = "N" )
if( sta.equals("N") )
{
Platform.printTempUsing( "sptsel.CUSTNM", "审核状态 :未受理 ");
Platform.printTemp( Platform.vertical ( 1, tdUnitem, tdPosCurrent ));
......
......@@ -36,7 +36,6 @@ String getNraSql(String argsql)
{
return "Select ORDERNO,PAYACC,RECACC,ACCNAME,AMOUNT,CURRCODE,BOCFLAG,MEO,STATE,REJECTREASON,TXT,operator,INR,transferdate,txtime,loginid,txchan,txchanno,transerialno,bchkeyinr,ownusg from NRA " + argsql + " and (bchkeyinr in(" + ddSql + ") ) order BY INR DESC ";
}
break;
default:
//---------非经办行
return "Select ORDERNO,PAYACC,RECACC,ACCNAME,AMOUNT,CURRCODE,BOCFLAG,MEO,STATE,REJECTREASON,TXT,operator,INR,transferdate,txtime,loginid,txchan,txchanno,transerialno,bchkeyinr,ownusg from NRA " + argsql + " and (BCHKEYINR=" + Platform.sqlLit( $sysmod\bch\inr.getValue() ) + " ) " + " order BY INR DESC ";
......
......@@ -35,7 +35,8 @@ event $released order 1000
$sysmod\nra\bchkeyinr = Platform.getStreamfieldforacg( line, 20 );
$sysmod\nra\ownusg = Platform.getStreamfieldforacg( line, 21 );
prompt = Platform.prompt( #CT000438 );
if( prompt == 2 )
//if( prompt == 2 )
if( prompt )
{
if(1==1) return;
}
......
......@@ -12,7 +12,8 @@ event $qr order 1000
else
{
prompt = Platform.prompt( #CT000443, $\sysmod.getBchcode ( $nrabranch.getValue() ) );
if( prompt == 2 )
//if( prompt == 2 )
if( prompt )
{
if(1==1) return;
}
......
......@@ -26,7 +26,7 @@ event $rejapl order 1000
{
Platform.reraise();
}
if( Platform.prompt( #CT000454, $spt\objnam.getValue(), $spt\txt.getValue() ) == tdPromptYes )
if( Platform.prompt( #CT000454, $spt\objnam.getValue(), $spt\txt.getValue() ) )
{
line = Platform.getLine( selStm, 1 );
inifrm = Platform.getStreamfieldforacg( line, 5 );
......
......@@ -7,7 +7,7 @@ event $hmdmod\hmtp\audsav order 10
Platform.dbHold( $spt );
if( Platform.errorCode() == tdOdbcLocked || Platform.errorCode() == tdOdbcHeld )
{
Platform.message( #CT000465, $\sysmod\spt\objnam.getValue(), Platform.trim( GetLockUID ), GetLockDate, Platform.mid( Platform.fmtTime( GetLockTime ), 1, 5 ) );
Platform.message( #CT000465, $\sysmod\spt\objnam.getValue(), Platform.trim( GetLockUID ), GetLockDate, Platform.mid( Platform.fmtTime( (int)GetLockTime ), 1, 5 ) );
}
else
{
......
event $sndbak order 1000
{
boolean aa = Platform.prompt( #CT000509, "是否确定退回报文 " );
if( aa == tdPromptYes )
if( aa )
{
Platform.clear( $extkey );
Platform.clear( $psw );
......
......@@ -7,7 +7,7 @@ event $bakbut order 1000
Platform.dbLock( $\sysmod\spt );
if( Platform.errorCode() == tdOdbcLocked || Platform.errorCode() == tdOdbcHeld )
{
Platform.message( #CT001025, $\sysmod\spt\objnam.getValue(), Platform.trim( GetLockUID ), GetLockDate, Platform.mid( Platform.fmtTime( GetLockTime ), 1, 5 ) );
Platform.message( #CT001025, $\sysmod\spt\objnam.getValue(), Platform.trim( GetLockUID ), GetLockDate, Platform.mid( Platform.fmtTime( (int)GetLockTime ), 1, 5 ) );
Platform.clear( $\sysmod\spt );
Platform.exitEvent();
}
......
......@@ -59,7 +59,8 @@ event $smssnd order 1000
booktime = "09:05:00";
bookdat = "";
dangqian = Platform.toDay();
begtime = Platform.dateTimeMake( Platform.today(), 16.30 );
//begtime = Platform.dateTimeMake( Platform.today(), 16.30 );
begtime = Platform.dateTimeMake( Platform.today(), 16 );
endtime = Platform.dateTimeMake( Platform.today(), 9 );
datediff1 = Platform.dateTimeDiff( dangqian, begtime );
datediff2 = Platform.dateTimeDiff( dangqian, endtime );
......
......@@ -47,7 +47,8 @@ event $prtbop order 1000
String dir = NULLSTR;
String errTxt = NULLSTR;
String filPath = NULLSTR;
if( can != tdPromptCancel )
//if( can != tdPromptCancel )
if( can )
{
if( Platform.isEmpty( $\prt ) )
{
......@@ -117,8 +118,8 @@ event $prtbop order 1000
Platform.streamInsert( $docimm\bopstm.getValue(), 1, "汇入汇款信息表" );
$docimm.setFileName();
$docimm.loadDocument();
Argument<Integer> pathBox = new Argument<Integer>("",$docimm\smh\msgpos.getValue());
Argument<Integer> pathBox1 = new Argument<Integer>("",$docimm\smh\msglen.getValue());
Argument<Integer> pathBox = new Argument<Integer>("",new Integer((int)$docimm\smh\msgpos.getValue()));
Argument<Integer> pathBox1 = new Argument<Integer>("",new Integer((int)$docimm\smh\msglen.getValue()));
$docimm.analyseSwiftStream ( pathBox, pathBox1, $docimm\smh\cortyp.getValue() );
$docimm\smh\msgpos = pathBox.value;
......@@ -243,7 +244,8 @@ event $prtbop order 1000
// PrintBOPFromNET( DOCIMM\BOPNET, 'RG000618
//$dir = GetFullName( "DATA", "bopnet" )
fil = "BOPNET\\" + $bopnet\sptinr.getValue();
dir = Platform.getAbsPath( "DATA", fil );
//dir = Platform.getAbsPath( "DATA", fil );
dir = Platform.getAbsPath( "DATA" );
$docimm.setFileName1();
if( Platform.compareTo( Platform.getContext( tdContextCLIENTSERVER ) , tdStringTRUE ) == 0 )
{
......
......@@ -157,8 +157,8 @@ event $vewbop order 1000
Platform.streamInsert( $docimm\bopstm.getValue(), 1, "汇入汇款信息表" );
$docimm.setFileName();
$docimm.loadDocument();
Argument<Integer> pathBox = new Argument<Integer>("",$docimm\smh\msgpos.getValue());
Argument<Integer> pathBox1 = new Argument<Integer>("",$docimm\smh\msglen.getValue());
Argument<Integer> pathBox = new Argument<Integer>("",new Integer((int)$docimm\smh\msgpos.getValue()));
Argument<Integer> pathBox1 = new Argument<Integer>("",new Integer((int)$docimm\smh\msglen.getValue()));
$docimm.analyseSwiftStream ( pathBox, pathBox1, $docimm\smh\cortyp.getValue() );
$docimm\smh\msgpos = pathBox.value;
......@@ -277,7 +277,8 @@ event $vewbop order 1000
// PrintBOPFromNET( DOCIMM\BOPNET, 'RG000680
//$dir = GetFullName( "DATA", "bopnet" )
fil = "BOPNET\\" + $bopnet\sptinr.getValue();
dir = Platform.getAbsPath( "DATA", fil );
//dir = Platform.getAbsPath( "DATA", fil );
dir = Platform.getAbsPath( "DATA" );
$docimm.setFileName1();
if( Platform.compareTo( Platform.getContext( tdContextCLIENTSERVER ) , tdStringTRUE ) == 0 )
{
......
......@@ -110,9 +110,9 @@ event onPanelShow $tcollt order 100
case "A":
Platform.prtLine12( "付汇性质:", "出口加工区" );
break;
case "X":
Platform.prtLine12( "付汇性质:", "其他特殊经济区" );
break;
//case "X":
//Platform.prtLine12( "付汇性质:", "其他特殊经济区" );
//break;
case "M":
Platform.prtLine12( "付汇性质:", "深加工结转" );
break;
......
......@@ -20,7 +20,7 @@ event $rembut order 1000
{
Platform.reraise();
}
if( Platform.prompt( #CT000972 ) == tdPromptYes )
if( Platform.prompt( #CT000972 ) )
{
executeRemark( $selsptinr.getValue() );
Platform.clear( $infor );
......
......@@ -44,7 +44,8 @@ void cptopnbySMS()
booktime = "09:05:00";
bookdat = "";
dangqian = Platform.toDay();
begtime = Platform.dateTimeMake( Platform.today(), 16.30 );
//begtime = Platform.dateTimeMake( Platform.today(), 16.30 );
begtime = Platform.dateTimeMake( Platform.today(), 16 );
endtime = Platform.dateTimeMake( Platform.today(), 9 );
datediff1 = Platform.dateTimeDiff( dangqian, begtime );
datediff2 = Platform.dateTimeDiff( dangqian, endtime );
......
......@@ -67,7 +67,8 @@ void smshmdsnd()
String booktime = "09:05:00";
String bookdat = "";
Date dangqian = Platform.toDay();
Date begtime = Platform.dateTimeMake( Platform.today(), 16.30 );
//Date begtime = Platform.dateTimeMake( Platform.today(), 16.30 );
Date begtime = Platform.dateTimeMake( Platform.today(), 16 );
Date endtime = Platform.dateTimeMake( Platform.today(), 9 );
Long datediff1 = Platform.dateTimeDiff( dangqian, begtime );
Long datediff2 = Platform.dateTimeDiff( dangqian, endtime );
......
......@@ -24,7 +24,7 @@ event $udapl order 200
selCnt = Platform.streamCount( selStm );
if( selCnt > 1 )
{
if( Platform.prompt( #CT001121, selCnt ) == tdPromptYes )
if( Platform.prompt( #CT001121, selCnt ) )
{
for(int i = 1;i <= selCnt;i++)
{
......@@ -54,7 +54,7 @@ event $udapl order 200
{
Platform.reraise();
}
if( Platform.prompt( #CT001123, $spt\objnam.getValue(), $spt\txt.getValue() ) == tdPromptYes )
if( Platform.prompt( #CT001123, $spt\objnam.getValue(), $spt\txt.getValue() ) )
{
line = Platform.getLine( selStm, 1 );
inifrm = Platform.getStreamfieldforacg( line, 5 );
......
......@@ -10,7 +10,7 @@ event $rou order 1000
String frame = NULLSTR;
if( selCnt > 1 )
{
if( Platform.prompt( #CT000111, selCnt ) == tdPromptYes )
if( Platform.prompt( #CT000111, selCnt ) )
{
for(int i = 1;i <= selCnt;i++)
{
......@@ -30,7 +30,7 @@ event $rou order 1000
}
if( Platform.errorCode() == tdOdbcLocked || Platform.errorCode() == tdOdbcHeld )
{
Platform.message( #CT000113, $\sysmod\spt\objnam.getValue(), Platform.trim( GetLockUID ), GetLockDate, Platform.mid( Platform.fmtTime( GetLockTime ), 1, 5 ) );
Platform.message( #CT000113, $\sysmod\spt\objnam.getValue(), Platform.trim( GetLockUID ), GetLockDate, Platform.mid( Platform.fmtTime( (int)GetLockTime ), 1, 5 ) );
}
else
{
......@@ -49,7 +49,7 @@ event $rou order 1000
$cfg\penitm = pathBox.value;
Platform.gridInsertRow( $sysmod\sptr, 0 );
Platform.dbRead( $sysmod\sptr [i], sptInr, "INR" );
Platform.dbRead( $sysmod\sptr.get(i), sptInr, "INR" );
err = Platform.errorCode();
Platform.dbFree( $\sysmod\spt );
}
......
......@@ -19,7 +19,8 @@ void takeEntry()
Platform.reraise();
}
reply = Platform.prompt( #CT000046, Platform.convertBlock( $spt\inftxt.getValue(), 0, 4, 65 ) );
if( reply == tdPromptCancel )
//if( reply == tdPromptCancel )
if( reply )
{
Platform.status( #CT000047 );
Platform.exitEvent();
......
......@@ -7,7 +7,7 @@ event $cln order 1000
String sptInr = NULLSTR;
if( selCnt > 1 )
{
if( Platform.prompt( #CT000077, selCnt ) == tdPromptYes )
if( Platform.prompt( #CT000077, selCnt ) )
{
for(int i = 1;i <= selCnt;i++)
{
......@@ -32,7 +32,7 @@ event $cln order 1000
{
Platform.reraise();
}
if( Platform.prompt( #CT000079, $spt\objnam.getValue(), $spt\txt.getValue() ) == tdPromptYes )
if( Platform.prompt( #CT000079, $spt\objnam.getValue(), $spt\txt.getValue() ) )
{
executeDelete( $selsptinr.getValue() );
}
......
......@@ -29,7 +29,7 @@ event $connect order 1000
if( Platform.compareTo(Platform.toLower( $\sysmod\spt\frm.getValue() ), frm) != 0 )
{
que = Platform.prompt( #CT000012, $\sysmod\spt\frm.getValue() );
if( que != tdPromptOK )
if( que )
{
// clear SYSMOD\SPT, otherwise the record will be unlocked in sysmod, altough it is not locked
Platform.clear( $sysmod\spt );
......@@ -39,7 +39,7 @@ event $connect order 1000
Platform.dbLock( $\sysmod\spt );
if( Platform.errorCode() == tdOdbcLocked || Platform.errorCode() == tdOdbcHeld )
{
Platform.message( #CT000008, $\sysmod\spt\objnam.getValue(), Platform.trim( GetLockUID ), GetLockDate, Platform.mid( Platform.fmtTime( GetLockTime ), 1, 5 ) );
Platform.message( #CT000008, $\sysmod\spt\objnam.getValue(), Platform.trim( GetLockUID ), GetLockDate, Platform.mid( Platform.fmtTime( (int)GetLockTime ), 1, 5 ) );
}
else
{
......
......@@ -9,7 +9,7 @@ void callTrn(String argsptinr,String argfrm)
Platform.dbLock( $\sysmod\spt );
if( Platform.errorCode() == tdOdbcLocked || Platform.errorCode() == tdOdbcHeld )
{
Platform.message( #CT000010, $\sysmod\spt\objnam.getValue(), Platform.trim( GetLockUID ), GetLockDate, Platform.mid( Platform.fmtTime( GetLockTime ), 1, 5 ) );
Platform.message( #CT000010, $\sysmod\spt\objnam.getValue(), Platform.trim( GetLockUID ), GetLockDate, Platform.mid( Platform.fmtTime( (int)GetLockTime ), 1, 5 ) );
}
else
{
......
......@@ -30,7 +30,7 @@ void getSelectedItem()
Disable( TAK, ROU, CONNECT, DEL, BUTINF, INC, BUTSPT, REPROW )
**/
// Disable( TAK, CONNECT, DEL, BUTINF, INC, BUTSPT, REPROW )
Platform.disable( $tak, $connect, $del, $butinf, $inc, $butspt, $reprow, $buttco );
//Platform.disable( $tak, $connect, $del, $butinf, $inc, $butspt, $reprow, $buttco );
Platform.invisible( $cln );
Platform.invisible( $butundel );
sta = "";
......@@ -76,7 +76,7 @@ void getSelectedItem()
if( pos == 0 )
{
// Disable( TAK, ROU, CONNECT, DEL, BUTINF, INC, BUTSPT, REPROW )
Platform.disable( $tak, $rou, $connect, $del, $butinf, $inc, $butspt, $reprow, $buttco );
//Platform.disable( $tak, $rou, $connect, $del, $butinf, $inc, $butspt, $reprow, $buttco );
Platform.invisible( $cln );
Platform.invisible( $butundel );
}
......
......@@ -64,7 +64,7 @@ event $smsbut order 1000
Platform.dbCloseCursor();
if( Platform.isEmpty( $spt\extkey ) )
{
if( Platform.prompt( #CT001076 ) == tdPromptYes )
if( Platform.prompt( #CT001076 ) )
{
Platform.clear( $newextkey );
Platform.clear( $ptynam );
......@@ -255,7 +255,8 @@ event $smsbut order 1000
booktime = "09:05:00";
bookdat = "";
dangqian = Platform.toDay();
begtime = Platform.dateTimeMake( Platform.today(), 16.30 );
//begtime = Platform.dateTimeMake( Platform.today(), 16.30 );
begtime = Platform.dateTimeMake( Platform.today(), 16 );
endtime = Platform.dateTimeMake( Platform.today(), 9 );
datediff1 = Platform.dateTimeDiff( dangqian, begtime );
datediff2 = Platform.dateTimeDiff( dangqian, endtime );
......
......@@ -29,7 +29,6 @@ String oldGetSptSql(String argsql)
return "Select INR, STA, SMHINR, INFDSP, FRM, OBJNAM, TXT, DATTIM, USR, DATTIM, INFTXT, OWNUSR, OBJTYP, OBJINR, DELFLG, WRKUSR, LSTUSR, (SELECT BCHNAME FROM BCH WHERE INR=WRKGRP) BCHNAME, RMTFLG,ACT59,NAM59 from SPT " + Platform.sdbEtyGenSql( $spt, argsql ) + " and (BCHKEYINR IN (SELECT INR FROM BCH WHERE UPBCHKEY=" + Platform.sqlLit( $\sysmod\bch\branch.getValue() ) + " or BCHKEYINR=" + Platform.sqlLit( $sysmod\bch\inr.getValue() ) + ") or WRKGRP=" + Platform.sqlLit( $sysmod\bch\inr.getValue() ) + ") " + ddSql + " order BY INR DESC ";
}
}
break;
default:
//---------非经办行
return "Select INR, STA, SMHINR, INFDSP, FRM, OBJNAM, TXT, DATTIM, USR, DATTIM, INFTXT, OWNUSR, OBJTYP, OBJINR, DELFLG, WRKUSR, LSTUSR, (SELECT BCHNAME FROM BCH WHERE INR=WRKGRP) BCHNAME, RMTFLG,ACT59,NAM59 from SPT " + Platform.sdbEtyGenSql( $spt, argsql ) + " and (BCHKEYINR=" + Platform.sqlLit( $sysmod\bch\inr.getValue() ) + " or WRKGRP=" + Platform.sqlLit( $sysmod\bch\inr.getValue() ) + " or WRKUSR=" + Platform.sqlLit( $sysmod\usr\extkey.getValue() ) + ") " + ddSql + " order BY INR DESC ";
......
......@@ -25,11 +25,15 @@ String branchsqlAndUp()
Platform.streamSet( $bchstream.getValue(), bRANCHinr );
Platform.sqlSetDirtyRead();
String sql = "SELECT INR FROM BCH WHERE UPBRANCH = '" + $sysmod\bch\branch.getValue() + "'";
Platform.dbExecuteSql( sql, errmsg );
//Platform.dbExecuteSql( sql, errmsg );
Platform.dbExecuteSql( sql );
enddoLabel:
while(true){
if( Platform.errorCode() != 0 )
{
Platform.dbCloseCursor();
return ; // #######TODO 改写 LABEL与GOTO #### goto enddo
//return ; // #### goto enddo
break enddoLabel;
}
String branch = "";
Platform.dbFetchFields( "", branch );
......@@ -42,7 +46,9 @@ String branchsqlAndUp()
Platform.dbFetchFields( "", branch );
}
Platform.dbCloseCursor();
// #######TODO 改写 LABEL与GOTO #### label enddo
break enddoLabel;
}
// #### label enddo
Platform.sqlSetCommittedRead();
//--------------------------------
//<<< ZL 大集中改造从501中移植过来-----
......
......@@ -58,7 +58,7 @@ event $relcor order 1000
}
}
a = Platform.prompt( #CT000155 );
if( a == 1 )
if( a )
{
Platform.dbHold( $trn );
Platform.dbUpdate( $trn, $trn\inr.getValue(), "INR" );
......
......@@ -64,7 +64,7 @@ void repairnext()
{
continue;
}
$trncorco\begtim = Platform.Time();
$trncorco\begtim = new BigDecimal(Platform.Time());
Platform.setIniStr( "trnrel.ini", "LOG", "lasttrninr", trninr );
// repair one record and then return to trnrel
$trncorco.executeCor ( "C", "", "", "" );
......
......@@ -36,7 +36,7 @@ boolean checkRelFixTrn(String trninrr)
**/
//modify by chenzhuo 20120812
Platform.streamClear( $\recpan\trostm.getValue() );
troAddTro_cz( 1, "S", trninrr );
troAddTro_cz( new BigDecimal(1), "S", trninrr );
Platform.streamSort( $\recpan\trostm.getValue() );
int n = Platform.streamCount( $\recpan\trostm.getValue() );
String line = "";
......
......@@ -114,7 +114,7 @@ event $udapl order 1000
if( ! Platform.isEmpty( undtxt ) )
{
a = Platform.prompt( #CT000272, undtxt );
if( a == 2 )
if( a )
{
//DBFreeAll
if(1==1) return;
......
......@@ -13,7 +13,7 @@ event $udhd order 1000
int pos = 0;
String sql = NULLSTR;
int err = 0;
if( Platform.prompt( #CT000298 ) == 1 )
if( Platform.prompt( #CT000298 ) )
{
//###########读取相关内容下的cde状态,失败则重新发送
//!===================================
......
......@@ -9,7 +9,7 @@ event $udfxq order 1100
String errmsg = NULLSTR;
String ret = NULLSTR;
String msg = NULLSTR;
if( Platform.prompt( #CT000299 ) == 1 )
if( Platform.prompt( #CT000299 ) )
{
trninr = $trn\inr;
if( ! Platform.isEmpty( trninr ) )
......
......@@ -40,7 +40,7 @@ default undotrnbut ($udhd,$udfxq) order 1000
}
else
{
Platform.disable( $udfxq, $udhd );
//Platform.disable( $udfxq, $udhd );
}
}
\ No newline at end of file
......@@ -12,7 +12,7 @@ event $recpan\shwceb order 1000
int rc = 0;
String errmsg = NULLSTR;
String ret = NULLSTR;
if( Platform.prompt( #CT000297 ) == 1 )
if( Platform.prompt( #CT000297 ) )
{
trninr = $trn\inr;
if( ! Platform.isEmpty( trninr ) )
......
......@@ -16,7 +16,7 @@ event $recpan\shwdeb order 1000
int pos = 0;
String sql = NULLSTR;
int err = 0;
if( Platform.prompt( #CT000296 ) == 1 )
if( Platform.prompt( #CT000296 ) )
{
rc = "";
errtxt = "";
......
......@@ -46,4 +46,5 @@ boolean checkRelbopTrn(String trninrr)
return true;
}
return true;
}
\ No newline at end of file
......@@ -66,7 +66,7 @@ event $sndcmt order 1000
Platform.message( #CT000339, "受理失败" + outtxt );
}
Platform.dbHold( $\sysmod\cnd );
Platform.dbUpdate( $\sysmod\cnd, "where trninr='" + $trn\inr.getValue() + "'" );
//Platform.dbUpdate( $\sysmod\cnd, "where trninr='" + $trn\inr.getValue() + "'" );
Platform.dbCommit();
if( ! Platform.isEmpty( $trn\inr ) )
{
......
......@@ -48,10 +48,10 @@ void getrolforDRG(Argument<String> firext,Argument<String> secext)
firext.value = Platform.getContent( "\\BIMEMU\\LEDGRP\\BEN\\PTS\\EXTKEY" );
err = Platform.errorCode();
break;
case "BETSET":
//case "BETSET":
case "BETSND":
case "BETDRV":
case "BETSET":
//case "BETSET":
firext.value = Platform.getContent( "\\BIMEMU\\BEDGRP\\BEN\\PTS\\EXTKEY" );
err = Platform.errorCode();
break;
......
......@@ -29,6 +29,6 @@ event $reldspdrg order 998
releaseimage( $trn\imginr.getValue(), $trn\ownref.getValue(), $trn\relflg.getValue(), $trn\relres.getValue() );
}
$\recpan.fillWFESTM();
Platform.exitEvent();
//Platform.exitEvent();
}
\ No newline at end of file
......@@ -8,6 +8,7 @@ event $reldspdrg order 1000
int cmttim = 0;
int err = 0;
int fmttim = 0;
int time = 0;
if( ! Platform.isEmpty( $\sysmod\cnd\inr ) )
{
cmtflg = Platform.getIniStr( "cntran.ini", "CMTDAT", "CMTFLG" );
......
......@@ -27,7 +27,7 @@ event $reldsp order 1000
{
//新增货贸直连接口关闭提示
prompt = Platform.prompt( #CT000442 );
if( prompt == 2 )
if( prompt )
{
Platform.exitEvent();
}
......
event $rejdsp order 1000
{
boolean prompt = Platform.prompt( #CT000163 );
if( prompt == 2 )
if( prompt )
{
if(1==1) return;
}
......
event $rejrow order 1000
{
boolean prompt = Platform.prompt( #CT000161 );
if( prompt == 2 )
if( prompt )
{
if(1==1) return;
}
......
event $repdsp order 1000
{
boolean prompt = Platform.prompt( #CT000165 );
if( prompt == 2 )
if( prompt )
{
if(1==1) return;
}
......
event $reprow order 1000
{
boolean prompt = Platform.prompt( #CT000166 );
if( prompt == 2 )
if( prompt )
{
if(1==1) return;
}
......
check $relnum order 1000
{
if( !( Platform.compareTo( $recpan\pansta , PanStaHide) ) == 0 )
if( !( Platform.compareTo( $recpan\pansta , PanStaHide) == 0) )
{
if( $relnum.getValue() < 1 || $relnum.getValue() > 3 )
{
......
......@@ -38,7 +38,7 @@ event $relrow order 1000
{
//新增货贸直连接口关闭提示
prompt = Platform.prompt( #CT000441 );
if( prompt == 2 )
if( prompt )
{
Platform.exitEvent();
}
......@@ -66,6 +66,7 @@ event $relrow order 1000
//大额和境内外币需校验时间
if( ! Platform.isEmpty( $\sysmod\cnd\inr ) )
{
int time = 0;
cmtflg = Platform.getIniStr( "cntran.ini", "CMTDAT", "CMTFLG" );
fmtflg = Platform.getIniStr( "cntran.ini", "CMTDAT", "FMTFLG" );
cmtdat = Platform.getIniStr( "cntran.ini", "CMTDAT", "CMTDAT" );
......@@ -182,7 +183,7 @@ event $relrow order 1000
{
if( Platform.errorCode() == tdOdbcLocked || Platform.errorCode() == tdOdbcHeld )
{
Platform.errorMessage( #CT000106, trninr, Platform.trim( GetLockUID ), GetLockDate, Platform.mid( Platform.fmtTime( GetLockTime ), 1, 5 ) );
Platform.errorMessage( #CT000106, trninr, Platform.trim( GetLockUID ), GetLockDate, Platform.mid( Platform.fmtTime( (int)GetLockTime ), 1, 5 ) );
Platform.exitEvent();
}
else
......
......@@ -231,19 +231,19 @@ void updateGridButtons()
{
if( Platform.compareTo( wrkUSR , Platform.getLoginUser() ) == 0 && Platform.compareTo($sysmod\bch\lev.getValue(), "0") != 0 )
{
Platform.disable( $relrow, $reldsp );
//Platform.disable( $relrow, $reldsp );
}
else
{
// Enable( RELROW, RELDSP )
Platform.enable( $relrow, $reldsp, $reprow );
//Platform.enable( $relrow, $reldsp, $reprow );
if( Platform.compareTo($\sysmod\bch\lev.getValue(), "2") != 0 )
{
if( Platform.compareTo( $\sysmod\bch\lev , "0" ) == 0 )
{
if( Platform.compareTo(res2, req2) != 0 || Platform.compareTo(res1, req1) != 0 )
{
Platform.disable( $relrow, $reldsp, $undo );
//Platform.disable( $relrow, $reldsp, $undo );
Platform.disable( $reprow );
dot1 = "D";
}
......@@ -254,7 +254,7 @@ void updateGridButtons()
{
if( Platform.compareTo(res2, req2) != 0 || Platform.compareTo( res1 , req1 ) == 0 )
{
Platform.disable( $relrow, $reldsp, $undo );
//Platform.disable( $relrow, $reldsp, $undo );
Platform.disable( $reprow );
dot1 = "D";
}
......@@ -267,14 +267,14 @@ void updateGridButtons()
{
if( ! Platform.isEmpty( $bratrn ) && ! Platform.isEmpty( trninr ) )
{
Platform.enable( $relrow, $reprow, $reldsp );
//Platform.enable( $relrow, $reprow, $reldsp );
if( Platform.compareTo($\sysmod\bch\lev.getValue(), "2") != 0 )
{
if( Platform.compareTo( $\sysmod\bch\lev , "0" ) == 0 )
{
if( Platform.compareTo(res2, req2) != 0 || Platform.compareTo(res1, req1) != 0 )
{
Platform.disable( $relrow, $reldsp, $reprow );
//Platform.disable( $relrow, $reldsp, $reprow );
}
}
else
......@@ -283,7 +283,7 @@ void updateGridButtons()
{
if( Platform.compareTo(res2, req2) != 0 )
{
Platform.disable( $relrow, $reldsp, $reprow );
//Platform.disable( $relrow, $reldsp, $reprow );
dot1 = "D";
}
}
......@@ -292,7 +292,7 @@ void updateGridButtons()
}
else
{
Platform.disable( $relrow, $reldsp );
//Platform.disable( $relrow, $reldsp );
}
}
int useidx = 0;
......@@ -306,7 +306,7 @@ void updateGridButtons()
{
if( Platform.compareTo($trn\relflg.getValue(), "W") != 0 && Platform.compareTo($trn\relflg.getValue(), "X") != 0 )
{
Platform.disable( $relrow, $reldsp );
//Platform.disable( $relrow, $reldsp );
return ; // #######TODO 改写 LABEL与GOTO #### goto orelab
}
else
......@@ -319,7 +319,7 @@ void updateGridButtons()
}
if( useidx <= 0 )
{
Platform.disable( $relrow, $reldsp );
//Platform.disable( $relrow, $reldsp );
return ; // #######TODO 改写 LABEL与GOTO #### goto orelab
}
}
......@@ -336,23 +336,23 @@ void updateGridButtons()
{
if( Platform.compareTo( wrkUSR , Platform.getLoginUser() ) == 0 && Platform.compareTo($sysmod\bch\lev.getValue(), "0") != 0 && count > 0 )
{
Platform.disable( $reprow, $rejrow, $repdsp );
//Platform.disable( $reprow, $rejrow, $repdsp );
}
else
{
/**
Enable( REPROW, REJROW, REPDSP )
**/
Platform.enable( $reprow, $rejrow, $repdsp, $relrow, $reldsp );
//Platform.enable( $reprow, $rejrow, $repdsp, $relrow, $reldsp );
if( Platform.compareTo( dot1 , "D" ) == 0 )
{
Platform.disable( $reprow, $rejrow, $repdsp, $relrow, $reldsp );
//Platform.disable( $reprow, $rejrow, $repdsp, $relrow, $reldsp );
}
}
}
else
{
Platform.disable( $reprow, $rejrow, $repdsp );
//Platform.disable( $reprow, $rejrow, $repdsp );
}
if( cnfRowFlag )
{
......
event $coninf\coninfp order 200
{
Platform.exitEvent();
//Platform.exitEvent();
}
\ No newline at end of file
event $dsp order 9000
{
// store time when user started to work on this item (for ORE update)
$trncorco\begtim = Platform.Time();
$trncorco\begtim = new BigDecimal(Platform.Time());
}
\ No newline at end of file
event $trncorco\trnstm order 9000
{
// store time when user started to work on this item (for ORE update)
$trncorco\begtim = Platform.Time();
$trncorco\begtim = new BigDecimal(Platform.Time());
}
\ No newline at end of file
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