Check Hold status before confirming Inv_hold_rel transaction

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

webitm-dis/ibase/webitm/ejb/dis/adv/InvHoldRelConf.java

@@ -141,6 +141,7 @@ public class InvHoldRelConf extends ActionHandlerEJB implements InvHoldRelConfLo
 		ResultSet rsSelStck = null;
 		ResultSet rsSelTrace = null;
 		ResultSet rsDetail = null;
+		String holdStatus = ""; // 14/04/14 manoharan 
 		
 		//changed by Dharmesh on 12-08-2011 [WM1ESUN004].end
 		
@@ -234,8 +235,8 @@ public class InvHoldRelConf extends ActionHandlerEJB implements InvHoldRelConfLo
 					
 					sqlInsert = " INSERT INTO INV_HOLD_REL_TRACE ( TRAN_ID, ITEM_CODE, SITE_CODE, LOC_CODE, LOT_NO, LOT_SL, REF_NO, REL_QTY, LOCK_CODE ) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ? ) " ;
 					pInsert = conn.prepareStatement(sqlInsert);
-					
-					sqlHoldDet = "SELECT ITEM_CODE, SITE_CODE, LOC_CODE, LOT_NO, LOT_SL, LINE_NO_SL FROM INV_HOLD_DET WHERE TRAN_ID = ? AND LINE_NO = ?" ;
+					// 14/04/14 manoharan hold_status added it should not be R
+					sqlHoldDet = "SELECT ITEM_CODE, SITE_CODE, LOC_CODE, LOT_NO, LOT_SL, LINE_NO_SL, HOLD_STATUS FROM INV_HOLD_DET WHERE TRAN_ID = ? AND LINE_NO = ?" ;
 					pHoldDet = conn.prepareStatement(sqlHoldDet);
 					
 					sqlDetail = " SELECT HOLDDET.TRAN_ID__HOLD, HOLDDET.LINE_NO__HOLD, IHOLD.LOCK_CODE "+
@@ -269,7 +270,14 @@ public class InvHoldRelConf extends ActionHandlerEJB implements InvHoldRelConfLo
 							lotNo = checkNull(rsHoldDet.getString("LOT_NO"));
 							lotSl = checkNull(rsHoldDet.getString("LOT_SL"));
 							lineNoSl = checkNull(rsHoldDet.getString("LINE_NO_SL"));
-							
+							 // 14/04/14 manoharan if hold_status = "R" the give error
+							holdStatus = checkNull(rsHoldDet.getString("HOLD_STATUS"));
+							if ("R".equals(holdStatus))
+							{
+								errString = itmDBAccessEJB.getErrorString("","VTHOLDST","","",conn);
+								break;
+							}
+							// end 14/04/14 manoharan if hold_status = "R" the give error
 							if( lineNoSl != null && lineNoSl.trim().length() > 0 ) //i.e. Line_sl is found
 							{
 								//tranIdTrace = generateTranId("w_inv_hold_rel_trace", conn);
@@ -527,12 +535,22 @@ public class InvHoldRelConf extends ActionHandlerEJB implements InvHoldRelConfLo
 							rsHoldDet.close();
 							rsHoldDet = null;
 						}
+						// 14/04/14 manoharan
+						if( errString != null && errString.trim().length() > 0 )
+						{
+							break;
+						}
 					}//while( rsDetail.next() )
 					if(rsDetail != null)
 					{
 						rsDetail.close();
 						rsDetail = null;
 					}
+					/*// 14/04/14 manoharan
+					if( errString != null || errString.trim().length() > 0 )
+					{
+						break;
+					}*/
 					
 				}				
 				//changed by Dharmesh on 12-08-2011 [WM1ESUN004] to commit unconfirmed transaction.end