improper stk_opt corrected

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

webitm-dis/ibase/webitm/ejb/dis/PurcRetnUpdateAllocPos.java

@@ -113,7 +113,10 @@ public class PurcRetnUpdateAllocPos extends ValidatorEJB implements PurcRetnUpda
 				locCode = GenericUtility.getInstance().getColumnValueFromNode("loc_code",currDetail);
 				lotNo = GenericUtility.getInstance().getColumnValueFromNode("lot_no",currDetail);
 				lotSl = GenericUtility.getInstance().getColumnValueFromNode("lot_sl",currDetail);
-				quantity = GenericUtility.getInstance().getColumnValueFromNode("quantity",currDetail);
+				// 31/12/11 manoharan quantity__stduom should be updated
+				//quantity = GenericUtility.getInstance().getColumnValueFromNode("quantity",currDetail);
+				quantity = GenericUtility.getInstance().getColumnValueFromNode("quantity__stduom",currDetail);
+				// end 31/12/11 manoharan quantity__stduom should be updated
 				lineNo = GenericUtility.getInstance().getColumnValueFromNode("line_no",currDetail);
 				System.out.println("lineNo :"+lineNo+" itemCode :"+itemCode+" locCodeFr :"+locCode+" lotNoFr :"+lotNo+" lotSlFr :"+lotSl+" quantity :"+quantity);
 				//String stlOption = chkStockOption(itemCode, siteCode);
@@ -134,7 +137,7 @@ public class PurcRetnUpdateAllocPos extends ValidatorEJB implements PurcRetnUpda
 				rs=null;
 				pstmt.close();
 				pstmt=null;
-				if (stlOption == null || stlOption.equals("N"))
+				if (stlOption == null || stlOption.trim().length() == 0 || stlOption.equals("N"))
 				{
 					sql = "SELECT CASE WHEN STK_OPT IS NULL THEN '0' ELSE STK_OPT END "
 						 +"FROM ITEM "

webitm-dis/ibase/webitm/ejb/dis/PurcRetnUpdateAllocPrs.java

@@ -116,7 +116,10 @@ public class PurcRetnUpdateAllocPrs extends ValidatorEJB implements PurcRetnUpda
 				locCode = GenericUtility.getInstance().getColumnValueFromNode("loc_code",currDetail);
 				lotNo = GenericUtility.getInstance().getColumnValueFromNode("lot_no",currDetail);
 				lotSl = GenericUtility.getInstance().getColumnValueFromNode("lot_sl",currDetail);
-				quantityStr = GenericUtility.getInstance().getColumnValueFromNode("quantity",currDetail);
+				// 31/12/11 manoharan quantity__stduom should be updated 
+				//quantityStr = GenericUtility.getInstance().getColumnValueFromNode("quantity",currDetail);
+				quantityStr = GenericUtility.getInstance().getColumnValueFromNode("quantity__stduom",currDetail);
+				// end 31/12/11 manoharan quantity__stduom should be updated
 				//String stockOpt = chkStockOption(itemCode, siteCode);
 				sql = "SELECT CASE WHEN STK_OPT IS NULL THEN 'N' ELSE STK_OPT END "
 				 +"FROM SITEITEM "
@@ -134,7 +137,7 @@ public class PurcRetnUpdateAllocPrs extends ValidatorEJB implements PurcRetnUpda
 				rs=null;
 				pstmt.close();
 				pstmt=null;
-				if (stockOpt == null || stockOpt.equals("N"))
+				if (stockOpt == null || stockOpt.trim().length() == 0 || stockOpt.equals("N"))
 				{
 					sql = "SELECT CASE WHEN STK_OPT IS NULL THEN '0' ELSE STK_OPT END "
 						 +"FROM ITEM "
@@ -154,7 +157,7 @@ public class PurcRetnUpdateAllocPrs extends ValidatorEJB implements PurcRetnUpda
 				if (updateStatus.equalsIgnoreCase("E") || updateStatus.equalsIgnoreCase("D"))
 				{
 					System.out.println("updateStatus updateStatus[[[[:"+updateStatus);
-					sql = "SELECT ITEM_CODE, LOC_CODE, LOT_NO, LOT_SL, QUANTITY FROM PORCPDET WHERE TRAN_ID = ? AND LINE_NO =? "; // Gulzar 17/05/07
+					sql = "SELECT ITEM_CODE, LOC_CODE, LOT_NO, LOT_SL, QUANTITY__stduom as QUANTITY FROM PORCPDET WHERE TRAN_ID = ? AND LINE_NO =? "; // Gulzar 17/05/07
 					pstmt = conn.prepareStatement(sql);
 					pstmt.setString(1,tranId);
 					pstmt.setString(2,lineNo);