change logic of spliting of CCTR And ACCT Code from Asset Install function

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@94006 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-dis/ibase/webitm/ejb/dis/adv/PoRcpConf.java

@@ -6332,7 +6332,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 				rs = null;
 			}*/
 			
-			sqlHdr = "INSERT INTO ASSET_INSTALL(TRAN_ID,TRAN_DATE, SITE_CODE, ASSET_CODE, ASSET_CODE__PAR, ALOC_CODE, ASSET_TYPE, DESCR,INST_DATE, USE_DATE, REMARKS, EMP_CODE, ITEM_CODE, GRP_CODE, CURR_CODE, EXCH_RATE, CHG_USER, CHG_DATE, CHG_TERM, ASSET_SALE_TYPE, CONFIRMED, TRAN_TYPE, PROJ_CODE, TRAN_ID__RCP,CCTR_CODE,CURR_CODE,EXCH_RATE__INST,INSTALL_CHGS,OCTROI_CHGS,COMM_CHGS,INST_CHGS__BC,ACCT_CODE__INST,CCTR_CODE__INST,EXCRECO_AMT,ORIGINAL_VALUE,ORIGINAL_VALUE__BC ) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+			sqlHdr = "INSERT INTO ASSET_INSTALL(TRAN_ID,TRAN_DATE, SITE_CODE, ASSET_CODE, ASSET_CODE__PAR, ALOC_CODE, ASSET_TYPE, DESCR,INST_DATE, USE_DATE, REMARKS, EMP_CODE, ITEM_CODE, GRP_CODE, CURR_CODE, EXCH_RATE, CHG_USER, CHG_DATE, CHG_TERM, ASSET_SALE_TYPE, CONFIRMED, TRAN_TYPE, PROJ_CODE, TRAN_ID__RCP,CCTR_CODE,EXCH_RATE__INST,INSTALL_CHGS,OCTROI_CHGS,COMM_CHGS,INST_CHGS__BC,ACCT_CODE__INST,CCTR_CODE__INST,EXCRECO_AMT,ORIGINAL_VALUE,ORIGINAL_VALUE__BC ) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
 			pstmtHdr = conn.prepareStatement(sqlHdr);
 			
 			sqlDet = "INSERT INTO ASSET_INSTALLDET(TRAN_ID, LINE_NO, TRAN_ID__RCP, LINE_NO__RCP, ITEM_CODE, LOC_CODE, LOT_NO, LOT_SL,QUANTITY, RATE, SUPP_CODE, SUPP_NAME, RCP_DATE, BILL_NO, BILL_DATE, CURR_CODE, EXCH_RATE, GRP_CODE, ASSET_CODE, TAX_AMT, TAX_RECO_AMT, EXCISE_AMT, EXCRECO_AMT, ORIGINAL_VALUE )	VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
@@ -6519,7 +6519,27 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 				cctrCode = finCommon.getFinparams("999999", "ACCT_CWIP", conn);
 				if (cctrCode != null && cctrCode.trim().length()>0 && !("NULLFOUND").equalsIgnoreCase(cctrCode))
 				{
-					acctCode = distCommon.getToken(cctrCode, ";");
+					String[] cctrStr = cctrCode.split(";");
+					int length = cctrStr.length-1;
+					System.out.println("@@@cr len["+length+"]");
+					if( length > -1 )
+					{
+						acctCode = cctrStr[0];
+					}
+					else
+					{
+						acctCode = "";	
+					}	
+
+					if( len > 0 )
+					{
+						cctrCode = cctrStr[1];	
+					}
+					else
+					{	
+						cctrCode = "";
+					}
+					
 				}
 				
 				sql = "SELECT SUM(CASE WHEN RECO_AMOUNT IS NULL THEN 0 ELSE RECO_AMOUNT END) AS RECO_AMOUNT, SUM(CASE WHEN TAX_AMT IS NULL THEN 0 ELSE TAX_AMT END) AS TAX_AMT  FROM  TAXTRAN WHERE  TRAN_CODE = 'P-RCP' AND TRAN_ID = ? AND LINE_NO = ?";
@@ -6606,17 +6626,17 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 				pstmtHdr.setString(23, projCode);
 				pstmtHdr.setString(24, tranId);
 				pstmtHdr.setString(25, cctrCodeDr);
-				pstmtHdr.setString(26, currCode);
-				pstmtHdr.setDouble(27, exchRate);
-				pstmtHdr.setDouble(28, taxInstallChgs);
-				pstmtHdr.setDouble(29, octroiChgs);
-				pstmtHdr.setDouble(30, commChgs);
-				pstmtHdr.setDouble(31, taxInstallChgs * exchRate);
-				pstmtHdr.setString(32, acctCode);
-				pstmtHdr.setString(33, cctrCode);
-				pstmtHdr.setDouble(34, excrecoAmt);
-				pstmtHdr.setDouble(35, originalValue);
-				pstmtHdr.setDouble(36, originalValue* exchRate);
+				//pstmtHdr.setString(26, currCode);
+				pstmtHdr.setDouble(26, exchRate);
+				pstmtHdr.setDouble(27, taxInstallChgs);
+				pstmtHdr.setDouble(28, octroiChgs);
+				pstmtHdr.setDouble(29, commChgs);
+				pstmtHdr.setDouble(30, taxInstallChgs * exchRate);
+				pstmtHdr.setString(31, acctCode);
+				pstmtHdr.setString(32, cctrCode);
+				pstmtHdr.setDouble(33, excrecoAmt);
+				pstmtHdr.setDouble(34, originalValue);
+				pstmtHdr.setDouble(35, originalValue* exchRate);
                 
 				pstmtHdr.addBatch();
 				pstmtHdr.clearParameters();