modify for unit and unit std update

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

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

@@ -260,13 +260,22 @@ public class StockAllocPrc extends ActionHandlerEJB implements StockAllocPrcLoca
 			java.sql.Timestamp tranDate = java.sql.Timestamp.valueOf(genericUtility.getValidDateString( currDateStr , applDateFormat, dbDateFormat ) + " 00:00:00.0") ;
 
 
-
+/*
 			sorditemSql = "SELECT ITEM_CODE,ITEM_CODE__ORD,UNIT, ITEM_REF"
 					//+" QUANTITY - QTY_DESP PENDING_QUANTITY "
 					+" FROM SORDITEM WHERE SALE_ORDER = ? "
 					+" AND LINE_NO = ? "
 					+" AND EXP_LEV = ? ";
 			//System.out.println("sorditemSql:::"+sorditemSql);
+*/  // commented by cpatil on 02/07/13
+// added by cpatil on 02/07/13
+			sorditemSql = " SELECT i.ITEM_CODE,i.ITEM_CODE__ORD,i.UNIT, i.ITEM_REF , d.unit__std" +
+						  " FROM SORDITEM i , sorddet d " +
+						  " WHERE i.SALE_ORDER = ?  AND i.LINE_NO = ? " +
+						  " AND i.EXP_LEV = ? " +
+						  " AND i.SALE_ORDER = d.SALE_ORDER " +
+						  " AND i.LINE_NO = d.LINE_NO ";
+// added by cpatil on 02/07/13
 			pSelSordItem = conn.prepareStatement(sorditemSql);
 
 			updateSorditem ="UPDATE SORDITEM  SET QTY_ALLOC = CASE WHEN QTY_ALLOC IS NULL THEN 0 ELSE QTY_ALLOC END  +  ? " 
@@ -393,10 +402,12 @@ public class StockAllocPrc extends ActionHandlerEJB implements StockAllocPrcLoca
 						//ITEM_CODE__ORD
 						itemCodeOrd = rsTemp.getString(2);	
 						//UNIT
-						unitStd = rsTemp.getString(3);	
+						//unitStd = rsTemp.getString(3);           	// comment by cpatil on 02/07/13
+						unit = rsTemp.getString(3);           	// added by cpatil on 02/07/13
 						//ITEM_REF
 						itemRef = rsTemp.getString(4);	
 						//PENDING_QUANTITY
+						unitStd = rsTemp.getString(5);			// added by cpatil on 02/07/13
 					}
 					rsTemp.close(); rsTemp = null;