added remarks for credit note and misc credit note. added sreturn no for misc credit note

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

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

@@ -2645,9 +2645,10 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
 						// 10-sep-2019 manoharan to check amount of credite note and sales return
 						if (merrcode == null || merrcode.trim().length() == 0 )
 						{
-							sql = " select tran_id  from misc_drcr_rcp where sreturn_no = ?";
+							sql = " select tran_id  from misc_drcr_rcp where sreturn_no = ? and site_code= ? ";   //site code added by manish on 12-feb-2019
 							pstmt = conn.prepareStatement(sql);
 							pstmt.setString(1,msalereturn );
+							pstmt.setString(2, ls_site_code);   //added by manish mhatre on 12-feb-2019
 							rs = pstmt.executeQuery();
 							if(rs.next())
 							{										
@@ -2773,9 +2774,10 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
 						if (merrcode == null || merrcode.trim().length() == 0 )
 						{
 							//System.out.println("inside merrcode");
-							sql = " select tran_id  from drcr_rcp where sreturn_no = ? ";
+							sql = " select tran_id  from drcr_rcp where sreturn_no = ? and site_code = ? ";    //site code added by manish mhatre on 12-feb-2019 
 							pstmt = conn.prepareStatement(sql);
 							pstmt.setString(1,msalereturn );
+							pstmt.setString(2, ls_site_code);   //added by manish mhatre on 12-feb-2019
 							rs = pstmt.executeQuery();
 							if(rs.next())
 							{										
@@ -5962,6 +5964,19 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
 		rs.close();
 		rs=null;
 		
+		sql="select remarks from sreturn where tran_id= ? ";
+		pstmt1=conn.prepareStatement(sql);
+		pstmt1.setString(1, sreturnNo);
+		rs1=pstmt1.executeQuery();
+		if(rs1.next())
+		{
+			remarks=checkNullAndTrim(rs1.getString("remarks"));
+		}
+		pstmt1.close();
+		pstmt1=null;
+		rs1.close();
+		rs1=null;
+		
 			
 		/*sql="select invoice_id from invoice where parent__tran_id= ? ";
 		pstmt=conn.prepareStatement(sql);
@@ -6019,7 +6034,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
 		pstmt.setDouble(29, amountBc);
 		pstmt.setString(30, itemSer);
 		pstmt.setDouble(31, 0);
-		pstmt.setString(32, " ");
+		pstmt.setString(32, sreturnNo);
 		pstmt.setString(33, adjRecv);
 		pstmt.setString(34, gpSer);
 		pstmt.setString(35, gpNo);
@@ -6835,6 +6850,20 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
 		pstmt.close();
 		pstmt = null;
 		
+		
+		sql="select remarks from sreturn where tran_id= ? ";
+		pstmt1=conn.prepareStatement(sql);
+		pstmt1.setString(1, sreturnNo);
+		rs1=pstmt1.executeQuery();
+		if(rs1.next())
+		{
+			remarks=checkNullAndTrim(rs1.getString("remarks"));
+		}
+		pstmt1.close();
+		pstmt1=null;
+		rs1.close();
+		rs1=null;
+	
 		//MISC_DRCR_RCP
 		sql = "insert into misc_drcr_rcp  (tran_id,tran_ser,tran_date,eff_date,fin_entity,site_code,sundry_type,sundry_code,acct_code," +
 		       " cctr_code,amount,curr_code,exch_rate,remarks,drcr_flag,tran_id__rcv,confirmed,chg_user,chg_date,chg_term," +
@@ -6871,7 +6900,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
 		               	pstmt.setString(23,tranType);
 		               	pstmt.setString(24,itemSer);
 		               	pstmt.setDouble(25,amountBc);
-		               	pstmt.setString(26," ");
+		               	pstmt.setString(26,sreturnNo);
 		               	pstmt.setString(27,adjmisccrn);
 		             	pstmt.setDouble(28,adjAmount);
 		                pstmt.setString(29,tranIdAs);