added new changes regarding misc debit/credit note.

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

webitm-gst-client/ibase/webitm/ejb/gstclient/GstDataPrc.java

@@ -8393,7 +8393,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 									 }
 									 dtlSql = dtlSql 
 											
-									+" and i.tran_id = ? and it.invoice_ref = ? ";
+									// +" and i.tran_id = ? and it.invoice_ref = ? "
+									 +" and i.tran_id = ? and it.invoice_ref = REF_ID__INV ";
 							
 							  retString = executeSqlAndPopulateData(hdrSql,dtlSql,"9B1(MISC-CRN-REG)");
 					    }
@@ -8538,8 +8539,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 									 dtlSql = dtlSql 
 											
 									//+" and i.tran_id = ? ";
-									+" and i.tran_id = ? and it.invoice_ref = ? ";
-									 
+									//+" and i.tran_id = ? and it.invoice_ref = ? ";
+									+" and i.tran_id = ? and it.invoice_ref = REF_ID__INV ";
 							  retString = executeSqlAndPopulateData(hdrSql,dtlSql,"9B1(MISC-DN-REG)");
 					    }
 						
@@ -8683,7 +8684,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 									 dtlSql = dtlSql 
 											
 									//+" and i.tran_id = ? ";
-									 +" and i.tran_id = ? and it.invoice_ref = ? ";
+									// +" and i.tran_id = ? and it.invoice_ref = ? ";
+									 +" and i.tran_id = ? and it.invoice_ref = REF_ID__INV ";
 							
 							  retString = executeSqlAndPopulateData(hdrSql,dtlSql,"9B2(MISC-CRN-UNREG)");
 					    }
@@ -8829,8 +8831,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 									 dtlSql = dtlSql 
 											
 									//+" and i.tran_id = ? ";
-									 +" and i.tran_id = ? and it.invoice_ref = ? ";
-							
+									// +" and i.tran_id = ? and it.invoice_ref = ? ";
+									 +" and i.tran_id = ? and it.invoice_ref = REF_ID__INV ";
 							  retString = executeSqlAndPopulateData(hdrSql,dtlSql,"9B2(MISC-DN-UNREG)");
 					    }
 				
@@ -28079,7 +28081,7 @@ dtlSql =         " select '' as  TRAN_ID, "
 					lrNo = rsSelHdr.getString("LR_NO");
 				//	lrDate = rsSelHdr.getTimestamp("LR_DATE");    commented by kaustubh 26 july 2017
 					reasCode = rsSelHdr.getString("REAS_CODE");
-				//	refIdInv = rsSelHdr.getString("REF_ID__INV");  commented by kaustubh on 23 JAN 2018
+					refIdInv = rsSelHdr.getString("REF_ID__INV");  
 				//	refDateInv = rsSelHdr.getTimestamp("REF_DATE__INV");  commented by kaustubh 26 july 2017
 					prvAssment = rsSelHdr.getString("PROV_ASSMNT");
 					orderNo = rsSelHdr.getString("ORDER_NO");
@@ -28098,14 +28100,14 @@ dtlSql =         " select '' as  TRAN_ID, "
 					refSer = rsSelHdr.getString("REF_SER");
 					remarksHdr = rsSelHdr.getString("REMARKS");
 					refID = rsSelHdr.getString("REF_ID");
-					invoiceRef = rsSelHdr.getString("invoice_ref");
+					//invoiceRef = rsSelHdr.getString("invoice_ref");
 					
 					
 					//Added by Kaustubh on 23 jan 2018 start
 					
 					if("Y".equalsIgnoreCase(IMPL_MIN_RATE_HISTORY) && ("9B1(MISC-CRN-REG)".equals(tranSer) || "9B1(MISC-DN-REG)".equals(tranSer) || "9B2(MISC-CRN-UNREG)".equals(tranSer) || "9B2(MISC-DN-UNREG)".equals(tranSer)))
 					{
-						refIdInv = getInvoiceId(invoiceRef);
+						refIdInv = getInvoiceId(refIdInv);
 						
 						refDateInv = getInvoicedate(refIdInv,connGST);
 					}
@@ -28227,6 +28229,8 @@ dtlSql =         " select '' as  TRAN_ID, "
 						pstmtSelDet = connGST.prepareStatement(sql);
 						
 						
+						
+						
 						if("11(A.1)".equals(tranSer) || "11(A.2)".equals(tranSer) || "11(B.1)".equals(tranSer) || "11(B.2)".equals(tranSer))
 						{
 							pstmtSelDet.setTimestamp(1, fromDate);