W-Z修改

script/liaone.0001.script

 default $cbe\dat order 1000
 {
-  if( Platform.isempty ( $cbe\dat.getValue()) )
+  if( Platform.isEmpty ( $cbe\dat.getValue()) )
   {
-    $cbe\dat =  today;
+    $cbe\dat =  Platform.today();
   }
 
 }
\ No newline at end of file

script/liaone.0002.script

@@ -26,8 +26,8 @@ void cbsstore()
   {
     $cbe\cbt = "LIAOUT";
     $cbe\nam = "outbooking " + $namsfx.getValue();
-    $cbe\amt = new BigDecimal(Platform.abs( $cbe\amt.getValue() ));
-    $cbe\xrfamt = new BigDecimal(Platform.abs( $cbe\xrfamt.getValue() ));
+    $cbe\amt = Platform.abs( $cbe\amt.getValue() );//new BigDecimal(Platform.abs( $cbe\amt.getValue() ));
+    $cbe\xrfamt =Platform.abs( $cbe\xrfamt.getValue() ) ;//new BigDecimal(Platform.abs( $cbe\xrfamt.getValue() ));
     Platform.cbsStoreEntry( $cbe, Platform.recGetGrpMod( Platform.getModule( $objmod.getValue() ) ) );
   }
   $cbe\amt = amt;

script/liaone.0018.script

@@ -26,7 +26,7 @@ default $cbe\acc order 1000
     // check if set by LiaallSetRefAct
     actval = getAvailAcc();
     Platform.setFieldValue( $cbe\acc, actval );
-    actval = Platform.getValues( $cbe\acc.getValue() );
+    actval = String.valueOf(Platform.getValues( $cbe\acc.getValue() ));
     if( Platform.errorCode() == 0 )
     {
       if( Platform.isEmpty( $cbe\acc ) && ! Platform.isEmpty( actval ) )

script/lscmod.0012.script

@@ -11,6 +11,7 @@ void lscDeleteLsm(#lsm arglsm)
   lscGetAllLsbForLsr( lsbInrStm, $lsr\inr.getValue() );
   int lsbMax = Platform.streamCount( lsbInrStm );
   String lsbInr = NULLSTR;
+  String lssFlg;
   for(int  lsbIdx = 1;lsbIdx <= lsbMax;lsbIdx++)
   {
     lsbInr = Platform.getLine( lsbInrStm, lsbIdx );

script/lscmod.0013.script

 void lscStoreNewEarmark(#lsb deblsb,#lsb crelsb,String argcur,int argamt)
 {
-  BigDecimal amt = Platform.xrtCurrentLimitSysCur( argcur, argamt );
+  BigDecimal amt = Platform.xrtCurrentLimitSysCur( argcur, BigDecimal.valueOf(argamt) );
   $lse\debinr = $$deblsb\inr;
   $lse\creinr = $$crelsb\inr;
   $lse\cur = $\cbsmod\xrtmod.sysiso();

script/lscmod.0024.script

@@ -23,7 +23,7 @@ String lscCheckTrnAccepted(String argtrninr)
       case "O":
       case  "A":
       rtn = LscAccepted;
-      return ; // #######TODO 改写 LABEL与GOTO  ####   goto NextLsm
+      //return ; // #######TODO 改写 LABEL与GOTO  ####   goto NextLsm
       break;
       case "R":
       rtn = LscRejected;

script/lscmod.0028.script

@@ -59,7 +59,7 @@ void lscHandleLssFlg(#lsm arglsm,String arglsbinr,Argument<String> argsta,String
         $lss\usr = "AUT";
         $lss\ssninr = $\sysmod\ssn\inr;
         $lss\dat = Platform.today();
-        $lss\tim = Platform.Time( 4 );
+        $lss\tim = BigDecimal.valueOf(Constants.Time(4));
       }
       Platform.dbUpdate( $lss, $$arglsm\inr.getValue(), "LSMINR", arglsbinr, "LSBINR" );
     }
@@ -70,7 +70,7 @@ void lscHandleLssFlg(#lsm arglsm,String arglsbinr,Argument<String> argsta,String
       $lss\usr = $\sysmod\ssn\usr;
       $lss\ssninr = $\sysmod\ssn\inr;
       $lss\dat = Platform.today();
-      $lss\tim = Platform.Time( 4 );
+      $lss\tim = BigDecimal.valueOf(Constants.Time(4));
       Platform.dbUpdate( $lss, $$arglsm\inr.getValue(), "LSMINR", arglsbinr, "LSBINR" );
     }
     break;

script/lscmod.0034.script

@@ -25,6 +25,7 @@ String lsiGetCBEStatus(#cbe argcbe)
     return  LscRejected;
     default:
     Platform.sysDump( "LSCMOD.LsiGetCBEStatus: LscReadLSMByCbe return unknown LSMFLG '" + $lsm\lsmflg.getValue() + "'." );
+    return "";
   }
 
 }
\ No newline at end of file

script/lscmod.0036.script

@@ -59,6 +59,7 @@ void lsiProcessCbeEntry(#cbe argcbe,IModule arggrp)
   lscGetAllLsbForLsr( lsbInrStm, $lsr\inr.getValue() );
   int lsbMax = Platform.streamCount( lsbInrStm );
   String lsbInr = NULLSTR;
+  String lssFlg;
   for(int  lsbIdx = 1;lsbIdx <= lsbMax;lsbIdx++)
   {
     lsbInr = Platform.getLine( lsbInrStm, lsbIdx );

script/mtabut.0002.script

@@ -41,7 +41,7 @@ event $can order 1000
         }
       }
     }
-    if( prompt == tdPromptOK )
+    if( prompt )
     {
       mtaButSptClear();
       Platform.sptClear();
@@ -55,10 +55,10 @@ event $can order 1000
     }
     else
     {
-      prompt = tdPromptOK;
+      prompt = true;
     }
   }
-  if( prompt == tdPromptOK )
+  if( prompt )
   {
     if( Platform.sptIsAnyLoaded() )
     {

script/mtabut.0003.script

@@ -7,13 +7,13 @@ event $pen order 500
   boolean prompt = false;
   if( Platform.sptIsAnyLoaded() || mod )
   {
-    prompt = tdPromptOK;
+    prompt = true;
   }
   else
   {
     prompt = Platform.prompt( #CT000008, objNam );
   }
-  if( prompt != tdPromptOK )
+  if( !prompt )
   {
     Platform.status( "" );
     Platform.exitEvent();

script/mtabut.0008.script

@@ -167,12 +167,12 @@ init $\ order 200
         Platform.dbLock( $sptchk );
         if( Platform.errorCode() == tdOdbcLocked )
         {
-          Platform.message( #CT000145, Platform.trim( GetLockUID ), GetLockDate, Platform.mid( Platform.fmtTime( GetLockTime ), 1, 5 ) );
+          Platform.message( #CT000145, Platform.trim( GetLockUID ), GetLockDate, Platform.mid( Platform.fmtTime( new Double(GetLockTime).intValue() ), 1, 5 ) );
           Platform.lnkReturnToCaller();
         }
         Platform.streamInsert( $sptinrstr.getValue(), 0, $sptchk\inr.getValue() );
         // Issue fitting warning messages
-        if( Platform.sptIsIncLoaded() || !( Platform.compareTo( $sptchk\sta ,  "INC") ) == 0 || sptIdx > 0 )
+        if( Platform.sptIsIncLoaded() || !(( Platform.compareTo( $sptchk\sta ,  "INC") ) == 0 )|| sptIdx > 0 )
         {
           if( ! Platform.isEmpty( $sptchk\delflg ) )
           {

script/mtabut.0016.script

@@ -29,7 +29,7 @@ void checkinfo()
     {
       if( Platform.compareTo($\sysmod\ssn\bckgrd,  "F" )== 0 )
       {
-        if( Platform.prompt( #CT000198, errtxt ) == tdPromptCancel )
+        if( Platform.prompt( #CT000198, errtxt ) )
         {
           saverecgrp();
           Platform.lnkReturnToCaller();

script/mtabut.0023.script

@@ -19,6 +19,6 @@ boolean unmapped()
     return  false;
     //  endif
   }
-  return  false;
+  //return  false;
 
 }
\ No newline at end of file

script/mtabut.0060.script

@@ -22,7 +22,7 @@ event $usrexi order 1000
         prompt = Platform.prompt( #CT000206, objNam );
       }
     }
-    if( prompt == tdPromptOK )
+    if( prompt )
     {
       mtaButSptClear();
       Platform.sptClear();
@@ -36,10 +36,10 @@ event $usrexi order 1000
     }
     else
     {
-      prompt = tdPromptOK;
+      prompt = true;
     }
   }
-  if( prompt == tdPromptOK )
+  if( prompt )
   {
     if( Platform.sptIsAnyLoaded() )
     {

script/mtabut.0072.script

@@ -26,11 +26,11 @@ String getSptPtsInfo(String arginfo)
     case "CCT":
     return Platform.getContent( objPth + "\\PRE" + arginfo );
     //  case "CLT"
-    break;
+    //break;
     case "GET":
     return Platform.getContent( objPth + "\\BEN" + arginfo );
     // case "CPT"
-    break;
+    //break;
     default:
     return "";
   }

script/mtabut.0083.script

 void storeAdress(#ptsp argptsp)
 {
-  if( $$argptsp\ptspta.isrolset() )
+  if( $$argptsp\ptspta.isRolSet() )
   {
     if( ! Platform.isEmpty( $$argptsp\ptspta\dbfadrblk ) && Platform.compareTo($$argptsp\ptspta\dbfadrblk.getValue(), $$argptsp\ptspta\pts\adrblk.getValue()) != 0 )
     {

script/wfmmod.0001.script

@@ -25,7 +25,7 @@ void wfeAdd(String insub,String insrv,Date tarday,int tartim)
   }
   if( tartim >= 24 )
   {
-    tartim = 23.59;
+    tartim = (int)23.59;
   }
   Date tardaytim = Platform.dateTimeMake( tarday, tartim );
   // check for fitting Service-Entries.

script/wfmmod.0005.script

@@ -14,7 +14,7 @@ void wfeUpdate(int idx,String newsta)
       datediff = Platform.dateTimeDiff( newdattim, $wfe[idx]\dattim.getValue() );
       if( Platform.errorCode() <= 0 )
       {
-        difsec = Platform.round( convertTimeToSeconds( datediff ), 0 );
+        difsec = Platform.round( convertTimeToSeconds( datediff.intValue() ), 0 );
       }
       else
       {
@@ -26,13 +26,13 @@ void wfeUpdate(int idx,String newsta)
         switch( $wfe[idx]\sta.getValue() )
         {
           case "O":
-          $wfe[idx]\opndur = Platform.numAdd($wfe[idx]\opndur.getValue() , difsec);
+          $wfe[idx]\opndur = Platform.numAdd($wfe[idx]\opndur.getValue() , difsec).longValue();
           break;
           case "W":
-          $wfe[idx]\waidur = Platform.numAdd($wfe[idx]\waidur.getValue() , difsec);
+          $wfe[idx]\waidur = Platform.numAdd($wfe[idx]\waidur.getValue() , difsec).longValue();
           break;
           case "R":
-          $wfe[idx]\retdur = Platform.numAdd($wfe[idx]\retdur.getValue() , difsec);
+          $wfe[idx]\retdur = Platform.numAdd($wfe[idx]\retdur.getValue() , difsec).longValue();
           break;
         }
       }

script/wfmmod.0019.script

@@ -26,9 +26,9 @@ void setWfeStatWithTextandTime(String insub,String newsta,String txt,int duratio
     //  \WFETSK\TSKLIST\LOGMOD.WriteLine ( FormatText( "Duration $3 exceeded 60 seconds, WFSINR=$1, SRV=$2", WFS\INR, WFE( $useidx )\srv, duration / 1000 ), LogmodInfo )
   }
   $wfe[useidx]\hdldur = $wfe[useidx]\hdldur.getValue() + duration;
-  if( $wfe[useidx]\hdldur.getValue() > 9999999999 )
+  if( $wfe[useidx]\hdldur.getValue() > 9999999999L )
   {
-    $wfe[useidx]\hdldur = 9999999999;
+    $wfe[useidx]\hdldur = 9999999999L;
   }
   setWfeStatInternal( useidx, newsta );
 

script/wfmmod.0026.script

@@ -66,7 +66,7 @@ boolean dealInterfaceNew(#trn argtrn)
       }
       else
       {
-        if( srv = "SMS" )
+        if(srv.equals("SMS" ))
         {
           $wfe[idx]\txt = $errmsg;
         }

script/xidmod.0000.script

@@ -16,23 +16,38 @@ void insertNewXID(int idx,String ownref,String trninr,String objtyp,String objin
   //!===============================
   Platform.clear( $xid );
   //设置接口类型
-  switch( typ )
+  /*switch( typ )
   {
     case GetFXQCode:
     $xid.setINTTYPFXQ();
     break;
-    case GetFAMCode:
+    case GetFAMCode:*/
     //20110525与蒋秀芹确认下费用为外币的情况下发送ABOQ
     /**if \SETMOD\SETGLG\SETGLL( Idx )\ABQGET\ABQP\FEEFLG <> "Y" then
     exit
     else
     XID.SetINTTYPFAM
     endif**/
-    $xid.setINTTYPFAM();
+    /*$xid.setINTTYPFAM();
     break;
     default:
     if(1==1) return;
+  }*/
+  if(typ.equals(getFXQCode()))
+  {
+    $xid.setINTTYPFXQ();
   }
+  else if(typ.equals(getFAMCode()))
+  {
+    //20110525与蒋秀芹确认下费用为外币的情况下发送ABOQ
+        /**if \SETMOD\SETGLG\SETGLL( Idx )\ABQGET\ABQP\FEEFLG <> "Y" then
+        exit
+        else
+        XID.SetINTTYPFAM
+        endif**/
+        $xid.setINTTYPFAM();
+  }
+
   String cdflg = $\setmod\setglg\setgll[idx]\debcdtflg;
   $xid\trndat = Platform.today();
   $xid\opttyp = "";

script/xidmod.0030.script

@@ -43,9 +43,9 @@ String getOppoRole()
     case "BPDGRP":
     rol = "FIA";
     break;
-    case "BEDGRP":
-    rol = "APL";
-    break;
+    //case "BEDGRP":
+    //rol = "APL";
+    //break;
   }
   return  rol;
 

script/xrtmod.0002.script

 BigDecimal amtViaSysCnv(BigDecimal amt,BigDecimal fromrat,BigDecimal torat,String fromcur,String tocur)
 {
   String refcur = $bascurcac;
-  int refamt = 0;
+  BigDecimal refamt = new BigDecimal(0);
   Argument<String> refcurBox = new Argument<String>("",refcur);
   Argument<BigDecimal> refamtBox = new Argument<BigDecimal>("",refamt);
   return  amtConvRates( amt, fromrat, torat, fromcur, tocur, refcurBox, refamtBox );

script/xrtmod.0007.script

@@ -33,7 +33,7 @@ BigDecimal sysCurEqu(String fromcur,BigDecimal amt,Date value)
   sqrrat = sqrratBox1.value;
 
   String refcur = $bascurcac;
-  int refamt = 0;
+  BigDecimal refamt = new BigDecimal(0);
   Argument<String> refcurBox = new Argument<String>("",refcur);
   Argument<BigDecimal> refamtBox = new Argument<BigDecimal>("",refamt);
   return  amtConvRates( amt, frmrat, sysrat, fromcur, sysiso(), refcurBox, refamtBox );

script/xrtmod.0008.script

@@ -30,9 +30,9 @@ BigDecimal basCurEqu(String fromcur,BigDecimal amt,Date value)
   sqrrat = sqrratBox.value;
 
   String refcur = $bascurcac;
-  int refamt = 0;
+  BigDecimal refamt = new BigDecimal(0);
   Argument<String> refcurBox = new Argument<String>("",refcur);
   Argument<BigDecimal> refamtBox = new Argument<BigDecimal>("",refamt);
-  return  amtConvRates( amt, frmrat, 1, fromcur, $bascurcac.getValue(), refcurBox, refamtBox );
+  return  amtConvRates( amt, frmrat, new BigDecimal(1), fromcur, $bascurcac.getValue(), refcurBox, refamtBox );
 
 }
\ No newline at end of file

script/xrtmod.0019.script

 BigDecimal amtConvTypes(String fromcur,BigDecimal amt,String fromtyp,String tocur,String totyp,Date value)
 {
   // AmtConvTypes( FromCur , Amt , fromtyp , tocur , totyp, value  )
-  int ignorecross = 1;
+  BigDecimal ignorecross = new BigDecimal(1);
   Argument<BigDecimal> ignorecrossBox = new Argument<BigDecimal>("",ignorecross);
   return  amtConvTypesWithCrossrate( fromcur, amt, fromtyp, tocur, totyp, value, ignorecrossBox );
 

script/xrtmod.0020.script

@@ -2,7 +2,7 @@ BigDecimal amtConvTypesWithCrossrate(String fromcur,BigDecimal amt,String fromty
 {
   // AmtConvTypes( FromCur , Amt , fromtyp , tocur , totyp, value  )
   String bscur = $bascurcac;
-  int refamt = 0;
+  BigDecimal refamt = new BigDecimal(0);
   String newcur;
   Argument<String> newcurBox = new Argument<String>();
   String newsys;

script/xrtmod.0032.script

@@ -14,7 +14,7 @@ BigDecimal amtRndUnt(BigDecimal argamt,String argcur)
   else
   {
     // otherwise round with rounding unit
-    if( Platform.compareTo(Platform.abs( argamt ) , Platform.numMul(0.5 , rndunt)<0) )
+    if( Platform.compareTo(Platform.abs( argamt ) , Platform.numMul(0.5 , rndunt))<0)
     {
       return  new BigDecimal(0);
     }

script/xrtmod.0042.script

-void getratCeb(String fromcur,String tocur,String typ,Date value,Argument<Integer> rmbrat)
+void getratCeb(String fromcur,String tocur,String typ,Date value,Argument<BigDecimal> rmbrat)
 {
   // Add by ZJ on Feb 2008
   // 会计模组修改，从5.01移植
   String sysiso = sysiso();
   int frmrat = 1;
   int torat = 1;
-  rmbrat.value = 0.000000;
+  rmbrat.value = new BigDecimal(0.000000);
   if( Platform.compareTo( fromcur ,  tocur ) == 0 )
   {
-    rmbrat.value = 1;
+    rmbrat.value = new BigDecimal(1);
     return ; // #######TODO 改写 LABEL与GOTO  ####   goto done
   }
   if( ( Platform.compareTo(fromcur, sysiso) != 0 ) && ( ! Platform.isEmpty( fromcur ) ) )

script/xrtmod.0044.script

@@ -29,11 +29,11 @@ BigDecimal amtViaCebRat(int amt,int rat,String acccur,String doccur,String dpy)
   BigDecimal actamt = null;
   if( Platform.compareTo( doccur ,  vdpy ) == 0 )
   {
-    actamt = amtRnd( amt * rat * bas, acccur );
+    actamt = amtRnd( new BigDecimal(amt * rat * bas), acccur );
   }
   else
   {
-    actamt = amtRnd( amt / rat * bas, acccur );
+    actamt = amtRnd( new BigDecimal(amt / rat * bas), acccur );
   }
   return  actamt;
 

script/xrtmod.0045.script

@@ -19,6 +19,6 @@ BigDecimal amtcnv(int amt,int rat,String fromcur,String tocur)
   {
     bas = bas / frombas;
   }
-  return  amtRnd( amt / rat * bas, tocur );
+  return  amtRnd( new BigDecimal(amt / rat * bas), tocur );
 
 }
\ No newline at end of file

script/xrtmod.0046.script

@@ -21,26 +21,26 @@ BigDecimal amtCay(int argamt,int argplaces)
       }
       else
       {
-        if( argplaces = 2 )
+        if( argplaces == 2 )
         {
           num = new BigDecimal("0.01");
         }
         else
         {
-          if( argplaces = 3 )
+          if( argplaces == 3 )
           {
             num = new BigDecimal("0.001");
           }
           else
           {
-            if( argplaces = 4 )
+            if( argplaces == 4 )
             {
               num = new BigDecimal("0.0001");
             }
           }
         }
       }
-      argamt = Platform.numAdd(Platform.parseInt( tt ) , num);
+      argamt = Platform.numAdd(Platform.parseInt( tt ) , num).intValue();
       return  new BigDecimal(argamt);
     }
   }