changed by sumit on 28/03/13 PICKISSUEPOS GIVEN BY PRAGYAN SIR

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

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

@@ -54,7 +54,10 @@ public class PickIssPos extends ValidatorEJB implements PickIssPosLocal, PickIss
 		Document dom = null;
 
 		PreparedStatement pstmt = null;
+		PreparedStatement pstmtTran = null;
+		PreparedStatement pstmtUpdCarton = null;
 		ResultSet rs = null;
+		ResultSet rsTran = null;
 		System.out.println("Dom String = "+domString);
 		PickIssConf pickConf = new PickIssConf();
 		ArrayList tranIdArrList = new ArrayList();
@@ -145,7 +148,7 @@ public class PickIssPos extends ValidatorEJB implements PickIssPosLocal, PickIss
 						//Changed By Pragyan 05/03/12  to update pallet no on carton master. 
 						//Update the carton master 
 						//if(!"M".equalsIgnoreCase(pickType)) // 22/09/12 manoharan
-						if(!"M".equalsIgnoreCase(pickType) || "P-PICK".equalsIgnoreCase(refSer)) // 22/09/12 manoharan
+						/*if(!"M".equalsIgnoreCase(pickType) || "P-PICK".equalsIgnoreCase(refSer)) // 22/09/12 manoharan
 						{
 							//Changed by sumit on 11/09/13 adding condition of status.
 							//sql = "UPDATE CARTON_MASTER SET STATUS = 'U', pallet_no = ? WHERE PICK_ORDER = ? and line_no__pick in (select line_no__ord from pick_iss_det where tran_id = ?) ";
@@ -175,7 +178,7 @@ public class PickIssPos extends ValidatorEJB implements PickIssPosLocal, PickIss
 								System.out.println("---row updated sucessfully in pallet no ---->"+updCnt);
 							}
 							//end by kunal
-						}
+						}*/
 						//select no of art from pick_ord_det 
 						//Changed By Pragyan WM2LSUN011 23/03/13 This code is no longer required for confirmation checking.start
 						//select no of art from pick_ord_det 
@@ -230,24 +233,38 @@ public class PickIssPos extends ValidatorEJB implements PickIssPosLocal, PickIss
 							{
 								throw new Exception(errString);
 							}*/
+							sql =   " UPDATE CARTON_MASTER SET STATUS = 'U', PALLET_NO = ? WHERE PICK_ORDER = ? " +
+							" AND LINE_NO__PICK IN (SELECT LINE_NO__ORD FROM PICK_ISS_DET WHERE TRAN_ID = ?) " +
+							" AND STATUS <> 'R'";
+					
+							pstmtUpdCarton = conn.prepareStatement(sql);
+					
+							sql = "SELECT DISTINCT H.TRAN_ID,H.PICK_ORDER,H.PICK_TYPE FROM PICK_ISS_HDR H, PICK_ISS_DET D WHERE H.TRAN_ID = D.TRAN_ID AND  H.PALLET_NO = ?";
+							pstmtTran = conn.prepareStatement( sql );
+							pstmtTran.setString( 1, palletNo );
+							rsTran = pstmtTran.executeQuery();
 							
-							sql = "SELECT DISTINCT H.TRAN_ID FROM PICK_ISS_HDR H, PICK_ISS_DET D WHERE H.TRAN_ID = D.TRAN_ID AND  H.PALLET_NO = ?";
-							pstmt = conn.prepareStatement( sql );
-							pstmt.setString( 1, palletNo );
-							rs = pstmt.executeQuery();
-							while(rs.next())
+							while(rsTran.next())
 							{
-								tranIdArrList.add(rs.getString("TRAN_ID")); 
+								tranId = rs.getString("TRAN_ID");
+								pickOrder = rs.getString("PICK_ORDER");
+								pickType =  rs.getString("PICK_TYPE");
 								
-							}
-							rs.close(); rs = null;
-							pstmt.close(); pstmt = null;
-							int traIdListLen = tranIdArrList.size();
-							for(int cCtr = 0;cCtr < traIdListLen;cCtr++)
-							{
+								if(!"M".equalsIgnoreCase(pickType) || "P-PICK".equalsIgnoreCase(refSer)) // 22/09/12 manoharan
+								{
+									
+									
+									pstmtUpdCarton.setString(1,palletNo);
+									pstmtUpdCarton.setString(2, pickOrder);
+									pstmtUpdCarton.setString(3,tranId);
+									updCnt = pstmtUpdCarton.executeUpdate();
+									pstmtUpdCarton.clearParameters();
+									if(updCnt > 0)
+									{
+										System.out.println("---row updated sucessfully of master pick---->"+updCnt);
+									}
+								}
 								
-								tranId = (String)tranIdArrList.get(cCtr);
-								System.out.println("Current Tran Id For Confirmation ["+tranId+"]");
 								errString = pickConf.confirm( tranId, xtraParams, forcedFlag ,conn, toCommit );
 								
 								if (errString.indexOf("CONFSUCESS") > -1)
@@ -258,8 +275,25 @@ public class PickIssPos extends ValidatorEJB implements PickIssPosLocal, PickIss
 								{
 									throw new Exception(errString);
 								}
-							}		
+								
+							}
+							
+							if(rsTran != null)
+							{
+								rsTran.close(); 
+								rsTran = null;
+							}
+							if(pstmtTran != null)
+							{
+								pstmtTran.close(); 
+								pstmtTran = null;
+							}
 							
+							if(pstmtUpdCarton != null)
+							{
+								pstmtUpdCarton.close(); 
+								pstmtUpdCarton = null;
+							}
 							//Changed By Pragyan WM2LSUN011 23/03/13 This code is no longer required for confirmation checking.end
 							//}
 						/*} */