Request ID:[W15JSUN017] Update PalletReqIC as requirement changes for BSR location inv_stat.

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

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

@@ -332,28 +332,16 @@ public class PalletReqIC extends ValidatorEJB implements PalletReqICLocal, Palle
 
 							if(cntLoc > 0)
 							{
-								locSql="SELECT LOC_GROUP FROM LOCATION WHERE LOC_CODE = ?";
-								pstmt = conn.prepareStatement(locSql);
-								pstmt.setString(1, palletNo);
-								rs = pstmt.executeQuery();
-								if(rs.next())
-								{
-									locGroup = checkNullAndTrim(rs.getString("LOC_GROUP"));
-									System.out.println( "locGroup:::"+locGroup);
-								}
-								if(pstmt != null){ pstmt.close(); pstmt = null; }
-								if(rs != null){ rs.close(); rs = null; }
-
-								for (int x = 0; x < rg1.length; x++) 
-								{
-									locGroupDisp = locG[x].trim();
-									System.out.println("locGroup disparm=["+locGroupDisp+"] and locGroup["+locGroup+"]");
-
-									if(!locGroupDisp.equalsIgnoreCase(locGroup))
-									{
-										itemSql="SELECT ITEM_CODE,LOT_NO FROM STOCK WHERE LOC_CODE= ?";
+								itemSql="SELECT ITEM_CODE,LOT_NO FROM STOCK WHERE LOC_CODE IN (?,?,?,?,?,?,?,?) AND QUANTITY>0";
 								pstmt = conn.prepareStatement(itemSql);
 								pstmt.setString(1, palletNo);
+								pstmt.setString(2, palletNo+"Q");
+								pstmt.setString(3, palletNo+"B");
+								pstmt.setString(4, palletNo+"X");
+								pstmt.setString(5, palletNo+"M");
+								pstmt.setString(6, palletNo+"U");
+								pstmt.setString(7, palletNo+"P");
+								pstmt.setString(8, palletNo+"S");
 								rs = pstmt.executeQuery();
 								if(rs.next())
 								{
@@ -398,9 +386,36 @@ public class PalletReqIC extends ValidatorEJB implements PalletReqICLocal, Palle
 										itemSerRgDisparm = rg1[y].trim();
 										System.out.println("item ser rg1 disparm=["+itemSerRgDisparm+"] and site item rg1["+itemSer+"]");
 
-												if(itemSerRgDisparm.equalsIgnoreCase(itemSer))
+										if(!itemSerRgDisparm.equalsIgnoreCase(itemSer))
 										{
-													System.out.println("****Match found in disparm for"+itemSer);
+											locSql="SELECT L.LOC_GROUP FROM LOCATION L,STOCK S WHERE S.LOC_CODE =L.LOC_CODE AND S.QUANTITY>0 AND L.LOC_CODE IN(?,?,?,?,?,?,?,?)";
+											pstmt = conn.prepareStatement(locSql);
+											pstmt.setString(1, palletNo);
+											pstmt.setString(2, palletNo+"Q");
+											pstmt.setString(3, palletNo+"B");
+											pstmt.setString(4, palletNo+"X");
+											pstmt.setString(5, palletNo+"M");
+											pstmt.setString(6, palletNo+"U");
+											pstmt.setString(7, palletNo+"P");
+											pstmt.setString(8, palletNo+"S");
+											rs = pstmt.executeQuery();
+											if(rs.next())
+											{
+												locGroup = checkNullAndTrim(rs.getString("LOC_GROUP"));
+												System.out.println( "locGroup:::"+locGroup);
+											}
+											if(pstmt != null){ pstmt.close(); pstmt = null; }
+											if(rs != null){ rs.close(); rs = null; }
+
+											for (int x = 0; x < locG.length; x++) 
+											{
+												locGroupDisp = locG[x].trim();
+												System.out.println("locGroup disparm=["+locGroupDisp+"] and locGroup["+locGroup+"]");
+
+												if(locGroupDisp.equalsIgnoreCase(locGroup))
+												{
+													System.out.println("****Match found in disparm for"+locGroup);
+													System.out.println("exempted location found");
 													errCode = "VMPALLEEXT";//pallet 
 													errList.add( errCode );
 													errFields.add( childNodeName.toLowerCase() );
@@ -410,24 +425,23 @@ public class PalletReqIC extends ValidatorEJB implements PalletReqICLocal, Palle
 										}
 										else
 										{
-											System.out.println("quarentine location found" +cntLoc);
+											System.out.println("****Match found in disparm for"+itemSer);
 											errCode = "VMPALLEEXT";//pallet 
 											errList.add( errCode );
 											errFields.add( childNodeName.toLowerCase() );
 											break;
 										}
 									}
+								}
 								else
 								{
-										System.out.println("****Match found in disparm for"+locGroup);
-										System.out.println("exempted location found");
+									System.out.println("quarentine location found" +cntLoc);
 									errCode = "VMPALLEEXT";//pallet 
 									errList.add( errCode );
 									errFields.add( childNodeName.toLowerCase() );
 									break;
 								}
 							}
-							}
 							else
 							{
 								System.out.println("pallet not in AWMS" +cntLoc);