Master Pack new logic,pick issue error repl,report label

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

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

@@ -1305,7 +1305,8 @@ public class MasterPackIC extends ValidatorEJB implements MasterPackICRemote, Ma
 				rs = pstmt.executeQuery();
 				while(rs.next())
 				{
-					domID++;
+					//domID++;
+					domID = rs.getInt("LINE_NO");
 					//valueXmlString.append( "<Detail3 domID='"+ domID +"' objContext='"+currentFormNo+"' objName=\"master_pack\" selected=\"Y\">\r\n" );
 					valueXmlString.append( "<Detail3 domID='"+ domID +"' objContext = '"+currentFormNo+"' objName='master_pack' selected=\"Y\">\r\n" );
 					valueXmlString.append("<attribute selected=\"Y\" updateFlag=\"E\" status=\"O\" pkNames=\"\" />\r\n"); //added by Kunal on 22/08/12
@@ -1331,6 +1332,21 @@ public class MasterPackIC extends ValidatorEJB implements MasterPackICRemote, Ma
 				pstmt.close();
 				pstmt = null;
 
+				sql = "SELECT MAX(LINE_NO) AS MAXLINE FROM PACK_DET WHERE TRAN_ID = ?";   
+				pstmt = conn.prepareStatement(sql);
+				pstmt.setString(1, tranID);
+				rs = pstmt.executeQuery();
+				
+				if(rs.next())
+				{
+					domID = rs.getInt(1);
+					
+				}
+				
+				rs.close();
+				rs = null;
+				pstmt.close();
+				pstmt = null;
 				//change done by Kunal on 08/08/12
 
 				//sql =  "select  pick_order,line_no__pick  from carton_master where PTCN  in (SELECT PTCN FROM WAVE_TASK_DET WHERE REF_SER = 'M-PACK' and ref_id = ?) " ;

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

@@ -1650,10 +1650,14 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC
 						pstmt = null;
 						
 						
-						selReplCnt = "SELECT COUNT(*) AS COUNT FROM REPL_ORD_DET WHERE PICK_ORDER = ? AND LINE_NO__PICK = ?";
+						//Changed by sumit on 05/12/12 changing sql for dependable replenishment task confirm or not  
+						//selReplCnt = "SELECT COUNT(*) AS COUNT FROM REPL_ORD_DET WHERE PICK_ORDER = ? AND LINE_NO__PICK = ?";
+						selReplCnt = "SELECT COUNT(*) AS COUNT FROM WAVE_TASK_DET WHERE REF_ID = ? AND STATUS = ?";
 						pstmt = conn.prepareStatement(selReplCnt);
 						pstmt.setString(1,replOrderPick);
-						pstmt.setString(2,lineNoRepl);
+						//Changed by sumit on 05/12/12 Changing input parameter as per sql.
+						//pstmt.setString(2,lineNoRepl);
+						pstmt.setString(2,"N");
 						rs = pstmt.executeQuery();
 						if(rs.next())
 						{
@@ -1670,6 +1674,7 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC
 						pstmt = null;
 						
 						
+						
 					}	
 					//Changed by Rohan on 29-10-12 to add warinig message in depended repanishment not scan.end