considering QC rejected locations in Pallet request,Pallet request with stock...

considering QC rejected locations in Pallet request,Pallet request with stock details.Request id:[W16ASUN022]


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

webitm-wms/ibase/webitm/ejb/wms/PalletReqConf.java

@@ -182,14 +182,16 @@ implements PalletReqConfLocal, PalletReqConfRemote
 				System.out.println("Tran Type="+tranType);
 				
 				//if((tranType == null) && (tranType.length() == 0))
-				if(tranType == null || tranType.length() == 0)
+				if("O".equalsIgnoreCase(tranType))
 				{
-					System.out.println(" in  null trantype");
+					System.out.println("Trantype:::O");
 					if ((itemCode != null) && (itemCode.length() > 0))
 					{
 						//Change by Jagruti Shinde for Exempted /BSR Location Request Id:W15JSUN017
 						//sql = "SELECT S.QTY_PER_ART,I.DESCR ,S.UNIT,I.ITEM_TYPE ,S.MFG_DATE,S.EXP_DATE FROM STOCK S ,ITEM I WHERE S.SITE_CODE=? AND S.LOC_CODE IN (?,?) AND S.ITEM_CODE= ? AND S.LOT_NO= ? AND S.LOT_SL= ? AND S.ITEM_CODE=I.ITEM_CODE";
-						sql = "SELECT S.QTY_PER_ART,I.DESCR ,S.UNIT,I.ITEM_TYPE ,S.MFG_DATE,S.EXP_DATE FROM STOCK S ,ITEM I WHERE S.SITE_CODE=? AND S.LOC_CODE IN (?,?,?,?,?,?,?,?) AND S.ITEM_CODE= ? AND S.LOT_NO= ? AND S.LOT_SL= ? AND S.ITEM_CODE=I.ITEM_CODE AND S.QUANTITY>0";
+						//Changed by Jagruti Shinde,for considering QC rejected locations in Pallet out.Request id:[W16ASUN022]
+						//sql = "SELECT S.QTY_PER_ART,I.DESCR ,S.UNIT,I.ITEM_TYPE ,S.MFG_DATE,S.EXP_DATE FROM STOCK S ,ITEM I WHERE S.SITE_CODE=? AND S.LOC_CODE IN (?,?,?,?,?,?,?,?) AND S.ITEM_CODE= ? AND S.LOT_NO= ? AND S.LOT_SL= ? AND S.ITEM_CODE=I.ITEM_CODE AND S.QUANTITY>0";
+						sql = "SELECT S.QTY_PER_ART,I.DESCR ,S.UNIT,I.ITEM_TYPE ,S.MFG_DATE,S.EXP_DATE FROM STOCK S ,ITEM I WHERE S.SITE_CODE=? AND S.LOC_CODE IN (?,?,?,?,?,?,?,?,?) AND S.ITEM_CODE= ? AND S.LOT_NO= ? AND S.LOT_SL= ? AND S.ITEM_CODE=I.ITEM_CODE AND S.QUANTITY>0";
 
 						pstmt1 = conn.prepareStatement(sql);
 						pstmt1.setString(1, siteCode);
@@ -201,9 +203,12 @@ implements PalletReqConfLocal, PalletReqConfRemote
 						pstmt1.setString(7, palletNo + "U");
 						pstmt1.setString(8, palletNo + "P");
 						pstmt1.setString(9, palletNo + "S");
-						pstmt1.setString(10, itemCode);
-						pstmt1.setString(11, lotNo);
-						pstmt1.setString(12, lotSl);
+						//Changed by Jagruti Shinde,for considering QC rejected locations in Pallet out.Request id:[W16ASUN022][start]
+						pstmt1.setString(10, palletNo + "R");
+						pstmt1.setString(11, itemCode);
+						pstmt1.setString(12, lotNo);
+						pstmt1.setString(13, lotSl);
+						//Changed by Jagruti Shinde,for considering QC rejected locations in Pallet out.Request id:[W16ASUN022][end]
 
 						rs1 = pstmt1.executeQuery();
 						if (rs1.next())
@@ -279,7 +284,7 @@ implements PalletReqConfLocal, PalletReqConfRemote
 						interfaceArrList.add(hm);
 						System.out.println("interfacearraylist::PR" + interfaceArrList.size());
 					}
-				}//IF TRAN_TYPE END
+				}
 				else
 				{
 					System.out.println(" in  rpz trantype");