changes made for confirmation

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

webitm-dis/ibase/webitm/ejb/dis/adv/.project

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>adv</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>

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

@@ -9,6 +9,7 @@ import ibase.utility.EMail;
 import ibase.utility.CommonConstants;
 import ibase.webitm.utility.*;
 import ibase.webitm.ejb.*;
+import ibase.webitm.ejb.sys.*;
 import ibase.system.config.*;
 import ibase.webitm.utility.ITMException;
 
@@ -107,9 +108,45 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 				retString = retrieveReceipt(tranId, 1,conn, xtraParams);
 				if (retString == null || retString.trim().length() == 0)
 				{
+					////////////////////// EDI creation
+					String ediOption = "";
+					String dataStr = "";
+					sql = "SELECT EDI_OPTION FROM TRANSETUP WHERE TRAN_WINDOW = 'w_porcp' ";
+					pstmtSql = conn.prepareStatement(sql);
+					rs = pstmtSql.executeQuery();
+					if ( rs.next() )
+					{
+						ediOption = checkNull(rs.getString("EDI_OPTION"));
+					}
+					rs.close();rs = null;
+					pstmtSql.close();pstmtSql = null;
+
+					if ( "1".equals(ediOption.trim()) )
+					{
+						CreateRCPXML createRCPXML = new CreateRCPXML("w_porcp","tran_id");
+						dataStr = createRCPXML.getTranXML( tranId, conn );
+						System.out.println( "dataStr =[ "+ dataStr + "]" );
+						Document ediDataDom = genericUtility.parseString(dataStr);
+
+						E12CreateBatchLoadEjb e12CreateBatchLoad = new E12CreateBatchLoadEjb();
+						retString = e12CreateBatchLoad.createBatchLoad( ediDataDom, "w_porcp", "0", xtraParams, conn );
+						createRCPXML = null;
+						e12CreateBatchLoad = null;
+
+						if( retString != null && "SUCCESS".equals(retString) )
+						{
+							System.out.println("retString from batchload = ["+retString+"]");
+						}
+					}
+					/////////////////////
+
 					retString = itmDBAccessLocal.getErrorString("","VTMCONF20","");
 					conn.commit();
 				}
+				else
+				{
+					conn.rollback();
+				}
 			}
 		}
 		catch(Exception e)
@@ -440,7 +477,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 				rs = null;
 			}
 
-			sql = "SELECT PURC_ORDER,LINE_NO__ORD, ITEM_CODE, SUM(QUANTITY) FROM PORCPDET "
+			sql = "SELECT PURC_ORDER,LINE_NO__ORD, ITEM_CODE, SUM(QUANTITY) QUANTITY FROM PORCPDET "
 				+ " WHERE TRAN_ID = ? GROUP BY PURC_ORDER,LINE_NO__ORD, ITEM_CODE ";
 			pstmtSql = conn.prepareStatement(sql);
 			pstmtSql.setString(1, tranId);
@@ -457,8 +494,11 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 					itemCode = checkNull(rs.getString("ITEM_CODE"));
 					qtyRcp = rs.getDouble("QUANTITY");
 
+					lineNoOrd = "   " + lineNoOrd;
+					lineNoOrd = lineNoOrd.substring( lineNoOrd.length()-3 );
+
 					ResultSet rs1 = null;
-					sql = "SELECT QUANTITY , CASE WHEN DLV_QTY IS NULL THEN 0 ELSE DLV_QTY END FROM PORDDET WHERE PURC_ORDER = ? AND		   LINE_NO   = ? ";
+					sql = "SELECT QUANTITY , (CASE WHEN DLV_QTY IS NULL THEN 0 ELSE DLV_QTY END) DLV_QTY FROM PORDDET WHERE PURC_ORDER = ? AND		   LINE_NO   = ? ";
 					pstmtSql = conn.prepareStatement(sql);
 					pstmtSql.setString(1, purcOrder);
 					pstmtSql.setString(2, lineNoOrd);
@@ -477,7 +517,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 					
 					if ( totRcp > ordQty )
 					{   
-						sql = "SELECT (CASE WHEN QTY_TOL_PERC IS NULL THEN 0 ELSE QTY_TOL_PERC END) FROM ITEM WHERE ITEM_CODE = ? ";
+						sql = "SELECT (CASE WHEN QTY_TOL_PERC IS NULL THEN 0 ELSE QTY_TOL_PERC END) QTY_TOL_PERC FROM ITEM WHERE ITEM_CODE = ? ";
 						pstmtSql = conn.prepareStatement(sql);
 						pstmtSql.setString(1, itemCode);
 						rs1 = pstmtSql.executeQuery();
@@ -610,7 +650,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 			rs.close();
 			rs = null;
 
-			sql = "SELECT (CASE WHEN LEDG_POST_CONF IS NULL THEN 'N' ELSE LEDG_POST_CONF END ) FROM TRANSETUP WHERE LOWER(TRAN_WINDOW)		   = 'W_PORCP' ";
+			sql = "SELECT (CASE WHEN LEDG_POST_CONF IS NULL THEN 'N' ELSE LEDG_POST_CONF END ) LEDG_POST_CONF FROM TRANSETUP WHERE LOWER(TRAN_WINDOW) = 'W_PORCP' ";
 			pstmtSql = conn.prepareStatement(sql);
 			rs = pstmtSql.executeQuery();
 			if ( rs.next() )
@@ -897,7 +937,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 			rs.close();
 			rs = null;
 
-			sql = "Select case when eou is null then 'N' else eou end From site Where site_code = ?";
+			sql = "Select (case when eou is null then 'N' else eou end) eou From site Where site_code = ?";
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1, siteRcp);
 			rs = pstmt.executeQuery();
@@ -1015,7 +1055,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 			pstmtItemLotPack = conn.prepareStatement(sql);
 
 			sql = "select line_no, item_code, purc_order, quantity, " 
-				 + " unit, rate__stduom, discount, tax_amt, net_amt, }"
+				 + " unit, rate__stduom, discount, tax_amt, net_amt, "
 				 + " loc_code, line_no__ord, canc_bo, lot_no, lot_sl, "
 				 + " unit__std, quantity__stduom, acct_code__cr, acct_code__dr, cctr_code__cr, cctr_code__dr, " 
 				 + " mfg_date, pack_code, potency_perc, expiry_date, "
@@ -1024,7 +1064,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 				 + " (case when excess_short_qty is null then 0 else excess_short_qty end) as excess_short_qty, "
 				 + " loc_code__excess_short	, (case when realised_qty is null then 0 else realised_qty end) as excess_short_qty, "
 				 + " batch_no, no_art, item_code__mfg, std_rate, effect_stock, form_no, retest_date, "
-				 + " duty_paid, batch_size, qc_reqd "
+				 + " duty_paid, batch_size "
 				 + " from porcpdet Where tran_id = ? " ;
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1, tranId);
@@ -1095,7 +1135,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 				retestDate = rs.getTimestamp("retest_date");
 				dutyPaid = rs.getString("duty_paid");
 				batchSize = rs.getDouble("batch_size");
-				qcReqd = rs.getString("qc_reqd");
+				//qcReqd = rs.getString("qc_reqd");//Gulzar this column is not present in porcpdet
 				///////////////////////////////////////////////////////////////////////////////
 				// maintain the lock list in the map as per supplier or supplieritem definition
 				// suppLockList
@@ -1142,6 +1182,8 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 				{
 					itemLockList = suppLockList;
 				}
+				if ( itemLockList != null && itemLockList.size() > 0 )
+				{
 					for (int ctr = 0; ctr < itemLockList.size(); ctr ++)
 					{
 						tempLockCode = (String) itemLockList.get(ctr);
@@ -1174,6 +1216,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 							lockCodeWiseMap.put(tempLockCode,tempList);
 						}
 					}
+				}
 				///////////////////////////////////////////////////////////////////////////////
 				if (purcOrder != null )
 				{
@@ -1347,8 +1390,11 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 					cctrCodeInv  = finCommon.getFromAcctDetr(itemCode, itemSer, "STKINV", conn);
 					
 					String tokens [] = cctrCodeInv.split(",");
+					if ( tokens != null && tokens.length >=2 )
+					{
 						acctCodeInv = tokens[0];
 						cctrCodeInv = tokens[1];
+					}
 							
 					//Calculating effective rate
 					// 22/01/01 manoharan argument gross_net added to the function
@@ -2138,7 +2184,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 		try
 		{
 
-			sql = "select (case when exch_rate is null then 0 else exch_rate end )  from porcp " 
+			sql = "select (case when exch_rate is null then 0 else exch_rate end ) exch_rate from porcp " 
 				+ " where tran_id = ? ";
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1,tranId);
@@ -2354,7 +2400,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 		{
 			ITMDBAccessEJB itmDBAccessLocal = new ITMDBAccessEJB();
 			
-			sql = "SELECT (CASE WHEN TOTAL_ADDITIONAL_COST IS NULL THEN 0 ELSE TOTAL_ADDITIONAL_COST END) FROM PORCP WHERE TRAN_ID = ? ";
+			sql = "SELECT (CASE WHEN TOTAL_ADDITIONAL_COST IS NULL THEN 0 ELSE TOTAL_ADDITIONAL_COST END) AS TOTAL_ADDITIONAL_COST FROM PORCP WHERE TRAN_ID = ? ";
 			pstmtSql = conn.prepareStatement(sql);
 			pstmtSql.setString(1, tranId);
 			rs = pstmtSql.executeQuery();