W15GSUN002 changed by wasim as previous code is reverted because it was wrongly commited by manish.

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

webitm-wms/ibase/webitm/utility/wms/CommonWmsUtil.java

@@ -198,7 +198,30 @@ public  class CommonWmsUtil {
 		itemCode = itemCode == null ? "" :itemCode.trim();
 		try
 		{
-			sql = "SELECT STK_OPT FROM ITEM WHERE ITEM_CODE = ? ";
+			//changed by wasim on 06-11-2015 to check stk_opt from siteitem first [START]
+    		sql = "SELECT STK_OPT FROM SITEITEM WHERE ITEM_CODE = ? ";
+    		pstmt = conn.prepareStatement(sql);
+    		pstmt.setString(1, itemCode);
+    		rs = pstmt.executeQuery();
+    		if(rs.next())
+    		{
+    			stkOpt = rs.getString(1) == null ? "" : rs.getString(1).trim();
+    		}
+    		else
+    		{	
+    			System.out.println("Getting stk_opt from item...");
+	    		sql = "SELECT STK_OPT FROM ITEM WHERE ITEM_CODE = ? ";
+	    		pstmt = conn.prepareStatement(sql);
+	    		pstmt.setString(1, itemCode);
+	    		rs = pstmt.executeQuery();
+	    		if(rs.next())
+	    		{
+	    			stkOpt = rs.getString(1) == null ? "" : rs.getString(1).trim();
+	    		}
+    		}
+    		rs.close();rs = null;
+			pstmt.close();pstmt = null;
+			/*sql = "SELECT STK_OPT FROM ITEM WHERE ITEM_CODE = ? ";
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1, itemCode);
 			rs = pstmt.executeQuery();
@@ -209,7 +232,8 @@ public  class CommonWmsUtil {
 			rs.close();
 			rs = null;
 			pstmt.close();
-			pstmt = null;
+			pstmt = null;*/
+			//changed by wasim on 06-11-2015 to check stk_opt from siteitem first [END]
 		}
 		catch(Exception e)
 		{
@@ -314,7 +338,7 @@ public  class CommonWmsUtil {
 		{
 			conn = connDriver.getConnectDB("DriverAWMS");
 			conn.setAutoCommit(false);
-			 interfaceSql = "INSERT INTO INTERFACE (TRAN_ID,ITEM_CODE,DESCR,UNIT,ITEM_TYPE,"
+			 interfaceSql = "INSERT INTO HOST_TO_WMS (TRAN_ID,ITEM_CODE,DESCR,UNIT,ITEM_TYPE,"//Changed table name by wasim on 02-11-15, previous table name interface.
 						+ "FAMILY_GRP,IN_OUT,REF_SER,REF_ID,TRAN_DATE,LOT_NO,"
 						+ "LOT_SL,QUANTITY,QTY_PER_ART,TOTAL_QTY,EXP_DATE,MFG_DATE,"
 						+ "PALLET_NO,PALLET_STATUS,MSG_STAT,LOCK_STAT,ERR_COD,ERR_DESC,"
@@ -324,7 +348,7 @@ public  class CommonWmsUtil {
 						+ "?,?,?,?,?,?,"
 						+ "?,?,?,?,?,?,?,?,?)";
 			 
-			 WMSSql = "INSERT INTO INTERFACE2 (TRAN_ID,ITEM_CODE,DESCR,UNIT,ITEM_TYPE,"
+			 WMSSql = "INSERT INTO SWMS_TO_AWMS (TRAN_ID,ITEM_CODE,DESCR,UNIT,ITEM_TYPE,"//Changed table name by wasim on 02-11-15, previous table name interface2.
 						+ "FAMILY_GRP,IN_OUT,REF_SER,REF_ID,TRAN_DATE,LOT_NO,"
 						+ "LOT_SL,QUANTITY,QTY_PER_ART,TOTAL_QTY,EXP_DATE,MFG_DATE,"
 						+ "PALLET_NO,PALLET_STATUS,MSG_STAT,LOCK_STAT,ERR_COD,ERR_DESC,"