W16ASUN024 updated source to optimize source and properly close prepared statements.

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

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

@@ -737,7 +737,10 @@ public class PalletRequisitionActEJB extends ActionHandlerEJB implements PalletR
 					conn.rollback();
 					retString = itmDBAccessEJB.getErrorString("","VTTNSVD","","",conn);
 				}
-				if(conn != null){conn.close();conn = null;}
+				if(conn != null)
+				{
+					conn.close();conn = null;
+				}
 			}
 			catch(Exception e)
 			{
@@ -782,15 +785,19 @@ public class PalletRequisitionActEJB extends ActionHandlerEJB implements PalletR
 			{
 				confirmed = checkNullAndTrim(rs.getString("CONFIRMED"));
 			}
-			rs.close();rs = null;
-			pstmt.close();pstmt = null;
+			if(pstmt != null)
+			{
+				pstmt.close();pstmt=null;
+			}
+			if(rs != null)
+			{
+				rs.close();rs=null;
+			}
 			
 			System.out.println("INV_HOLD_ID["+refId+"] CONFIRMED["+confirmed+"]");
 			
 			if("Y".equalsIgnoreCase(confirmed))
-			{
-				/*if(!"R".equalsIgnoreCase(holdStatus))
-				{*/	
+			{	
 					sql = "SELECT REF_NO FROM INV_HOLD WHERE TRAN_ID = ?";
 					pstmt = conn.prepareStatement(sql);
 					pstmt.setString(1, refId);
@@ -806,19 +813,26 @@ public class PalletRequisitionActEJB extends ActionHandlerEJB implements PalletR
 					if(refNo != null && refNo.length() > 0)
 					{
 						//sql = "SELECT COUNT(*) FROM SWMS_TO_AWMS WHERE REF_ID = ?";
-						sql = "SELECT REF_ID FROM SWMS_TO_AWMS WHERE REF_ID = ?";
+						sql = "SELECT REF_ID FROM SWMS_TO_AWMS WHERE REF_ID = ? AND REF_SER = ?";
 						pstmt = conn.prepareStatement(sql);
 						pstmt.setString(1, refNo);
+						pstmt.setString(2, "PRS");
 						rs = pstmt.executeQuery();
 						
 						if(rs.next())
 						{
 							System.out.println("Transaction is already present in interface2 table");
-							errString = itmDBAccessEJB.getErrorString("","ALRDYSUBMT","","",conn);  
+							errString = itmDBAccessEJB.getErrorString("","VTNOTEDIT","","",conn);  
 							return errString;
 						}
-						if(pstmt != null){pstmt.close();pstmt=null;}
-						if(rs != null){rs.close();rs=null;}
+						if(pstmt != null)
+						{
+							pstmt.close();pstmt=null;
+						}
+						if(rs != null)
+						{
+							rs.close();rs=null;
+						}
 					}
 					
 					tranID = commonWmsUtility.generateTranTd("w_pallet_req_stk", currDateStr, loginSiteCode, conn);
@@ -848,8 +862,8 @@ public class PalletRequisitionActEJB extends ActionHandlerEJB implements PalletR
 					pstmtHdr.setString( 14, chgTerm );
 					pstmtHdr.setString( 15, "O" );
 					
-					updCnt = pstmtHdr.executeUpdate();
-					if(pstmtHdr != null){pstmtHdr.close();pstmtHdr=null;}
+					/*updCnt = pstmtHdr.executeUpdate();
+					if(pstmtHdr != null){pstmtHdr.close();pstmtHdr=null;}*/
 					
 					sqlStock= " SELECT S.ITEM_CODE,S.LOC_CODE,S.SITE_CODE,S.LOT_NO,S.LOT_SL,S.QUANTITY,S.ALLOC_QTY,S.NO_ART,D.LINE_NO "
 							 +" FROM STOCK S, INV_HOLD H,INV_HOLD_DET D"
@@ -889,8 +903,14 @@ public class PalletRequisitionActEJB extends ActionHandlerEJB implements PalletR
 						{
 							palletCnt = rs.getInt(1);
 						}
-						if(pstmt != null){pstmt.close();pstmt=null;}
-						if(rs != null){rs.close();rs=null;}
+						if(pstmt != null)
+						{
+							pstmt.close();pstmt=null;
+						}
+						if(rs != null)
+						{
+							rs.close();rs=null;
+						}
 						
 						if(palletCnt > 0)
 						{
@@ -915,12 +935,26 @@ public class PalletRequisitionActEJB extends ActionHandlerEJB implements PalletR
 					}
 					if(isRecordExist)
 					{	
+						updCnt = pstmtHdr.executeUpdate();
+						if(pstmtHdr != null)
+						{
+							pstmtHdr.close();pstmtHdr=null;
+						}
 						pstmtDet.executeBatch();
 					}	
 					
-					if(pstmtStock != null){pstmtStock.close();pstmtStock=null;}
-					if(rsStock != null){rsStock.close();rsStock=null;}
-					if(pstmtDet != null){pstmtDet.close();pstmtDet=null;}
+					if(pstmtStock != null)
+					{
+						pstmtStock.close();pstmtStock=null;
+					}
+					if(rsStock != null)
+					{
+						rsStock.close();rsStock=null;
+					}
+					if(pstmtDet != null)
+					{
+						pstmtDet.close();pstmtDet=null;
+					}
 					
 					System.out.println("isRecordExist="+isRecordExist);
 					if(isRecordExist)
@@ -937,16 +971,12 @@ public class PalletRequisitionActEJB extends ActionHandlerEJB implements PalletR
 							pstmtUpdate.setString(3, refId);
 							updCnt = pstmtUpdate.executeUpdate();
 							System.out.println("Updated ="+updCnt);
-							pstmtUpdate.close();pstmtUpdate = null;
+							if(pstmtUpdate != null)
+							{
+								pstmtUpdate.close();pstmtUpdate=null;
+							}
 						}
-					}	
-				/*}
-				else
-				{
-					System.out.println("Inventory is already released you can not make pallet request for this transaction");
-					errString = itmDBAccessEJB.getErrorString("","VTHOLDST","","",conn);
-					return errString;
-				}*/
+					}
 			}
 			else
 			{
@@ -974,13 +1004,34 @@ public class PalletRequisitionActEJB extends ActionHandlerEJB implements PalletR
 					conn.commit();
 					errString = itmDBAccessEJB.getErrorString("","VTCONPARM","","",conn);
 				}
-				if(pstmtStock != null){pstmtStock.close();pstmtStock=null;}
-				if(rsStock != null){rsStock.close();rsStock=null;}
-				if(pstmt != null){pstmt.close();pstmt=null;}
-				if(rs != null){rs.close();rs=null;}
-				if(pstmtDet != null){pstmtDet.close();pstmtDet=null;}
-				if(pstmtHdr != null){pstmtHdr.close();pstmtHdr=null;}
-				if(pstmtUpdate != null){pstmtUpdate.close();pstmtUpdate=null;}
+				if(pstmtStock != null)
+				{
+					pstmtStock.close();pstmtStock=null;
+				}
+				if(rsStock != null)
+				{
+					rsStock.close();rsStock=null;
+				}
+				if(pstmt != null)
+				{
+					pstmt.close();pstmt=null;
+				}
+				if(rs != null)
+				{
+					rs.close();rs=null;
+				}
+				if(pstmtDet != null)
+				{
+					pstmtDet.close();pstmtDet=null;
+				}
+				if(pstmtHdr != null)
+				{
+					pstmtHdr.close();pstmtHdr=null;
+				}
+				if(pstmtUpdate != null)
+				{
+					pstmtUpdate.close();pstmtUpdate=null;
+				}
 			}
 			catch(Exception e1)
 			{