Commit 9fa21132 authored by mjadhav's avatar mjadhav

add extra tag IssuerTransactionReference


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@98257 ce508802-f39f-4f6c-b175-0d175dae99d5
parent b1f30b63
...@@ -1162,12 +1162,12 @@ public class GenInvoiceSchedule implements Schedule { ...@@ -1162,12 +1162,12 @@ public class GenInvoiceSchedule implements Schedule {
private static Node getInvoiceElement(Document doc,String invoiceId,Connection conn) { private static Node getInvoiceElement(Document doc,String invoiceId,Connection conn) {
String sql="",purchaseOrd="",saleOrder="",despId="",phyAttrib_10=""; String sql="",purchaseOrd="",saleOrder="",despId="",phyAttrib_10="",custCodeBill="",custCodeBillReg5="";
String custCode="",currencyCode="",itemCode="",itemDescr="",quantity="",unit=""; String custCode="",currencyCode="",itemCode="",itemDescr="",quantity="",unit="";
String taxCode="",taxClass="",taxBase="",taxChap="",taxEnv="",exchRate="",discAmt="",msg_specs=""; String taxCode="",taxClass="",taxBase="",taxChap="",taxEnv="",exchRate="",discAmt="",msg_specs="";
String currCodeHd="",invoiceISOCode=""; String currCodeHd="",invoiceISOCode="";
String itemCodeDet="",itemDescrDet="",quantityDet="",unitDet="",accDet="",instAmtDet=""; String itemCodeDet="",itemDescrDet="",quantityDet="",unitDet="",accDet="",instAmtDet="";
String rate="",unitRate="",discountInv="",taxEffects="",siteCode="",paymentMeans="",docStatus="",custCodeBillHD=""; String rate="",unitRate="",discountInv="",taxEffects="",siteCode="",paymentMeans="",docStatus="",custCodeBillHD="",custCodeUdfStr="";
double taxBaseAmt=0.00,taxAmtHd=0.00 ,NetAmtHd=0.00,discAmtHd=0.00,invoiceAmtHd=0.00,rateDet=0.00; double taxBaseAmt=0.00,taxAmtHd=0.00 ,NetAmtHd=0.00,discAmtHd=0.00,invoiceAmtHd=0.00,rateDet=0.00;
double netAmtDet=0.00,discAmtDet=0.00,taxAmt=0.00,taxPersc=0.00,discountDet=0.00,totalCost=0.0,grossAmount=0.0,totalGrossAmount=0.0; double netAmtDet=0.00,discAmtDet=0.00,taxAmt=0.00,taxPersc=0.00,discountDet=0.00,totalCost=0.0,grossAmount=0.0,totalGrossAmount=0.0;
double totTaxBaseAmt=0.0,totTaxAmt=0.0; double totTaxBaseAmt=0.0,totTaxAmt=0.0;
...@@ -1239,6 +1239,47 @@ public class GenInvoiceSchedule implements Schedule { ...@@ -1239,6 +1239,47 @@ public class GenInvoiceSchedule implements Schedule {
custCodeBillHD = custCodeBillHD == null ? " " : custCodeBillHD.trim(); custCodeBillHD = custCodeBillHD == null ? " " : custCodeBillHD.trim();
/*-----------------------changes on dated 29/06/2015----------------------*/
sql = " select cust_code__bil from invoice where invoice_id=? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, invoiceId);
rs = pstmt.executeQuery();
if (rs.next())
{
custCodeBill=rs.getString("CUST_CODE__BIL");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
System.out.println("custCodeBill :"+custCodeBill);
custCodeBill = custCodeBill == null ? " " : custCodeBill.trim();
sql = "select registr_5,UDF_STR1 from customer where CUST_CODE=?" ;
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,custCodeBill );
rs = pstmt.executeQuery();
if (rs.next())
{
custCodeBillReg5 = rs.getString("registr_5");
custCodeUdfStr = rs.getString("UDF_STR1");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
custCodeBillReg5 = custCodeBillReg5 == null ? " " : custCodeBillReg5.trim();
custCodeUdfStr = custCodeUdfStr == null ? " " : custCodeUdfStr.trim();
System.out.println("custCodeBillReg5 :"+custCodeBillReg5);
/*-----------------------------------------------------------------------------------*/
System.out.println("invoiceDtHd : "+invoiceDtHd); System.out.println("invoiceDtHd : "+invoiceDtHd);
System.out.println("dueDateHd : "+dueDateHd); System.out.println("dueDateHd : "+dueDateHd);
...@@ -1370,11 +1411,6 @@ public class GenInvoiceSchedule implements Schedule { ...@@ -1370,11 +1411,6 @@ public class GenInvoiceSchedule implements Schedule {
/*------------------------------------------------------------------------------*/ /*------------------------------------------------------------------------------*/
sql = "select PHY_ATTRIB_10 from item where item_code= ? " ; sql = "select PHY_ATTRIB_10 from item where item_code= ? " ;
pstmt1 = conn.prepareStatement(sql); pstmt1 = conn.prepareStatement(sql);
...@@ -1565,6 +1601,7 @@ public class GenInvoiceSchedule implements Schedule { ...@@ -1565,6 +1601,7 @@ public class GenInvoiceSchedule implements Schedule {
Element invoice = doc.createElement("Invoice"); Element invoice = doc.createElement("Invoice");
Element invoiceHeader = doc.createElement("InvoiceHeader"); Element invoiceHeader = doc.createElement("InvoiceHeader");
invoiceHeader.appendChild(getElementValue(doc, invoiceParent, "InvoiceNumber", invoiceId)); invoiceHeader.appendChild(getElementValue(doc, invoiceParent, "InvoiceNumber", invoiceId));
invoiceHeader.appendChild(getElementValue(doc, invoiceParent, "InvoiceDocumentType","FC" )); invoiceHeader.appendChild(getElementValue(doc, invoiceParent, "InvoiceDocumentType","FC" ));
invoiceHeader.appendChild(getElementValue(doc, invoiceParent, "InvoiceClass", "OO")); invoiceHeader.appendChild(getElementValue(doc, invoiceParent, "InvoiceClass", "OO"));
...@@ -1659,7 +1696,12 @@ public class GenInvoiceSchedule implements Schedule { ...@@ -1659,7 +1696,12 @@ public class GenInvoiceSchedule implements Schedule {
Element invoiceLine = doc.createElement("InvoiceLine"); Element invoiceLine = doc.createElement("InvoiceLine");
if(custCodeUdfStr.equalsIgnoreCase("SIGLO"))
{
invoiceLine.appendChild(getElementValue(doc, invoiceParent, "IssuerTransactionReference"," "));
}
invoiceLine.appendChild(getElementValue(doc, invoiceParent, "ReceiverContractReference",custCodeBillReg5));
invoiceLine.appendChild(getElementValue(doc, invoiceParent, "ReceiverTransactionReference",purchaseOrd)); invoiceLine.appendChild(getElementValue(doc, invoiceParent, "ReceiverTransactionReference",purchaseOrd));
Element deliveryNotesReferences = doc.createElement("DeliveryNotesReferences"); Element deliveryNotesReferences = doc.createElement("DeliveryNotesReferences");
Element deliveryNote = doc.createElement("DeliveryNote"); Element deliveryNote = doc.createElement("DeliveryNote");
......
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