W15FSUN008, Updated class file Palletization.

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

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

@@ -1007,13 +1007,19 @@ public class PalletizationIC extends ValidatorEJB implements PalletizationICLoca
 			        if(rs != null) { rs.close(); rs = null; }
 
 			        invstatForQstk = discommon.getDisparams("999999","INVSTAT_FOR_QSTK",conn);
-			        disparmInvstat = invstatForQstk.split(",");
+			        //disparmInvstat = invstatForQstk.split(",");
 
-					for (int i = 0; i < disparmInvstat.length; i++)
+			        invstatForQstk = invstatForQstk.replaceAll(",", "','");
+					invstatForQstk = "'"+invstatForQstk+"'";
+					System.out.println("invstatForQstk :::::::::::: "  + invstatForQstk);
+			        
+					/*for (int i = 0; i < disparmInvstat.length; i++)
 					{
 						invstat = disparmInvstat[i];	
+						
+					}	
 						//System.out.println("invstat :::::::::::: " + invstat);
-						if( tranId != null && tranId.trim().length() > 0 )
+*/						if( tranId != null && tranId.trim().length() > 0 )
 					{
 						System.out.println("-------------- itemchanged Edit mode in Details 3 ----------------------");
 						
@@ -1033,7 +1039,7 @@ public class PalletizationIC extends ValidatorEJB implements PalletizationICLoca
 							+ "and d.tran_id = h.tran_id and i.item_code = d.item_code " 
 							+ "union all " 
 							+ "select s.item_code, i.descr, s.lot_no, s.lot_sl, (quantity - (alloc_qty +  hold_qty)) as quantity, i.unit, s.no_art, 0 as line_no, s.loc_code  " 
-								+ "from stock s, item i  where inv_stat  = ?  " 
+							+ "from stock s, item i  where inv_stat  in ("+invstatForQstk+")  " 
 							+ "and (quantity - (alloc_qty + hold_qty)) > 0 and s.site_code = ? and  i.item_code = s.item_code ";	
 						//End by Sneha on 06-11-2015, Request ID: W15FSUN008 
 						pstmt = conn.prepareStatement(sql);
@@ -1042,13 +1048,12 @@ public class PalletizationIC extends ValidatorEJB implements PalletizationICLoca
 						pstmt.setString(2, "N");
 						pstmt.setString(3, loginSite);
 						pstmt.setString(4, tranId);
-							pstmt.setString(5, invstat);
+						//pstmt.setString(5, invstat);
 						//pstmt.setString(6, locationCode);
-							pstmt.setString(6, loginSite);
+						pstmt.setString(5, loginSite);
 						rs = pstmt.executeQuery();
 						while(rs.next())
 						{
-								domIdEdit++;
 							itemCode = checkNullAndTrim(rs.getString("item_code"));	
 							descr = checkNullAndTrim(rs.getString("descr"));	
 							lotNo = checkNullAndTrim(rs.getString("lot_no"));
@@ -1058,6 +1063,7 @@ public class PalletizationIC extends ValidatorEJB implements PalletizationICLoca
 							noArt = rs.getInt("no_art");
 							lineNo = rs.getInt("line_no");
 							locationCode = checkNullAndTrim(rs.getString("loc_code"));	
+							domIdEdit++;
 							
 							//System.out.println("domIdEdit::::::::::::: " + domIdEdit);
 							if(isScanningDone(tranId, itemCode, loginSite, locationCode, lotNo, lotSl, palletNo, conn))
@@ -1107,7 +1113,7 @@ public class PalletizationIC extends ValidatorEJB implements PalletizationICLoca
 							+ "d.pallet_no = ? and h.confirmed = ? and d.site_code = ? and d.tran_id = h.tran_id and i.item_code = d.item_code " 
 							+ "union all " 
 							+ "select s.item_code, i.descr, s.lot_no, s.lot_sl, (quantity - (alloc_qty +  hold_qty)) as quantity, i.unit, s.no_art, 0 as line_no, s.loc_code  " 
-								+ "from stock s, item i where s.inv_stat  = ?   " 
+							+ "from stock s, item i where s.inv_stat  in ("+invstatForQstk+")   " 
 							+ "and (quantity - (alloc_qty + hold_qty)) > 0 and s.site_code = ? and i.item_code = s.item_code ";	
 						//End by Sneha on 06-11-2015, Request ID: W15FSUN008 
 						pstmt = conn.prepareStatement(sql);
@@ -1115,12 +1121,12 @@ public class PalletizationIC extends ValidatorEJB implements PalletizationICLoca
 						pstmt.setString(1, palletNo);
 						pstmt.setString(2, "N");
 						pstmt.setString(3, loginSite);
-							pstmt.setString(4, invstat);
-							pstmt.setString(5, loginSite);
+						//pstmt.setString(4, invstat);
+						pstmt.setString(4, loginSite);
 						rs = pstmt.executeQuery();
 						while(rs.next())
 						{
-								domId++;
+							
 							itemCode = checkNullAndTrim(rs.getString("item_code"));	
 							descr = checkNullAndTrim(rs.getString("descr"));	
 							lotNo = checkNullAndTrim(rs.getString("lot_no"));
@@ -1129,7 +1135,7 @@ public class PalletizationIC extends ValidatorEJB implements PalletizationICLoca
 							unit = checkNullAndTrim(rs.getString("unit"));	
 							noArt = rs.getInt("no_art");
 							locationCode = checkNullAndTrim(rs.getString("loc_code"));	
-
+							domId++;
 							if(isScanningDone(tranId, itemCode, loginSite, locationCode, lotNo, lotSl, palletNo, conn))
 							{
 								valueXmlString.append("<Detail3 domID='"+domId+"' selected=\"Y\">\r\n");
@@ -1160,7 +1166,7 @@ public class PalletizationIC extends ValidatorEJB implements PalletizationICLoca
 				        if(rs != null) { rs.close(); rs = null; }
 					}
 				}
-				}
+				
 			} //Case 3. End
 			break;