Revert on click of confirm button development.

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

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

@@ -178,57 +178,8 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 				return retString;
 			} else
 			{
-				retString = retrieveReceipt(tranId, 1, conn, xtraParams);
-				if (retString == null || retString.trim().length() == 0)
-				{
-					// //////////////////// EDI creation
-					String ediOption = "";
-					String dataStr = "";
-					sql = "SELECT EDI_OPTION FROM TRANSETUP WHERE TRAN_WINDOW = 'w_porcp' ";
-					pstmtSql = conn.prepareStatement(sql);
-					rs = pstmtSql.executeQuery();
-					if (rs.next())
-					{
-						ediOption = checkNull(rs.getString("EDI_OPTION"));
-					}
-					rs.close();
-					rs = null;
-					pstmtSql.close();
-					pstmtSql = null;
-
-					if ("1".equals(ediOption.trim()))
-					{
-						CreateRCPXML createRCPXML = new CreateRCPXML("w_porcp", "tran_id");
-						dataStr = createRCPXML.getTranXML(tranId, conn);
-						System.out.println("dataStr =[ " + dataStr + "]");
-						Document ediDataDom = genericUtility.parseString(dataStr);
-
-						E12CreateBatchLoadEjb e12CreateBatchLoad = new E12CreateBatchLoadEjb();
-						retString = e12CreateBatchLoad.createBatchLoad(ediDataDom, "w_porcp", "0", xtraParams, conn);
-						createRCPXML = null;
-						e12CreateBatchLoad = null;
 				
-						if (retString != null && "SUCCESS".equals(retString))
-						{
-							System.out.println("retString from batchload = [" + retString + "]");
-						}
-					}
-					// ///////////////////
-
-					if (connStatus)// Condition added - 25/11/11 - Gulzar as
-						// confirm method is called from post save
-						// component
-					{
-						conn.commit();
-						retString = itmDBAccessLocal.getErrorString("", "VTMCONF2", "");
-					}
-				} else
-				{
-					conn.rollback();
-				}
-			}
-			
-			//Added By PriyankaC 05/03/2018.[START]
+				/*//Added By PriyankaC 05/03/2018.[START]
 				System.out.println("tran_id : " +tranId);
 				sql ="SELECT ITEM_CODE FROM PORCPDET WHERE TRAN_ID= ? ";
 				pstmtSql = conn.prepareStatement(sql);
@@ -283,6 +234,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 						}
 				}
 				if (pstmtSql != null)
+				
 				{
 					pstmtSql.close();
 					pstmtSql = null;
@@ -293,6 +245,57 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 					rs = null;
 				}
 				//Added By PriyankaC on 05/03/2018.. [END]
+*/				
+				
+				retString = retrieveReceipt(tranId, 1, conn, xtraParams);
+				if (retString == null || retString.trim().length() == 0)
+				{
+					// //////////////////// EDI creation
+					String ediOption = "";
+					String dataStr = "";
+					sql = "SELECT EDI_OPTION FROM TRANSETUP WHERE TRAN_WINDOW = 'w_porcp' ";
+					pstmtSql = conn.prepareStatement(sql);
+					rs = pstmtSql.executeQuery();
+					if (rs.next())
+					{
+						ediOption = checkNull(rs.getString("EDI_OPTION"));
+					}
+					rs.close();
+					rs = null;
+					pstmtSql.close();
+					pstmtSql = null;
+
+					if ("1".equals(ediOption.trim()))
+					{
+						CreateRCPXML createRCPXML = new CreateRCPXML("w_porcp", "tran_id");
+						dataStr = createRCPXML.getTranXML(tranId, conn);
+						System.out.println("dataStr =[ " + dataStr + "]");
+						Document ediDataDom = genericUtility.parseString(dataStr);
+
+						E12CreateBatchLoadEjb e12CreateBatchLoad = new E12CreateBatchLoadEjb();
+						retString = e12CreateBatchLoad.createBatchLoad(ediDataDom, "w_porcp", "0", xtraParams, conn);
+						createRCPXML = null;
+						e12CreateBatchLoad = null;
+
+						if (retString != null && "SUCCESS".equals(retString))
+						{
+							System.out.println("retString from batchload = [" + retString + "]");
+						}
+					}
+					// ///////////////////
+
+					if (connStatus)// Condition added - 25/11/11 - Gulzar as
+						// confirm method is called from post save
+						// component
+					{
+						conn.commit();
+						retString = itmDBAccessLocal.getErrorString("", "VTMCONF2", "");
+					}
+				} else
+				{
+					conn.rollback();
+				}
+			}
 		} catch (Exception e)
 		{
 			try