changed for sales_perc

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

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

@@ -105,6 +105,7 @@ public class SalesReturnFormSplit extends ActionHandlerEJB implements SalesRetur
 				status = rs.getString("STATUS");
 				siteCode = rs.getString("SITE_CODE");
 				verifyFlag = checkNull(rs.getString("VERIFY_FLAG"));
+				
 			}
 			pstmt.close();
 			pstmt = null;
@@ -116,11 +117,13 @@ public class SalesReturnFormSplit extends ActionHandlerEJB implements SalesRetur
 				retString = itmDBAccessLocal.getErrorString("","VTCONFMSP","");
 				return retString;
 			}
+			/* CHANDNI
 			else if(!verifyFlag.equalsIgnoreCase("Y"))				
 			{	
 			    retString = itmDBAccessLocal.getErrorString("","VTTNTFRCE","");
 			    return retString;
 			}
+			*/
 			else
 			{
 				retString = split(tranId, xtraParams,conn);
@@ -143,8 +146,6 @@ public class SalesReturnFormSplit extends ActionHandlerEJB implements SalesRetur
 					conn.rollback();
 				}
 			 }
-					
-				
 			
 		}
 		catch(Exception e)
@@ -214,7 +215,7 @@ public class SalesReturnFormSplit extends ActionHandlerEJB implements SalesRetur
 		ArrayList tempList = null;
 		String splitCode = "", tempSplitCode ="";
 
-		String itemSerDet = "", invoiceIdDet = "", itemCode = "", statusDet = "", reasCode = "";
+		String itemSerDet = "",itemSerHdr = "", invoiceIdDet = "", itemCode = "", statusDet = "", reasCode = "";
 		String locCode = "", stkOpt = "", lotNo = "", lotSl = "", taxClass = "";
 		String taxChap = "", taxEnv = "", unit = "", retRepFlag = "", unitStd = "";
 		String siteCodeMfg = "", unitRate = "", packCode = "",empCode = "" ;
@@ -328,7 +329,7 @@ public class SalesReturnFormSplit extends ActionHandlerEJB implements SalesRetur
 				effDate		= rs.getTimestamp("eff_date");
 				invoiceId	= checkNull(rs.getString("invoice_id"));
 				custCode	= checkNull(rs.getString("cust_code"));
-				itemSerDet		= checkNull(rs.getString("item_ser"));
+				itemSerHdr		= checkNull(rs.getString("item_ser"));
 				//retOpt		= checkNull(rs.getString("ret_opt"));
 				siteCode	= checkNull(rs.getString("site_code"));
 				projCode	= checkNull(rs.getString("proj_code"));
@@ -360,12 +361,13 @@ public class SalesReturnFormSplit extends ActionHandlerEJB implements SalesRetur
 			rs = null;
 
 			// 21/11/11 manoharan check whether to consider cr_term, ship_to_zip_code in splitcode
+			
 			sql = "SELECT count(1) as count "
 				+ " FROM sreturn_form_det "
-				+ " WHERE sreturn_form.tran_id = ? "
-				+ " and cr_term no null "
-				+ " and ship_to_zip_code is not null ";
-
+				+ " WHERE sreturn_form_det.tran_id = ? "
+				+ " and cr_term is not null "
+				+ " and ship_to_zip_code is not null "; 
+			 
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1, tranId);
 			rs = pstmt.executeQuery();
@@ -379,7 +381,7 @@ public class SalesReturnFormSplit extends ActionHandlerEJB implements SalesRetur
 			rs = null;
 			// end 21/11/11 manoharan check whether to consider cr_term, ship_to_zip_code in splitcode
 			
-			sql = "SELECT line_no, invoice_id, line_no__inv, item_code, quantity, net_amt, "
+			sql =" SELECT line_no, invoice_id, line_no__inv, item_code, quantity, net_amt, "
 				+ " status, reas_code, loc_code, stk_opt, rate, lot_no, lot_sl, tax_class, "
 				+ " tax_chap, tax_env, unit, ret_rep_flag, eff_net_amt, conv__qty_stduom, "
 				+ " conv__rtuom_stduom, unit__std, quantity__stduom, rate__stduom, exp_date, "
@@ -431,13 +433,17 @@ public class SalesReturnFormSplit extends ActionHandlerEJB implements SalesRetur
 				//unitRate		= checkNull(rs.getString("unit__rate"));
 				packCode		= checkNull(rs.getString("pack_code"));
 				//fullRet			= checkNull(rs.getString("full_ret"));
-				//itemSerDet		= checkNull(rs.getString("item_ser"));
+				itemSerDet		= checkNull(rs.getString("item_ser"));
 				rateClg			= rs.getDouble("rate__clg");
 				costRate		= rs.getDouble("cost_rate");
 
 				crterm  = checkNull(rs.getString("cr_term"));
 				shiptozip = checkNull(rs.getString("ship_to_zip_code"));
 				// 21/11/11 manoharan check whether to consider cr_term, ship_to_zip_code in splitcode
+				if (itemSerDet == null || itemSerDet.trim().length() == 0)
+				{
+					itemSerDet =  itemSerHdr;
+				}
 				if (crCount > 0)
 				{
 					sql1 = "SELECT CUST_CODE FROM CUSTOMER WHERE"+