UPDATED

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

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

 /*
  develop by Ritesh 
- purpose - generate confirm  sale order from receipt and despatch order
+ purpose - generate confirm  sale order and despatch order from receipt 
  */
 
 package ibase.webitm.ejb.dis;
@@ -355,6 +355,7 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
 		try   
 		{
 				finCommon = new FinCommon();
+				DistCommon dComm = new DistCommon();
 				itmDBAccessEJB = new ITMDBAccessEJB();
 				System.out.println("@@@@@@@ generateSaleOrder  function called");
 				SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
@@ -581,6 +582,7 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
 					sql = " select  comm_perc , comm_perc__on  	from   customer_series 	where  cust_code = ? and  item_ser  = ?  ";
 					pstmt = conn.prepareStatement(sql);
 					pstmt.setString(1,custCode);
+					pstmt.setString(2,itemSer);
 					rs = pstmt.executeQuery();
 					if(rs.next())
 					{
@@ -1123,18 +1125,26 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
 					pstmt.setString(2,tranIdForIssue);
 					int rows = pstmt.executeUpdate();System.out.println("updated rows =="+rows);
 					conn.commit();
-					retString = confirmSaleOrder("sorder",tranIdForIssue,xtraParams,conn);
-					System.out.println("retString from generateSaleOrder conf ::"+retString);
-					if((retString != null ) &&  retString.indexOf("success") > -1)
+					// perameter added on 17/apr/2014 by RITESH 
+					String varValue1 = dComm.getDisparams("999999","AUTO_CONF_SORD", conn); 
+					if("NULLFOUND".equalsIgnoreCase(varValue1))
+						varValue1 = "Y";
+					System.out.println("IS SORDER CONFIRM --"+varValue1);
+					if("Y".equalsIgnoreCase(varValue1.trim()))
 					{
-						System.out.println( "confirm sale order generate and confirm successfully ...");
-						if(tranIdForIssue != null)
+						retString = confirmSaleOrder("sorder",tranIdForIssue,xtraParams,conn);
+						System.out.println("retString from generateSaleOrder conf ::"+retString);
+						if((retString != null ) &&  retString.indexOf("success") > -1)
 						{
-							retString = despatchOrder(tranIdForIssue,custCode,tranId, xtraParams,conn);
-							System.out.println("ret String from despatchOrder ="+retString);
-							return retString;							
-						}
-					}				
+							System.out.println( "confirm sale order generate and confirm successfully ...");
+							if(tranIdForIssue != null)
+							{
+								retString = despatchOrder(tranIdForIssue,custCode,tranId, xtraParams,conn);
+								System.out.println("ret String from despatchOrder ="+retString);
+								return retString;							
+							}
+						}	
+					}
 				}
 				else
 				{