Skip to content

B
business-java
Commit a328a844 authored by kdabholkar's avatar kdabholkar
Browse files
Options

New tag to changes regarding misc debit/credit note 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@179661 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 8957fc69
Show whitespace changes
Inline Side-by-side
Showing with 78 additions and 18 deletions
webitm-gst-client/ibase/webitm/ejb/gstclient/GstDataPrc.java
View file @ a328a844
......@@ -8257,6 +8257,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
}
if ("Y".equalsIgnoreCase(IMPL_MIN_RATE_HISTORY))
{
/**
* 9B(1) Header Credit Note registered (CDNRA) - Misc Credit Note registered *
*/
......@@ -8284,8 +8287,18 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+"(i.amount * i.EXCH_RATE) AS AMOUNT,"
+"'N' AS REVERSE_CHRG,"
+"' ' AS LR_NO,"
+"' ' AS REAS_CODE,"
+"d.invoice_ref AS REF_ID__INV,"
+"' ' AS REAS_CODE,";
if ("Y".equalsIgnoreCase(IMPL_MIN_RATE_HISTORY))
{
hdrSql =hdrSql +"d.invoice_ref AS REF_ID__INV,";
}
else
{
hdrSql =hdrSql + "'' AS REF_ID__INV,";
// hdrSql =hdrSql +"d.invoice_ref AS REF_ID__INV,";
}
hdrSql =hdrSql
+" '' AS REF_DATE_INV,"
+"'N' AS PROV_ASSMNT,"
+"' ' AS ORDER_NO,"
......@@ -8397,8 +8410,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 = REF_ID__INV ";
+" 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)");
}
......@@ -8429,8 +8442,19 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+"(i.amount * i.EXCH_RATE) AS AMOUNT,"
+"'N' AS REVERSE_CHRG,"
+"' ' AS LR_NO,"
+"' ' AS REAS_CODE,"
+"d.invoice_ref AS REF_ID__INV,"
+"' ' AS REAS_CODE,";
if ("Y".equalsIgnoreCase(IMPL_MIN_RATE_HISTORY))
{
hdrSql =hdrSql +"d.invoice_ref AS REF_ID__INV,";
}
else
{
hdrSql =hdrSql + "'' AS REF_ID__INV,";
// hdrSql =hdrSql +"d.invoice_ref AS REF_ID__INV,";
}
hdrSql =hdrSql
// +"d.invoice_ref AS REF_ID__INV,"
+" '' AS REF_DATE_INV,"
+"'N' AS PROV_ASSMNT,"
+"' ' AS ORDER_NO,"
......@@ -8543,8 +8567,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 = REF_ID__INV ";
+" 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)");
}
......@@ -8575,8 +8599,19 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+"(i.amount * i.EXCH_RATE) AS AMOUNT,"
+"'N' AS REVERSE_CHRG,"
+"' ' AS LR_NO,"
+"' ' AS REAS_CODE,"
+"d.invoice_ref AS REF_ID__INV,"
+"' ' AS REAS_CODE,";
if ("Y".equalsIgnoreCase(IMPL_MIN_RATE_HISTORY))
{
hdrSql =hdrSql +"d.invoice_ref AS REF_ID__INV,";
}
else
{
hdrSql =hdrSql + "'' AS REF_ID__INV,";
// hdrSql =hdrSql +"d.invoice_ref AS REF_ID__INV,";
}
hdrSql =hdrSql
// +"d.invoice_ref AS REF_ID__INV,"
+" '' AS REF_DATE_INV,"
+"'N' AS PROV_ASSMNT,"
+"' ' AS ORDER_NO,"
......@@ -8688,8 +8723,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 = REF_ID__INV ";
+" 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)");
}
......@@ -8721,8 +8756,19 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+"(i.amount * i.EXCH_RATE) AS AMOUNT,"
+"'N' AS REVERSE_CHRG,"
+"' ' AS LR_NO,"
+"' ' AS REAS_CODE,"
+"d.invoice_ref AS REF_ID__INV,"
+"' ' AS REAS_CODE,";
if ("Y".equalsIgnoreCase(IMPL_MIN_RATE_HISTORY))
{
hdrSql =hdrSql +"d.invoice_ref AS REF_ID__INV,";
}
else
{
hdrSql =hdrSql + "'' AS REF_ID__INV,";
// hdrSql =hdrSql +"d.invoice_ref AS REF_ID__INV,";
}
hdrSql =hdrSql
//+"d.invoice_ref AS REF_ID__INV,"
+" '' AS REF_DATE_INV,"
+"'N' AS PROV_ASSMNT,"
+"' ' AS ORDER_NO,"
......@@ -8835,11 +8881,14 @@ 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 = REF_ID__INV ";
+" 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)");
}
}// End (if) of misc debit/credit note disparm
/******11A Started ******/
{
......@@ -28237,7 +28286,12 @@ dtlSql = " select '' as TRAN_ID, "
pstmtSelDet = connGST.prepareStatement(sql);
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)))
{
pstmtSelDet.setString(1, refID);
pstmtSelDet.setString(2, refIdInv);
}
if("11(A.1)".equals(tranSer) || "11(A.2)".equals(tranSer) || "11(B.1)".equals(tranSer) || "11(B.2)".equals(tranSer))
{
......@@ -28613,6 +28667,7 @@ dtlSql = " select '' as TRAN_ID, "
*/
private java.sql.Timestamp getTimeStamp(String dateStr) throws ITMException, Exception
{
String dbDateStr = "";
......@@ -28637,5 +28692,10 @@ dtlSql = " select '' as TRAN_ID, "
}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment