source merge mail by manoj sharma (from SUN)

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

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

@@ -4403,7 +4403,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 					pstmtRbHdr.setString(18, cctrGl );
 					
 					
-			sql="select lot_no__passign,exp_date__passign FROM porddet where purc_order = ? and trim(line_no) = ? ";
+			sql="select lot_no__passign,exp_date__passign FROM porddet where purc_order = ? and line_no = ? ";//manoj dtd 03/10/2013 Removed trim from line_no 
 			pstmt1=conn.prepareStatement(sql);
 			pstmt1.setString(1,purcOrderTemp);
 			pstmt1.setString(2,lnoOrdTemp);
@@ -5088,6 +5088,12 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 				{
 					itemDes = checkNull(rs.getString("ITEM_CODE"));
 					linePoRcpDet = checkNull(rs.getString("LINE_NO"));
+					
+					if(linePoRcpDet.length()>0)//Added By Kunal on 3/oct/13 to trim line_no
+					{
+						linePoRcpDet = linePoRcpDet.trim();
+					}
+					System.out.println("linePoRcpDet=="+linePoRcpDet);
 
 					currRow = currRow + 1;
 					linePoRcpDetInInt = Integer.parseInt(linePoRcpDet);
@@ -5172,7 +5178,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 					rs1.close();
 					rs1 = null;
 
-					sql = "SELECT ITEM_CODE__ORD, QUANTITY,	EXP_LEV	, QTY_ALLOC FROM SORDITEM WHERE  SALE_ORDER = ? AND	 TRIM(LINE_NO)= ? AND LINE_TYPE = 'I'";
+					sql = "SELECT ITEM_CODE__ORD, QUANTITY,	EXP_LEV	, QTY_ALLOC FROM SORDITEM WHERE  SALE_ORDER = ? AND	 LINE_NO= ? AND LINE_TYPE = 'I'";//Manoj dtd 03/10/2013 removed trim from line_no
 					pstmt1 = conn.prepareStatement(sql);
 					pstmt1.setString(1, saleOrder );
 					pstmt1.setString(2, lineNoSord );
@@ -5306,7 +5312,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 					additionalCost = additionalCost * qtyDesp;
 					totalAdditionalCost = totalAdditionalCost + additionalCost;
 
-					sql = " UPDATE PORCPDET SET ADDITIONAL_COST = ADDITIONAL_COST + ? WHERE TRAN_ID = ? AND LINE_NO = ? ";
+					sql = " UPDATE PORCPDET SET ADDITIONAL_COST = ADDITIONAL_COST + ? WHERE TRAN_ID = ? AND TRIM(LINE_NO) = ? ";
 					pstmtUpd = conn.prepareStatement(sql);
 					pstmtUpd.setDouble(1, additionalCost);
 					pstmtUpd.setString(2, tranId);