changes in sql for partial order by clause

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

webitm-mfg/ibase/webitm/ejb/mfg/adv/WOrderIssueAct.java

@@ -172,7 +172,7 @@ public class WOrderIssueAct extends ActionHandlerEJB implements  WOrderIssueActL
 			conn = connDriver.getConnectDB("DriverITM");
 			tranType = genericUtility.getColumnValue("tran_type", dom1);
 			tranIdReq = genericUtility.getColumnValue("tran_id__req", dom1);
-//			System.out.println("tranType before null :::: " + tranType + "tranIdReq :::: " + tranIdReq); //COMMENTED BY ALKA 19/07/07 AS NOT REQUIRED
+			//			System.out.println("tranType before null :::: " + tranType + "tranIdReq :::: " + tranIdReq); //COMMENTED BY ALKA 19/07/07 AS NOT REQUIRED
 			if (tranIdReq == null) tranIdReq = "";
 			if (tranType == null) tranType = "";
 
@@ -193,7 +193,7 @@ public class WOrderIssueAct extends ActionHandlerEJB implements  WOrderIssueActL
 					System.out.println("expLev :: " + expLev + " itemCode :: " + itemCode);
 					System.out.println("qtyReq :: " + qtyReq);
 
-//					DEDUCT THE ISSUED QUANTITY FOR THIS REQ
+					//					DEDUCT THE ISSUED QUANTITY FOR THIS REQ
 					sql = "SELECT SUM(B.QUANTITY) FROM WORKORDER_ISS A, WORKORDER_ISSDET B " 
 							+ " WHERE (A.TRAN_ID = B.TRAN_ID) AND (A.CONFIRMED = 'Y' ) AND  (A.TRAN_TYPE = ?) " 
 							+ " AND  (A.TRAN_ID__REQ = ?) AND (B.ITEM_CODE = ?) AND (B.EXP_LEV = ?)";
@@ -227,7 +227,7 @@ public class WOrderIssueAct extends ActionHandlerEJB implements  WOrderIssueActL
 				pstmt.close();
 				rs.close();
 			}
-//			ADDED BY ALKA 19/07/07 TO DISPLAY MESSAGE THAT THE ALL ITEMS BUTTON WORKS ON INCASE OF "D" OR "O"
+			//			ADDED BY ALKA 19/07/07 TO DISPLAY MESSAGE THAT THE ALL ITEMS BUTTON WORKS ON INCASE OF "D" OR "O"
 			else
 			{
 				errCode = "VTTRANTY";
@@ -235,7 +235,7 @@ public class WOrderIssueAct extends ActionHandlerEJB implements  WOrderIssueActL
 				System.out.println("errString :" + errString);
 				return errString;
 			}
-//			ADDITION ENDED BY ALKA 19/07/07 TO DISPLAY MESSAGE THAT THE ALL ITEMS BUTTON WORKS ON INCASE OF "D" OR "O"
+			//			ADDITION ENDED BY ALKA 19/07/07 TO DISPLAY MESSAGE THAT THE ALL ITEMS BUTTON WORKS ON INCASE OF "D" OR "O"
 			valueXmlString.append("</Root>\r\n");
 
 		} catch (SQLException sqx) {
@@ -255,16 +255,16 @@ public class WOrderIssueAct extends ActionHandlerEJB implements  WOrderIssueActL
 		return valueXmlString.toString();
 	}
 
-	private String actionStock(Document dom, Document dom1, String xtraParams)
-			throws RemoteException, ITMException {
-/*		 
+	private String actionStock(Document dom, Document dom1, String xtraParams) throws RemoteException, ITMException 
+	{
+		/*		 
 		 * ALLOWS THE USER TO SELECT STOCK FROM DIFF. LOC_CODE, LOT_NO, LOT_SL
 		 GETS ALL STOCK FROM STOCK TABLE FOR FOLLOWING CONDITIONS:
 		 	SITE_CODE = HEADER SITE_CODE ---- ITEM_CODE = ITEM CODE ENTERED
 		 	INVSTAT.AVAILABLE = 'Y' ---	EXPIRY DATE IS NULL OR EXPIRY DATE IS > HEADER EFF_DATE 
 		 	RETEST_DATE > HEADER EFF_DATE ---- 	QUANTITY - ALLOC_QTY > 0
 		 IF QC_REQD = 'Y' THEN ONLY EXPIRY DATE AND	RETEST DATE TO BE CONSIDERED
-*/
+		 */
 		String siteCode = null, itemCode = null, dimension = null, bomCode = null, expLev = null;
 		String errCode = null, errString = null, sql = null;
 		String expDate1 = null, retestDate1 = null, retestDt = null, effDate = null, itemCodeMain = null;
@@ -343,7 +343,7 @@ public class WOrderIssueAct extends ActionHandlerEJB implements  WOrderIssueActL
 
 			// end 18/02/12 manoharan
 
-//			for qc_reqd to be checked from first siteitem & then item			
+			//			for qc_reqd to be checked from first siteitem & then item			
 			qcReqd = mfgCommon.chkQcReqd(siteCode, itemCode, conn);
 			autoQcReqd = mfgCommon.chkAutoQcReqd(siteCode, itemCode, conn);
 
@@ -373,7 +373,7 @@ public class WOrderIssueAct extends ActionHandlerEJB implements  WOrderIssueActL
 			pstmt.close();
 			rs.close();
 
-			sql = "SELECT DIMENSION, USE_INVSTATUS FROM BOMDET WHERE BOM_CODE = ? AND ITEM_CODE = ? AND ITEM_REF  = ?";
+			sql = "SELECT DIMENSION,USE_INVSTATUS FROM BOMDET WHERE BOM_CODE = ? AND ITEM_CODE = ? AND ITEM_REF  = ?";
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1, bomCode);
 			pstmt.setString(2, itemCodeMain);
@@ -398,10 +398,10 @@ public class WOrderIssueAct extends ActionHandlerEJB implements  WOrderIssueActL
 			System.out.println("trackShelfLife :: " + trackShelfLife + " useInvStatus :: " + useInvStatus);
 			if (dimension.trim().length() == 0)
 			{
-//				 check whether any valid record in stock exist for the item
-//				TO CHECK USE_INVSTATUS FROM BOMDET -- IF IT IS B THEN CHECK STAT_TYPE FROM INVSTAT
-//				to check all condition for auto_reqc 
-//				Added Location code join to invstat
+				//				 check whether any valid record in stock exist for the item
+				//				TO CHECK USE_INVSTATUS FROM BOMDET -- IF IT IS B THEN CHECK STAT_TYPE FROM INVSTAT
+				//				to check all condition for auto_reqc 
+				//				Added Location code join to invstat
 				if (qcReqd.equalsIgnoreCase("Y") && autoQcReqd.equalsIgnoreCase("Y") && trackShelfLife.equalsIgnoreCase("Y") && useInvStatus.equalsIgnoreCase("U"))
 				{
 					sql = " SELECT COUNT(A.ITEM_CODE) FROM   STOCK A, LOCATION B, INVSTAT  C "
@@ -639,8 +639,8 @@ public class WOrderIssueAct extends ActionHandlerEJB implements  WOrderIssueActL
 				pstmt.close();
 				rs.close();
 				System.out.println("dimension :: " + dimension + " trimWidth :: " + trimWidth);
-//				TO CHECK USE_INVSTATUS FROM BOMDET
-//				IF IT IS B THEN CHECK STAT_TYPE FROM INVSTAT
+				//				TO CHECK USE_INVSTATUS FROM BOMDET
+				//				IF IT IS B THEN CHECK STAT_TYPE FROM INVSTAT
 				if (qcReqd.equalsIgnoreCase("Y") && autoQcReqd.equalsIgnoreCase("Y") && trackShelfLife.equalsIgnoreCase("Y") && useInvStatus.equalsIgnoreCase("U"))
 				{
 					sql = " SELECT COUNT(A.ITEM_CODE) FROM   STOCK A, LOCATION B, INVSTAT  C "
@@ -986,15 +986,15 @@ public class WOrderIssueAct extends ActionHandlerEJB implements  WOrderIssueActL
 			}
 			// end 26/03/12 manoharan
 			// 02/04/12 manoharan sorting to be doen as per PB logic
-			//changes by cpandey additin condition for track shelf life  on 20/08/12
+			//changes done by cpandey additin condition for track shelf life  on 20/08/12
 			if("N".equalsIgnoreCase(trackShelfLife))
 			{
-				sql = sql + " order by partial_used,decode('N','P',decode(rtrim(location.loc_group),rtrim(''),'A','B'),'0'), " ;
+				sql = sql + " order by partial_used,decode('N','P',decode(rtrim(c.loc_group),rtrim(''),'A','B'),'0'), " ;
 				System.out.println("sql If track self life is N  ["+sql+"]>>");
 			}
 			if("Y".equalsIgnoreCase(trackShelfLife))
 			{
-				sql = sql + " order by partial_used,decode('N','P',decode(rtrim(location.loc_group),rtrim(''),'A','B'),'0'), " ;
+				sql = sql + " order by partial_used,decode('N','P',decode(rtrim(c.loc_group),rtrim(''),'A','B'),'0'), " ;
 				System.out.println("sql sql If track self life is Y--["+sql+"]>>");
 			}
 			//end of changes on 20/08/12
@@ -1004,6 +1004,7 @@ public class WOrderIssueAct extends ActionHandlerEJB implements  WOrderIssueActL
 			if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME))
 			{
 				sql = sql + " nvl(a.exp_date,a.crea_date),a.crea_date,a.lot_no ";
+				System.out.println("after sql db converted --["+sql+"]->.");
 			}
 			else
 			{	
@@ -1121,8 +1122,8 @@ public class WOrderIssueAct extends ActionHandlerEJB implements  WOrderIssueActL
 		return valueXmlString.toString();
 	}
 
-	private String stockTransform(Document dom, Document dom1, String objContext, String xtraParams, Document selDataDom)
-			throws ITMException {
+	private String stockTransform(Document dom, Document dom1, String objContext, String xtraParams, Document selDataDom) throws ITMException 
+	{
 		System.out.println("stockTransform is calling.............");
 		StringBuffer valueXmlString = new StringBuffer("<?xml version=\"1.0\"?>\r\n<Root>\r\n");
 
@@ -1171,12 +1172,11 @@ public class WOrderIssueAct extends ActionHandlerEJB implements  WOrderIssueActL
 			int noOfDetails = detailList.getLength();
 			for (int ctr = 0; ctr < noOfDetails; ctr++) {
 				currDetail = detailList.item(ctr);
-				stkQty = stkQty + Double.parseDouble((GenericUtility.getInstance().getColumnValueFromNode("quantity",
-												currDetail)));
+				stkQty = stkQty + Double.parseDouble((GenericUtility.getInstance().getColumnValueFromNode("quantity",currDetail)));
 			}
 			System.out.println("stkQty  :" + stkQty);
 
-//			if (stkQty < quantity)
+			//			if (stkQty < quantity)
 			if (quantity != 0 && stkQty < quantity) //CHANGED BY ALKA 19/07/07 FOR HANDLING NO QUANTITY ENTERED.
 			{
 				errCode = "VTSTOCK1";
@@ -1185,8 +1185,8 @@ public class WOrderIssueAct extends ActionHandlerEJB implements  WOrderIssueActL
 				conn = null;
 				return errString;
 			}
-//			remainingQty = quantity;  //COMMENTED BY ALKA AS THE FOLLOWING LOGIC IS ADDED
-//			ADDED BY ALKA ON 19/07/07 FOR SELECTED STOCK TO BE ENTERED IN THE DETAIL IF THE QUANTITY IS 0
+			//			remainingQty = quantity;  //COMMENTED BY ALKA AS THE FOLLOWING LOGIC IS ADDED
+			//			ADDED BY ALKA ON 19/07/07 FOR SELECTED STOCK TO BE ENTERED IN THE DETAIL IF THE QUANTITY IS 0
 			if (quantity == 0)
 			{
 				remainingQty = stkQty;
@@ -1197,7 +1197,7 @@ public class WOrderIssueAct extends ActionHandlerEJB implements  WOrderIssueActL
 			}
 			System.out.println("quantity at the start of the forloop :::: " + quantity);
 			System.out.println("remainingQty at the start of the forloop :::: " + remainingQty);
-//			ADDITION ENDED BY ALKA 19/07/07
+			//			ADDITION ENDED BY ALKA 19/07/07
 			if (noOfDetails > 0) 
 			{
 				for (int ctr = 0; ctr < noOfDetails && remainingQty > 0; ctr++) 
@@ -1275,7 +1275,7 @@ public class WOrderIssueAct extends ActionHandlerEJB implements  WOrderIssueActL
 						rs.close();
 					}
 					if ((siteCode != null) && (itemCode != null) && (stkLocCode != null) && (stkLotNo != null) &&	(stkLotSl != null) && 
-//							(expLev != null) && (quantity != 0) && (tranType != null) )
+							//							(expLev != null) && (quantity != 0) && (tranType != null) )
 							(expLev != null) && (inputQty != 0) && (tranType != null) )  //CHANGED BY ALKA 19/07/07 AS WEIGHT DATA WERE NOT DISPLAYED IN THE DETAIL
 					{
 						gWeight = Double.parseDouble(genericUtility.getColumnValue("gross_weight", dom));
@@ -1405,7 +1405,6 @@ public class WOrderIssueAct extends ActionHandlerEJB implements  WOrderIssueActL
 			pstmt.close();
 			rs.close();
 			
-			
 			if (tranType.equalsIgnoreCase("F"))
 			{
 				unitAlt = genericUtility.getColumnValue("unit__alt", dom);
@@ -1415,7 +1414,7 @@ public class WOrderIssueAct extends ActionHandlerEJB implements  WOrderIssueActL
 			operation = Double.parseDouble(genericUtility.getColumnValue("operation", dom1));
 			bomCode = genericUtility.getColumnValue("bom_code", dom1);
 
-//			VAL ADDED NOT TO ALLOW SAVE IF EXP_LEV IS NULL
+			//			VAL ADDED NOT TO ALLOW SAVE IF EXP_LEV IS NULL
 			if (expLev == null || expLev.trim().length() == 0)
 			{
 				errCode = "VTEXP1";
@@ -1423,7 +1422,7 @@ public class WOrderIssueAct extends ActionHandlerEJB implements  WOrderIssueActL
 				return errString;
 			}
 
-//			TRIM WIDTH FOR DIMENSION VALIDATION
+			//			TRIM WIDTH FOR DIMENSION VALIDATION
 			sql = "SELECT ITEM_CODE FROM WORKORDER WHERE WORK_ORDER = ?";
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1, workOrder);
@@ -1458,7 +1457,6 @@ public class WOrderIssueAct extends ActionHandlerEJB implements  WOrderIssueActL
 			{
 				itemCodeMain = rs.getString(1);
 				itemCodeRef = rs.getString(2);
-				
 				sql = "SELECT DIMENSION, USE_INVSTATUS FROM BOMDET WHERE BOM_CODE = ? AND ITEM_CODE = ? AND ITEM_REF  = ?";
 				pstmt1 = conn.prepareStatement(sql);
 				pstmt1.setString(1, bomCode);
@@ -1479,26 +1477,26 @@ public class WOrderIssueAct extends ActionHandlerEJB implements  WOrderIssueActL
 			pstmt.close();
 			rs.close();
 
-//			NOT TO BE INCLUDED AS RND NOT CONSIDERED -- ALKA
-//			sql = "SELECT ORDER_TYPE FROM WORKORDER WHERE WORK_ORDER = ?";
-//			pstmt = conn.prepareStatement(sql);
-//			pstmt.setString(1, workOrder);
-//			rs = pstmt.executeQuery();
-//			if (rs.next())
-//			{
-//				orderType = rs.getString(1);
-//			}
-//			pstmt.close();
-//			rs.close();
-//			
-//			if (orderType.equalsIgnoreCase("T")
-//			{
-//				stkOpt = chkStkOptRnd(itemCode, siteCode);
-//			}
-//			else
-//			{
-//				stkOpt = chkStkOpt(itemCode, siteCode);
-//			}
+			//			NOT TO BE INCLUDED AS RND NOT CONSIDERED -- ALKA
+			//			sql = "SELECT ORDER_TYPE FROM WORKORDER WHERE WORK_ORDER = ?";
+			//			pstmt = conn.prepareStatement(sql);
+			//			pstmt.setString(1, workOrder);
+			//			rs = pstmt.executeQuery();
+			//			if (rs.next())
+			//			{
+			//				orderType = rs.getString(1);
+			//			}
+			//			pstmt.close();
+			//			rs.close();
+			//			
+			//			if (orderType.equalsIgnoreCase("T")
+			//			{
+			//				stkOpt = chkStkOptRnd(itemCode, siteCode);
+			//			}
+			//			else
+			//			{
+			//				stkOpt = chkStkOpt(itemCode, siteCode);
+			//			}
 
 			stkOpt = mfgCommon.chkStkOpt(siteCode,itemCode,conn);
 
@@ -1750,8 +1748,8 @@ public class WOrderIssueAct extends ActionHandlerEJB implements  WOrderIssueActL
 					cntQ = st1.countTokens();
 					pstmt = conn.prepareStatement(sql);
 					flag1 = false; flag2 = false;
-					pstmt.setString(1, itemCode);
-					pstmt.setString(2, siteCode);
+					pstmt.setString(1,itemCode);
+					pstmt.setString(2,siteCode);
 					for (int i=3; i<cntQ; i++)
 					{
 						if (trackShelfLife.equalsIgnoreCase("Y") && flag1 == false)
@@ -1771,13 +1769,13 @@ public class WOrderIssueAct extends ActionHandlerEJB implements  WOrderIssueActL
 						}
 						if (dimension.trim().length() > 0)
 						{
-							pstmt.setString(i, dimension);
+							pstmt.setString(i,dimension);
 							pstmt.setDouble(i+1, trimWidth);
 							break;
 						}
 					}
-					System.out.println("Setting parameters ::: itemCode ::: " + itemCode + "siteCode ::: " + siteCode);
-					System.out.println("effDate ::: " + effDate + "dimension ::: " + dimension + "trimWidth ::: " + trimWidth);
+					System.out.println("Setting parameters ::: itemCode ::: "+itemCode+"siteCode ::: " +siteCode);
+					System.out.println("effDate ::: " +effDate+ "dimension ::: " +dimension+ "trimWidth ::: " +trimWidth);
 
 					rs = pstmt.executeQuery();
 					remainingQty = quantity;
@@ -1868,7 +1866,7 @@ public class WOrderIssueAct extends ActionHandlerEJB implements  WOrderIssueActL
 							cpstmt1.close(); cpstmt1 = null;
 						}
 						if ((siteCode != null) && (itemCode != null) && (locCode != null) && (lotNo != null) &&	(lotSl != null) && 
-//								(expLev != null) && (quantity != 0) && (tranType != null) )
+								//								(expLev != null) && (quantity != 0) && (tranType != null) )
 								(expLev != null) && (inputQty != 0) && (tranType != null) ) //CHANGED BY ALKA 19/07/07 AS WEIGHT DATA IS NOT DISPLAYED IN THE DETAIL
 						{
 							gWeight = Double.parseDouble(genericUtility.getColumnValue("gross_weight", dom));
@@ -2100,7 +2098,8 @@ public class WOrderIssueAct extends ActionHandlerEJB implements  WOrderIssueActL
 		return retString;
 	}
 
-	private void getItemChanged(Document dom, Document dom1, String expLev, Connection conn) throws Exception {
+	private void getItemChanged(Document dom, Document dom1, String expLev, Connection conn) throws Exception 
+	{
 		PreparedStatement pstmt = null, pstmt1 = null;
 		ResultSet rs = null, rs1 = null;
 		String sql = null;
@@ -2191,14 +2190,14 @@ public class WOrderIssueAct extends ActionHandlerEJB implements  WOrderIssueActL
 
 			if ("R".equals(tranType))
 			{
-//				previous return quantity to consider also.
+				//				previous return quantity to consider also.
 				quantity = getIssueReturnQty(workOrder, expLev, itemCode, itemCodeRef, tranType, operation, bomCode, conn);
 				returnQty = getIssueReturnQty(workOrder, expLev, itemCode, itemCodeRef, tranType, operation, bomCode, conn);
 
-//				RETURN QTY MAY BE IN -VE HENCE ABS IT BEFORE DEDUCTING FROM ISSUE
+				//				RETURN QTY MAY BE IN -VE HENCE ABS IT BEFORE DEDUCTING FROM ISSUE
 				quantity = quantity - Math.abs(returnQty);
 
-//				QUANTITY TO BE SET BASED ON PRODUCTION ALREADY DONE AND BALANCE LEFT
+				//				QUANTITY TO BE SET BASED ON PRODUCTION ALREADY DONE AND BALANCE LEFT
 				sql = " SELECT QUANTITY + CASE WHEN POTENCY_ADJ IS NULL THEN 0 ELSE POTENCY_ADJ END FROM WORKORDER_BILL " 
 						+ " WHERE WORK_ORDER = ? AND  OPERATION = ? AND EXP_LEV = ?";
 				pstmt = conn.prepareStatement(sql);
@@ -2250,8 +2249,8 @@ public class WOrderIssueAct extends ActionHandlerEJB implements  WOrderIssueActL
 			}
 			else
 			{
-//				THE FUNCTION FOR PENDING QUANTITY IS RETURNING THE PENDING QUANTITY 
-//				WITHOUT CONSIDERING THE CURRENT TRANSACTION QUANTITY
+				//				THE FUNCTION FOR PENDING QUANTITY IS RETURNING THE PENDING QUANTITY 
+				//				WITHOUT CONSIDERING THE CURRENT TRANSACTION QUANTITY
 				sql = " SELECT SUM(B.QUANTITY) FROM WORKORDER_ISS A, WORKORDER_ISSDET B " 
 						+ " WHERE A.TRAN_ID = B.TRAN_ID AND A.TRAN_ID = ? AND A.OPERATION = ? AND B.EXP_LEV = ? "
 						+ " AND B.ITEM_CODE = ?" ;
@@ -2326,8 +2325,8 @@ public class WOrderIssueAct extends ActionHandlerEJB implements  WOrderIssueActL
 				}
 			}
 
-//			IF W/O RETURN AND ITEM.QC_REQD = 'Y' --  DON'T ALLOW TO CHANGE QC_REQD 
-//			IF WORK ORDER TYPE IS PACKING SET QC_REQD = 'N' EVEN THOUGH RETURN
+			//			IF W/O RETURN AND ITEM.QC_REQD = 'Y' --  DON'T ALLOW TO CHANGE QC_REQD 
+			//			IF WORK ORDER TYPE IS PACKING SET QC_REQD = 'N' EVEN THOUGH RETURN
 			itemCode = genericUtility.getColumnValue("item_code", dom1);
 			if ("R".equals(tranType) || "P".equals(orderType))
 			{
@@ -2335,7 +2334,7 @@ public class WOrderIssueAct extends ActionHandlerEJB implements  WOrderIssueActL
 			}
 			else
 			{
-//				IF AUTO_REQC IS 'YES' IN SITEITEM THEN SET QC_REQD = 'YES'
+				//				IF AUTO_REQC IS 'YES' IN SITEITEM THEN SET QC_REQD = 'YES'
 				sql = "SELECT CASE WHEN AUTO_REQC IS NULL THEN 'N' ELSE AUTO_REQC END FROM SITEITEM WHERE SITE_CODE = ? AND	ITEM_CODE = ?";
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1, siteCode);
@@ -2363,7 +2362,7 @@ public class WOrderIssueAct extends ActionHandlerEJB implements  WOrderIssueActL
 				setValueInDom(dom, "qc_reqd", qcReqd);
 			}
 
-//			IF DEVIATED ISSUE IS FROM REQUEST THEN SELECT THE QUANTITY.
+			//			IF DEVIATED ISSUE IS FROM REQUEST THEN SELECT THE QUANTITY.
 			if (tranIdReq == null) 
 			{
 				tranIdReq = "";
@@ -2386,7 +2385,7 @@ public class WOrderIssueAct extends ActionHandlerEJB implements  WOrderIssueActL
 				pstmt.close();
 				rs.close();
 
-//				DEDUCT THE ISSUED QUANTITY FOR THIS REQ
+				//				DEDUCT THE ISSUED QUANTITY FOR THIS REQ
 				sql = " SELECT SUM(B.QUANTITY) FROM WORKORDER_ISS A, WORKORDER_ISSDET B " 
 						+ " WHERE (A.TRAN_ID = B.TRAN_ID ) AND  (A.CONFIRMED = 'Y' ) AND  (A.TRAN_TYPE = ?) " 
 						+ " AND  (A.TRAN_ID__REQ = ?) AND (B.ITEM_CODE = ?) AND (B.EXP_LEV = ?)";
@@ -2405,12 +2404,12 @@ public class WOrderIssueAct extends ActionHandlerEJB implements  WOrderIssueActL
 				System.out.println("Manohar Deviated/Ondemand qtyReq [" + qtyReq + "] totQtyIss [" + totQtyIss + "] reason [" + reason + "]");
 				setValueInDom(dom, "quantity", Double.toString(qtyReq - totQtyIss));
 
-//				SET THE ITEM FROM REQUEST
+				//				SET THE ITEM FROM REQUEST
 				if (itemCode != null && itemCode.trim().length() > 0)
 				{
 					setValueInDom(dom, "item_code", itemCode);
 					setValueInDom(dom1, "unit", unit);
-//					REASON CODE SHUD COME FROM ISSUE REQUEST IN CASE OF DEVI AND ONDEMAND ISSUE
+					//					REASON CODE SHUD COME FROM ISSUE REQUEST IN CASE OF DEVI AND ONDEMAND ISSUE
 					setValueInDom(dom, "reas_code", reason);
 				}
 				if (reason != null &&reason.trim().length() > 0)
@@ -2437,7 +2436,7 @@ public class WOrderIssueAct extends ActionHandlerEJB implements  WOrderIssueActL
 			setValueInDom(dom, "item_descr", itemDescr);
 			setValueInDom(dom, "unit", unit);
 
-//				IF WORK ORDER TYPE IS PACKING SET QC_REQD = 'N' EVEN THOUGH RETURN
+			//				IF WORK ORDER TYPE IS PACKING SET QC_REQD = 'N' EVEN THOUGH RETURN
 			sql = " SELECT CASE WHEN AUTO_REQC IS NULL THEN 'N' ELSE AUTO_REQC END, "
 					+ " CASE WHEN QC_REQD IS NULL THEN 'N' ELSE QC_REQD END FROM SITEITEM "
 					+ " WHERE  SITE_CODE = ? AND ITEM_CODE = ?";
@@ -2465,7 +2464,7 @@ public class WOrderIssueAct extends ActionHandlerEJB implements  WOrderIssueActL
 			}
 			else
 			{
-//					IF AUTO_REQC IS 'YES' IN SITEITEM THEN SET QC_REQD = 'YES'
+				//					IF AUTO_REQC IS 'YES' IN SITEITEM THEN SET QC_REQD = 'YES'
 				sql = "SELECT CASE WHEN AUTO_REQC IS NULL THEN 'N' ELSE AUTO_REQC END " 
 						+ " FROM SITEITEM WHERE SITE_CODE = ? AND	ITEM_CODE = ?";
 				pstmt = conn.prepareStatement(sql);
@@ -2567,8 +2566,8 @@ public class WOrderIssueAct extends ActionHandlerEJB implements  WOrderIssueActL
 
 	private double getIssueReturnQty(String workOrder, String expLev, String itemCode, String itemCodeRef, String tranType, double operation, String bomCode, Connection conn)
 	{
-//		GETS AND RETURNS THE ISSUED/RETURNED QUANTITY FOR THE 
-//		WORK ORDER / EXP_LEV IN THE PROPORTION OF THE MAIN ITEM
+		//		GETS AND RETURNS THE ISSUED/RETURNED QUANTITY FOR THE 
+		//		WORK ORDER / EXP_LEV IN THE PROPORTION OF THE MAIN ITEM
 		String sql = "", iCode = null, tranId = null;
 		double qty = 0, issueReturnQty = 0;
 		PreparedStatement pstmt = null;
@@ -2735,7 +2734,7 @@ public class WOrderIssueAct extends ActionHandlerEJB implements  WOrderIssueActL
 	}
 	private String setNoArt(String siteCode, String itemCode, String locCode, String lotNo, String lotSl, String expLev, double quantity, String tranType, double gWeight, Connection conn)
 	{
-//		 WEIGHT TO BE SET IN DETAIL --  1. GET FROM PACKING DETAILS  --	 2. IF NO PACKING GET FROM STOCK
+		//		 WEIGHT TO BE SET IN DETAIL --  1. GET FROM PACKING DETAILS  --	 2. IF NO PACKING GET FROM STOCK
 		long stkNoArt = 0;
 		double inputQty = 0, stockQty = 0, stkGrossWt = 0, stkNetWt = 0, stkTareWt = 0, grossWeight = 0;
 		double tareWeight = 0, netWeight = 0, noArt = 0;
@@ -2758,7 +2757,7 @@ public class WOrderIssueAct extends ActionHandlerEJB implements  WOrderIssueActL
 			}
 			pstmt.close();
 			rs.close();
-//			BASED ON NEW COLUMN VALUES IN STOCK TO BE CALCULATED
+			//			BASED ON NEW COLUMN VALUES IN STOCK TO BE CALCULATED
 			if (!tranType.equalsIgnoreCase("R"))
 			{
 				sql = " SELECT QUANTITY, GROSS_WEIGHT, NET_WEIGHT, TARE_WEIGHT, NO_ART, QTY_PER_ART, " 
@@ -2828,7 +2827,7 @@ public class WOrderIssueAct extends ActionHandlerEJB implements  WOrderIssueActL
 			}
 			else
 			{
-//				GET THE WEIGHT/ARTICLE DETAILS FROM THE CORRESPONDING ISSUE	AND CALCULATE ACCORDINGLY
+				//				GET THE WEIGHT/ARTICLE DETAILS FROM THE CORRESPONDING ISSUE	AND CALCULATE ACCORDINGLY
 				sql = " SELECT A.LOC_CODE FROM WORKORDER_ISSDET A, WORKORDER_ISS B " 
 						+ " WHERE A.TRAN_ID = B.TRAN_ID AND B.SITE_CODE = ? AND A.ITEM_CODE = ? AND A.LOT_NO = ? " 
 						+ " AND A.LOT_SL = ? AND A.EXP_LEV = ?";