BUG FIXING MULTI PTCN WIZ

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

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

@@ -53,6 +53,8 @@ public class MultipleMasterPackWizPos extends ValidatorEJB implements MultipleMa
 		int lineNoSord=0,noArt=0;
 		double quantity = 0;
 		
+		int packLine = 1;
+		
 		try
 		{			
 			conn = null;
@@ -148,9 +150,9 @@ public class MultipleMasterPackWizPos extends ValidatorEJB implements MultipleMa
 							pstmt.setInt(2,lineNoSord);
 	
 							rs = pstmt.executeQuery();
-							while(rs.next())
+							if(rs.next())
 							{
-								lineNo= checkNull(rs.getString("line_no"));
+								//lineNo= checkNull(rs.getString("line_no"));
 								saleOrder = rs.getString("sale_order");
 								lineNoSord = rs.getInt("line_no__sord");
 								itemCode = rs.getString("item_code");
@@ -162,6 +164,39 @@ public class MultipleMasterPackWizPos extends ValidatorEJB implements MultipleMa
 								noArt=rs.getInt("no_art");
 	
 							}
+							
+							if(rs != null)
+							{
+								rs.close();
+								rs = null;
+							}
+							if(pstmt != null)
+							{
+								pstmt.close();
+								pstmt = null;
+							}
+							
+								selSql="SELECT MAX(LINE_NO)    FROM TAROQC.PACK_DET WHERE TRAN_ID = ?";
+								pstmt = conn.prepareStatement(selSql);
+								pstmt.setString(1,tranId1);
+		
+								rs = pstmt.executeQuery();
+								if(rs.next())
+								{
+									packLine = rs.getInt(1);
+									packLine = packLine + 1;
+								}
+								
+								if(rs != null)
+								{
+									rs.close();
+									rs = null;
+								}
+								if(pstmt != null)
+								{
+									pstmt.close();
+									pstmt = null;
+								}
 	
 							siteCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginSiteCode");
 							
@@ -171,7 +206,7 @@ public class MultipleMasterPackWizPos extends ValidatorEJB implements MultipleMa
 	
 								pstmt = conn.prepareStatement(insSql);
 								pstmt.setString(1,tranId1);
-								pstmt.setString(2,lineNo);
+								pstmt.setInt(2,packLine);
 								pstmt.setString(3,saleOrder);
 								pstmt.setInt(4,lineNoSord);
 								pstmt.setString(5,siteCode);

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

@@ -1155,7 +1155,7 @@ public class MultiplePtcnWiz extends ValidatorEJB implements MultiplePtcnWizLoca
 					}
 					
 					sqlBuf.append(mark);
-					sqlBuf.append( " ) AND W.STATUS = 'N' AND W.WAVE_STATUS = 'C'  AND W.REF_SER  IN ('A-PICK','C-PICK','M-PICK') ");
+					sqlBuf.append( " ) AND W.STATUS = 'N' AND W.WAVE_STATUS = 'C'  AND W.REF_SER  IN ('A-PICK','C-PICK','M-PICK','P-PICK') ");
 					sqlBuf.append(" AND PODET.ITEM_CODE = ITEM.ITEM_CODE ");
 					sqlBuf.append("AND PODET.PICK_ORDER = W.REF_ID  AND (PODET.QUANTITY - (CASE WHEN PODET.DEALLOC_QTY IS NULL THEN 0 ELSE PODET.DEALLOC_QTY END )) > 0 ");
 					sqlBuf.append("ORDER BY PODET.LOC_CODE, PODET.ITEM_CODE");