add validation

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

webitm-dis/ibase/webitm/ejb/dis/GenerateSaleOrderPrc.java

@@ -84,7 +84,6 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
 	} //end of confirm method
 	public String process(Document dom, Document dom2, String windowName,String xtraParams) throws RemoteException, ITMException 
 	{
-
 		System.out.println("process called........");
 		String sql = "";
 		String errString = "";
@@ -108,6 +107,31 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
 			tranId = checkNull(genericUtility.getColumnValue("tran_id", dom));
 			custCode = checkNull(genericUtility.getColumnValue("cust_code", dom));
 			conn.setAutoCommit(false);
+			if(tranId.trim() !=null && tranId.trim().length() >0)
+			{
+				sql = "select count(*) from porcp where tran_id = ?";
+				pstmt =  conn.prepareStatement(sql);
+				pstmt.setString(1,tranId);
+				rs = pstmt.executeQuery();
+				if(rs.next())
+				{
+					tranIdFound = rs.getInt(1);
+				} 
+				rs.close();
+				rs = null;
+				pstmt.close();
+				pstmt = null;
+				if(tranIdFound <= 0)
+				{
+					System.out.println("Tran id not found");
+					errString = itmDBAccessEJB.getErrorString("","VTTNNTFD    ","","",conn);
+					return errString;
+				}
+			}else
+			{
+				errString = itmDBAccessEJB.getErrorString("","VTTNNTNL    ","","",conn);
+				return errString;
+			}
 			if(custCode.trim() !=null && custCode.trim().length() >0)
 			{
 				sql = "select site_code from porcp where tran_id =  ? ";
@@ -122,6 +146,7 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
 				rs = null;
 				pstmt.close();
 				pstmt = null;
+				//sql = "select count(*) from site_customer where cust_code = ?  and dis_link = 'A' and site_code = ? ";
 
 				sql = "select count(*) from site_customer where cust_code = ? and channel_partner = 'Y' and dis_link = 'A' and site_code = ? ";
 				pstmt =  conn.prepareStatement(sql);
@@ -156,30 +181,13 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
 						errString = itmDBAccessEJB.getErrorString("","VTCSCDNTFD ","","",conn);
 						return errString;
 					}
-					
 				}
 			}else
 			{
 				errString = itmDBAccessEJB.getErrorString("","VTCSCDNTNL ","","",conn);
 				return errString;
 			}
-			if(tranId.trim() !=null && tranId.trim().length() >0)
-			{
-				sql = "select count(*) from porcp where tran_id = ?";
-				//sql = "select a.sale_order,b.tran_id from sorder a, porcp b where a.sale_order = ?  and  b.tran_id  = ? ";
-				pstmt =  conn.prepareStatement(sql);
-				pstmt.setString(1,tranId);
-				rs = pstmt.executeQuery();
-				if(rs.next())
-				{
-					tranIdFound = rs.getInt(1);
-					//agreementValue = rs.getDouble("max_order_value");
-				} 
-				rs.close();
-				rs = null;
-				pstmt.close();
-				pstmt = null;
-				if(tranIdFound > 0)
+			if(tranIdFound > 0 && cusCodeFound > 0)
 			{
 				errString = generateSaleOrder(tranId,custCode, xtraParams,conn);
 				System.out.println("err String from generateSaleOrder ="+errString);
@@ -197,18 +205,6 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
 					return errString;
 				}
 			}
-				else
-				{
-					System.out.println("Tran id not found");
-					errString = itmDBAccessEJB.getErrorString("","VTTNNTFD    ","","",conn);
-					return errString;
-				}
-			}
-			else
-			{
-				errString = itmDBAccessEJB.getErrorString("","VTTNNTNL    ","","",conn);
-				return errString;
-			}
 		}
 		catch( Exception e)
 		{			
@@ -639,11 +635,6 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
 					currCodedlv = rs.getString("cust_code__dlv") == null ? " " : rs.getString("cust_code__dlv");
 					stanCode = rs.getString("stan_code") == null ? " " : rs.getString("stan_code");
 					orderDt = rs.getDate("order_date");
-//					city = rs.getString("DLV_CITY");
-//					stateCode = rs.getString("STATE_CODE__DLV");
-//					countCode = rs.getString("COUNT_CODE__DLV");
-//					pin = rs.getString("DLV_PIN");
-//					dlvAdd1 = rs.getString("dlv_add1");
 				}
 				rs.close();
 				rs =null;