misc credit and debit note remarks has been updated.

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

webitm-dis/src/ibase/webitm/ejb/dis/adv/SalesReturnConfirm.java

@@ -3928,7 +3928,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
 
 			sql = "select a.cust_code__bill, a.eff_date, a.curr_code, a.exch_rate, a.anal_code, a.emp_code__aprv, a.item_ser, b.tran_id, b.invoice_id, b.line_no__inv," +
 					" b.item_code, b.quantity, b.net_amt, b.tax_chap, b.tax_class, b.tax_env, b.quantity__stduom, b.rate__stduom, b.discount, b.tax_amt, b.reas_code, b.line_no," +
-					" a.sales_pers , a.ret_opt, b.tran_id, b.line_no, b.rate__clg, b.lot_no, b.line_no__invtrace, b.lot_sl, a.ret_ref from 	sreturn a , sreturndet b " +
+					" a.sales_pers , a.ret_opt, b.tran_id, b.line_no, b.rate__clg, b.lot_no, b.line_no__invtrace, b.lot_sl, a.ret_ref,a.remarks from 	sreturn a , sreturndet b " +
 					" where a.tran_id = b.tran_id and a.tran_id >= ? and a.tran_id <= ? and a.tran_date >= ? " +
 					" and a.tran_date <= ? and a.cust_code >= ? and a.cust_code <= ? and a.site_code = ? " +
 					" and a.tran_type = ? and a.confirmed = 'Y' and a.ret_opt in ('C','D') and b.invoice_id is not null and a.tran_id__crn is null " +
@@ -3979,7 +3979,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
 				ll_line_no_invtrace = checkNullAndTrim(rs.getString(29));
 				ls_lotsl = checkNullAndTrim(rs.getString(30));
 				ls_ret_ref = checkNullAndTrim(rs.getString(31));
-
+				remarks=rs.getString(32);
 
 				//Added by wasim on 01-JUN-2017 as amount calculation was not migrated [START]
 				sql = "select sum(quantity) from invdet where invoice_id = ? ";
@@ -4177,7 +4177,29 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
 					xmlBuff.append("<cr_term>").append("<![CDATA[" + ls_cr_term + "]]>").append("</cr_term>");
 					//	xmlBuff.append("<emp_code__aprv>").append("<![CDATA[" + ls_emp_code__aprv + "]]>").append("</emp_code__aprv>");
 					xmlBuff.append("<drcr_flag>").append("<![CDATA[" + "C" + "]]>").append("</drcr_flag>");
+					
+					//added by manish mhatre on 7-feb-2019
+					//start manish
+					if ((remarks!=null)&& (remarks.trim().length() > 0 ))
+					{
+					remarks = remarks.trim() + " " + ls_tran_id;
+					}
+					else
+					{
+						if ("D".equalsIgnoreCase(ls_ret_opt))
+						{	
+							remarks = "Auto Generated Debit Note for Sales Return " + ls_tran_id;
+						}
+						else
+						{	
+							remarks = "Auto Generated Credit Note for Sales Return " + ls_tran_id;
+						}
+					} 
+		
+					remarks=remarks.substring(0, remarks.length()-1);
+					//end manish
 					xmlBuff.append("<remarks>").append("<![CDATA[" + remarks + "]]>").append("</remarks>");
+					
 					xmlBuff.append("<gp_no>").append("<![CDATA[" + ls_gp_no + "]]>").append("</gp_no>");
 					xmlBuff.append("<gp_date>").append("<![CDATA[" + (ld_gp_date==null?"":sdfAppl.format(ld_gp_date).toString()) + "]]>").append("</gp_date>");
 					//xmlBuff.append("<tran_id__rcv>").append("<![CDATA[" + "" + "]]>").append("</tran_id__rcv>");
@@ -4855,7 +4877,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
 			sql = "select a.cust_code__bill, a.eff_date, a.curr_code, a.exch_rate, a.anal_code, a.emp_code__aprv, a.item_ser, b.tran_id, b.quantity, " +
 					" case when (b.net_amt) is null then 0 else (b.net_amt) end , b.tax_chap, b.tax_class, b.tax_env, b.quantity__stduom, b.rate__stduom, " +
 					" b.discount,case when ( b.tax_amt) is null then 0 else ( b.tax_amt) end, b.reas_code, b.line_no, a.ret_opt, a.tran_type, b.item_code, " +
-					" a.adj_misc_crn, b.lot_no, b.line_no__invtrace, b.lot_sl,a.ret_ref, b.unit from 	sreturn a , sreturndet b where a.tran_id = b.tran_id " +
+					" a.adj_misc_crn, b.lot_no, b.line_no__invtrace, b.lot_sl,a.ret_ref, b.unit,a.remarks from 	sreturn a , sreturndet b where a.tran_id = b.tran_id " +
 					" and a.tran_id >= ? and a.tran_id <= ? and a.tran_date >= ? and a.tran_date <= ? and a.cust_code >= ? and a.cust_code <= ? and a.site_code = ?" +
 					" and a.tran_type = ? and a.confirmed = 'Y' and a.ret_opt in ('C','D') and b.invoice_id is null and a.tran_id__crn is null order by a.cust_code, a.item_ser, a.tran_date, a.tran_id " ;
 			pstmt = conn.prepareStatement(sql);
@@ -4899,6 +4921,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
 				ls_lotsl = checkNullAndTrim(rs.getString(26));
 				ls_ret_ref = checkNullAndTrim(rs.getString(27));
 				ls_unit = checkNullAndTrim(rs.getString(28));
+				remarks=rs.getString(29);
 				////////
 				//System.out.println("ls_tran_id ["+ls_tran_id+"]");
 				//System.out.println("ls_cust_code ["+ls_cust_code+"]");
@@ -5158,7 +5181,27 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
 					xmlBuff.append("<cctr_code>").append("<![CDATA[" + ls_cctr_code + "]]>").append("</cctr_code>");
 					xmlBuff.append("<amount>").append("<![CDATA[" + (lc_net_amt + lc_process_fee) + "]]>").append("</amount>");
 					xmlBuff.append("<curr_code>").append("<![CDATA[" + checkNull(ls_curr_code ) + "]]>").append("</curr_code>");
-					xmlBuff.append("<exch_rate>").append("<![CDATA[" + lc_exch_rate + "]]>").append("</exch_rate>");			
+					xmlBuff.append("<exch_rate>").append("<![CDATA[" + lc_exch_rate + "]]>").append("</exch_rate>");	
+					//added by manish mhatre on 7-feb-2019
+					//start manish
+					if ((remarks!=null)&& (remarks.trim().length() > 0 ))
+					{
+					remarks = remarks.trim() + " " + ls_tran_id;
+					}
+					else
+					{
+						if ("D".equalsIgnoreCase(ls_ret_opt))
+						{	
+							remarks = "Auto Generated Debit Note for Sales Return " + ls_tran_id;
+						}
+						else
+						{	
+							remarks = "Auto Generated Credit Note for Sales Return " + ls_tran_id;
+						}
+					} 
+					remarks=remarks.substring(0, remarks.length()-1);
+					//end manish
+					xmlBuff.append("<remarks>").append("<![CDATA[" + remarks + "]]>").append("</remarks>");
 					//xmlBuff.append("<remarks>").append("<![CDATA[" + "Against contract id:"+contractId+" from "+fromDateStr+" to "+toDateStr+" "+"]]>").append("</remarks>");
 					xmlBuff.append("<drcr_flag>").append("<![CDATA[" + "C" + "]]>").append("</drcr_flag>");