Commit 4a22246c authored by ngadkari's avatar ngadkari

Changes for status column value set as space and after invoice creation set as I(invoiced)

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@188993 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 7088ea05
...@@ -721,7 +721,7 @@ public class PostOrdDespatchGen ...@@ -721,7 +721,7 @@ public class PostOrdDespatchGen
rs1 = null; rs1 = null;
pstmt1.close(); pstmt1.close();
pstmt1 = null; pstmt1 = null;
status="I"; status=" ";// Remvoved I and added space by Nandkumar Gadkari on 08/08/18
//adding tax chap from sorditem //adding tax chap from sorditem
......
...@@ -885,7 +885,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -885,7 +885,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
xmlBuff.append("<net_amt><![CDATA[" +ld_net_amt+ "]]></net_amt>"); xmlBuff.append("<net_amt><![CDATA[" +ld_net_amt+ "]]></net_amt>");
xmlBuff.append("</Detail2>"); xmlBuff.append("</Detail2>");
sql="update despatchdet set invoice_id = ?,quantity_inv=? where desp_id = ? and line_no = ? ";// added by Abhijit on 16-05-2017 /*sql="update despatchdet set invoice_id = ?,quantity_inv=? where desp_id = ? and line_no = ? ";// added by Abhijit on 16-05-2017
pstmt=conn.prepareStatement(sql); // pstmt=conn.prepareStatement(sql); //
pstmt.setString(1,tranId); pstmt.setString(1,tranId);
pstmt.setDouble(2,Double.parseDouble(invTraceDetMap.get("quantity"))); pstmt.setDouble(2,Double.parseDouble(invTraceDetMap.get("quantity")));
...@@ -893,7 +893,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -893,7 +893,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
pstmt.setString(4,invTraceDetMap.get("desp_line_no")); pstmt.setString(4,invTraceDetMap.get("desp_line_no"));
pstmt.executeUpdate(); pstmt.executeUpdate();
pstmt.close(); pstmt.close();
pstmt=null; pstmt=null;*/ //Commented by Nandkumar gadkari on 08/08/18
// } // }
// else // else
...@@ -1031,7 +1031,29 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -1031,7 +1031,29 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
int endIndexIssue = arrayForTranIdIssue[1].indexOf("</TranID>"); int endIndexIssue = arrayForTranIdIssue[1].indexOf("</TranID>");
tranId = arrayForTranIdIssue[1].substring(0, endIndexIssue); tranId = arrayForTranIdIssue[1].substring(0, endIndexIssue);
System.out.println("@V@ Tran id :- [" + tranId + "]"); System.out.println("@V@ Tran id :- [" + tranId + "]");
//---------------------------Changes by--Nandkumar gadkari on 08/08/18---------------start --
mainInvDespDetMap=(HashMap<String, HashMap>) dataList.get(0);
System.out.println("::::::::::::::::mainInvDespDetMap["+mainInvDespDetMap+"]");
for(String keyStr:mainInvDespDetMap.keySet())
{
System.out.println("Detail 2:::");
invTraceDetMap= new HashMap<String, String>();
despLineNo=keyStr;
invTraceDetMap=mainInvDespDetMap.get(keyStr);
sql="update despatchdet set status='I',invoice_id = ?,quantity_inv=? where desp_id = ? and line_no = ? ";// added by Abhijit on 16-05-2017
pstmt=conn.prepareStatement(sql); //
pstmt.setString(1,tranId);
pstmt.setDouble(2,Double.parseDouble(invTraceDetMap.get("quantity")));
pstmt.setString(3,invTraceDetMap.get("desp_id"));
pstmt.setString(4,invTraceDetMap.get("line_no"));
pstmt.executeUpdate();
pstmt.close();
pstmt=null;
}
//--------------------------Changes by---Nandkumar gadkari on 08/08/18---------------end --
sql="update invdet set net_amt=(quantity__stduom*rate__stduom)- ( case when disc_amt is null then 0 else disc_amt end ) +tax_amt where invoice_id=?"; sql="update invdet set net_amt=(quantity__stduom*rate__stduom)- ( case when disc_amt is null then 0 else disc_amt end ) +tax_amt where invoice_id=?";
//sql="update invdet set net_amt=(quantity__stduom*rate__stduom)-disc_amt+tax_amt where invoice_id=?"; //sql="update invdet set net_amt=(quantity__stduom*rate__stduom)-disc_amt+tax_amt where invoice_id=?";
...@@ -1797,7 +1819,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -1797,7 +1819,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
+ " AND( DESPATCHDET.DESP_ID <= ? ) )" + " AND( DESPATCHDET.DESP_ID <= ? ) )"
+ " ORDER BY despatchdet.sord_no ASC,despatchdet.line_no__sord ASC,despatchdet.exp_lev ASC"; + " ORDER BY despatchdet.sord_no ASC,despatchdet.line_no__sord ASC,despatchdet.exp_lev ASC";
pstmt=conn.prepareStatement(invDespDetSql); pstmt=conn.prepareStatement(invDespDetSql);
pstmt.setString(1,status); pstmt.setString(1," ");// changes by Nandkumar gadkari on 08/08/18 Status = space set removed
pstmt.setString(2,despId); pstmt.setString(2,despId);
pstmt.setString(3,despId); pstmt.setString(3,despId);
rs=pstmt.executeQuery(); rs=pstmt.executeQuery();
......
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