sales person to be set as per the current division, moved code inside loop so...

sales person to be set as per the current division, moved code inside loop so that for each division correct sales person is set


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

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

@@ -531,6 +531,7 @@ public class SalesReturnFormSplit extends ActionHandlerEJB implements SalesRetur
 				rs2 = null;
 
 
+				/* 11/02/14 manoharan moved below
 				sql1 = "select sales_pers from customer_series where cust_code = ? and item_ser = ?";
 				// end 26/11/11 manoharan salesperson to be set
 				pstmt2 = conn.prepareStatement(sql1);
@@ -551,6 +552,7 @@ public class SalesReturnFormSplit extends ActionHandlerEJB implements SalesRetur
 				{
 					salesPers = salesPersTmp;
 				}
+				*/
 				sql2 ="select unit,unit__rate from item where item_code = ?";
 				pstmt2 = conn.prepareStatement(sql2);
 				pstmt2.setString(1,itemCode);
@@ -832,7 +834,29 @@ public class SalesReturnFormSplit extends ActionHandlerEJB implements SalesRetur
 				xmlBuff.append("<chg_date><![CDATA["+ sdf.format(currDate) +"]]></chg_date>");
 				//xmlBuff.append("<chg_date><![CDATA["+ currDate == null?null:sdf.format(currDate.toString()) +"]]></chg_date>");
 				//xmlBuff.append("<chg_date><![CDATA["+value1+"]]></chg_date>");
+				// 11/02/14 manoharan sales person to be taken as per the new division, taken from out sode loop
 				// 26/11/11 manoharan salesperson to be set
+				sql1 = "select sales_pers from customer_series where cust_code = ? and item_ser = ?";
+				// end 26/11/11 manoharan salesperson to be set
+				pstmt2 = conn.prepareStatement(sql1);
+				pstmt2.setString(1,custCode);
+				pstmt2.setString(2,itemSer1);
+				rs2 = pstmt2.executeQuery();
+				String salesPersTmp = "";
+				if(rs2.next())
+				{ 
+					salesPersTmp = rs2.getString("sales_pers") == null ? " " : rs2.getString("sales_pers");
+				}
+				pstmt2.close();
+				pstmt2 = null;					
+				rs2.close();
+				rs2 = null;
+				
+				if (salesPersTmp != null && salesPersTmp.trim().length() > 0 )
+				{
+					salesPers = salesPersTmp;
+				}
+
 				xmlBuff.append("<sales_pers><![CDATA[" + salesPers + "]]></sales_pers>");
 				// end 26/11/11 manoharan salesperson to be set
 				//01112012 manoj sharma  ret_ref field to be set