Merge branch 'master' of http://192.168.0.110:11080/wangguangchao/hangzhoutd2bdsproject

script/ditopn.0036.script

@@ -6,8 +6,8 @@ void registerSettlement()
   Date feedat1 = Platform.today();
   Date feedat2 = Platform.today();
   String licomsw = "Y";
-  int licomun = Platform.getMonthUnits( $lidgrp\rec\opndat.getValue(), $lidgrp\rec\expdat.getValue() );
-  licomun = 1;
+  // int licomun = Platform.getMonthUnits( $lidgrp\rec\opndat.getValue(), $lidgrp\rec\expdat.getValue() );
+  int licomun = 1;
   $setmod\setfeg.addFeeData( "DISCOM", licomsw, licomun, feedat1, feedat2 );
 
 }
\ No newline at end of file

script/ptssub.0007.script

@@ -27,12 +27,12 @@ String ptsmodGetPtsptaPathFromRol(String argrol,IModule arggrp)
       type = Platform.recGetObj( rolmod );
       if( Platform.compareTo(type, "PTSPTA") != 0 )
       {
-        Platform.clear( rolmodpath );
+        rolmodpath = NULLSTR;
       }
     }
     else
     {
-      Platform.clear( rolmodpath );
+      rolmodpath = NULLSTR;
     }
   }
   return  rolmodpath;