Commit 28236c06 authored by nkhan's avatar nkhan

bug fix in invHdrMap and recivableMap


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@103703 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 61d3e25e
...@@ -2,6 +2,7 @@ package ibase.webitm.ejb.dis; ...@@ -2,6 +2,7 @@ package ibase.webitm.ejb.dis;
import java.rmi.RemoteException; import java.rmi.RemoteException;
import java.sql.Connection; import java.sql.Connection;
import java.sql.Date;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
...@@ -2173,14 +2174,15 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi ...@@ -2173,14 +2174,15 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
receivablesMap.put("ref_type", InvoiceHrdMap.get("inv_type")); receivablesMap.put("ref_type", InvoiceHrdMap.get("inv_type"));
receivablesMap.put("cr_term", InvoiceHrdMap.get("cr_term")); receivablesMap.put("cr_term", InvoiceHrdMap.get("cr_term"));
receivablesMap.put("sales_pers", InvoiceHrdMap.get("sales_pers")); receivablesMap.put("sales_pers", InvoiceHrdMap.get("sales_pers"));
receivablesMap.put("eff_date", InvoiceHrdMap.get("eff_date")); //receivablesMap.put("eff_date", InvoiceHrdMap.get("eff_date"));
receivablesMap.put("eff_date", new Timestamp(Timestamp.parse(InvoiceHrdMap.get("eff_date"))));
receivablesMap.put("sales_pers__1", InvoiceHrdMap.get("sales_pers__1")); receivablesMap.put("sales_pers__1", InvoiceHrdMap.get("sales_pers__1"));
receivablesMap.put("sales_pers__2", InvoiceHrdMap.get("sales_pers__2")); receivablesMap.put("sales_pers__2", InvoiceHrdMap.get("sales_pers__2"));
receivablesMap.put("item_ser", InvoiceHrdMap.get("item_ser")); receivablesMap.put("item_ser", InvoiceHrdMap.get("item_ser"));
receivablesMap.put("line_no__ref", lsNo); receivablesMap.put("line_no__ref", lsNo);
receivablesMap.put("gp_no", InvoiceHrdMap.get("gp_no")); receivablesMap.put("gp_no", InvoiceHrdMap.get("gp_no"));
receivablesMap.put("gp_date", InvoiceHrdMap.get("gp_date")); //receivablesMap.put("gp_date", InvoiceHrdMap.get("gp_date"));
receivablesMap.put("gp_date", new Timestamp(Timestamp.parse(InvoiceHrdMap.get("gp_date"))));
receivablesMap.put("mrp_value","0"); receivablesMap.put("mrp_value","0");
...@@ -2240,10 +2242,9 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi ...@@ -2240,10 +2242,9 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
receivablesMap.put("sales_pers__2", InvoiceHrdMap.get("sales_pers__2")); receivablesMap.put("sales_pers__2", InvoiceHrdMap.get("sales_pers__2"));
receivablesMap.put("item_ser", InvoiceHrdMap.get("item_ser")); receivablesMap.put("item_ser", InvoiceHrdMap.get("item_ser"));
receivablesMap.put("gp_no", InvoiceHrdMap.get("gp_no")); receivablesMap.put("gp_no", InvoiceHrdMap.get("gp_no"));
receivablesMap.put("gp_date", InvoiceHrdMap.get("gp_date")); //receivablesMap.put("gp_date", InvoiceHrdMap.get("gp_date"));// Change By Nasruddin on 14-oct-16
receivablesMap.put("gp_date", Timestamp.valueOf(genericUtility.getValidDateString(InvoiceHrdMap.get("gp_date").toString(), genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat()) + " 00:00:00.0"));
receivablesMap.put("mrp_value","0"); receivablesMap.put("mrp_value","0");
ldDiscdt=gbf_calc_discountdate(InvoiceHrdMap.get("cr_term"), InvoiceHrdMap.get("tran_date"), InvoiceHrdMap.get("eff_date"), ldDiscdt=gbf_calc_discountdate(InvoiceHrdMap.get("cr_term"), InvoiceHrdMap.get("tran_date"), InvoiceHrdMap.get("eff_date"),
InvoiceHrdMap.get("tran_date"),conn); InvoiceHrdMap.get("tran_date"),conn);
receivablesMap.put("discount_date", ldDiscdt); receivablesMap.put("discount_date", ldDiscdt);
...@@ -2615,7 +2616,7 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi ...@@ -2615,7 +2616,7 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
{ {
// TODO Auto-generated method stub // TODO Auto-generated method stub
HashMap<String, String> InvoiceHrdMap=new HashMap<String, String>(); HashMap<String, String> InvoiceHrdMap=new HashMap<String, String>();
String sql="",trnDtStr="",despDtStr="",dueDtStr="",effDtStr="",taxDtStr="",confDtStr="",chgDtStr=""; String sql="",trnDtStr="",despDtStr="",dueDtStr="",effDtStr="",taxDtStr="",confDtStr="",chgDtStr="", gpDtStr = "";
PreparedStatement pstmt=null; PreparedStatement pstmt=null;
ResultSet rs=null; ResultSet rs=null;
...@@ -2753,7 +2754,12 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi ...@@ -2753,7 +2754,12 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
InvoiceHrdMap.put("salespers2_descr", checkNull(rs.getString("salespers2_descr"))); InvoiceHrdMap.put("salespers2_descr", checkNull(rs.getString("salespers2_descr")));
InvoiceHrdMap.put("doc_status", checkNull(rs.getString("doc_status"))); InvoiceHrdMap.put("doc_status", checkNull(rs.getString("doc_status")));
InvoiceHrdMap.put("gp_no", checkNull(rs.getString("gp_no"))); InvoiceHrdMap.put("gp_no", checkNull(rs.getString("gp_no")));
InvoiceHrdMap.put("gp_date", checkNull(rs.getString("gp_date"))); //Changed By Nasruddin 14-10-16 Strat
//InvoiceHrdMap.put("gp_date", checkNull(rs.getString("gp_date")));
gpDtStr=genericUtility.getValidDateString(rs.getString("gp_date"), genericUtility.getDBDateFormat(),
genericUtility.getApplDateFormat());
InvoiceHrdMap.put("gp_date", gpDtStr);
//Changed By Nasruddin 14-10-16 End
InvoiceHrdMap.put("sales_grp", checkNull(rs.getString("sales_grp"))); InvoiceHrdMap.put("sales_grp", checkNull(rs.getString("sales_grp")));
InvoiceHrdMap.put("edi_addr", checkNull(rs.getString("edi_addr"))); InvoiceHrdMap.put("edi_addr", checkNull(rs.getString("edi_addr")));
InvoiceHrdMap.put("adj_amount", checkNull(rs.getString("adj_amount"))); InvoiceHrdMap.put("adj_amount", checkNull(rs.getString("adj_amount")));
......
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