Skip to content

B
business-java
Commit 87d7eb5e authored by msingh's avatar msingh
Browse files
Options

Changed by Manish on 05/04/16 for PostOrdInvoice.java 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@101119 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 89503a45
Show whitespace changes
Inline Side-by-side
Showing with 1337 additions and 1290 deletions
webitm-dis/ibase/webitm/ejb/dis/PostOrdInvoiceGen.java
View file @ 87d7eb5e
...@@ -107,7 +107,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -107,7 +107,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
{ {
descpIdTo=descpIdFrm; descpIdTo=descpIdFrm;
// frmDateStr="";//ld_from_date // frmDateStr="";//ld_from_date
if(orderType==null || orderType.trim().length()==0) if(orderType==null || orderType.trim().length()==0)
...@@ -313,12 +313,12 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -313,12 +313,12 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
{ {
// TODO Auto-generated method stub // TODO Auto-generated method stub
StringBuffer xmlBuff=new StringBuffer(); StringBuffer xmlBuff=new StringBuffer();
// HashMap<String, HashMap<String, String>> mainInvDespMap=new HashMap<String, HashMap<String, String>>(); // HashMap<String, HashMap<String, String>> mainInvDespMap=new HashMap<String, HashMap<String, String>>();
// HashMap<String, HashMap<String, String>> mainInvDespDetMap=new HashMap<String, HashMap<String, String>>(); // HashMap<String, HashMap<String, String>> mainInvDespDetMap=new HashMap<String, HashMap<String, String>>();
HashMap<String, HashMap> mainInvDespDetMap=new HashMap<String, HashMap>(); HashMap<String, HashMap> mainInvDespDetMap=new HashMap<String, HashMap>();
HashMap<String, String> invDespMap=new HashMap<String, String>(); HashMap<String, String> invDespMap=new HashMap<String, String>();
HashMap<String, Object> invDetBeanMap= new HashMap<String, Object>(); HashMap<String, Object> invDetBeanMap= new HashMap<String, Object>();
// HashMap<String, String> invDespDetMap=null; // HashMap<String, String> invDespDetMap=null;
HashMap<String, String> invTraceDetMap=null; HashMap<String, String> invTraceDetMap=null;
HashMap<String, String> acctSchemehdrMap=null; HashMap<String, String> acctSchemehdrMap=null;
HashMap<String, String> sorderSalMap=null; HashMap<String, String> sorderSalMap=null;
...@@ -332,6 +332,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -332,6 +332,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
double lcCommAmtOc=0.0,tcommAmt=0.0,lcExchRate=0.0; double lcCommAmtOc=0.0,tcommAmt=0.0,lcExchRate=0.0;
int lineNo=0,lineNoDet=0; int lineNo=0,lineNoDet=0;
Timestamp dueDate=null; Timestamp dueDate=null;
String acctCodeDis="",cctrCodeDis="",acctCodeAr="",cctrCodeAr = "",acctCodePr="",cctrCodePr="",marketReg = "",mfgDateStr="",expDateStr="";
/** /**
* Generate Bean object * Generate Bean object
...@@ -354,7 +355,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -354,7 +355,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
sysDate = sdf.format(today); sysDate = sdf.format(today);
System.out.println("System date :- [" + sysDate + "]"); System.out.println("System date :- [" + sysDate + "]");
// mainInvDespMap=getInvDespatch(ldsInvHdrMp,conn); // mainInvDespMap=getInvDespatch(ldsInvHdrMp,conn);
invDespMap=getInvDespatch(ldsInvHdrMp,conn); invDespMap=getInvDespatch(ldsInvHdrMp,conn);
System.out.println("@@@@@@@@@invDespMap.size():-["+invDespMap.size()+"]invDespMap["+invDespMap+"]"); System.out.println("@@@@@@@@@invDespMap.size():-["+invDespMap.size()+"]invDespMap["+invDespMap+"]");
...@@ -364,13 +365,13 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -364,13 +365,13 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
* Iterate MainInvDeapMap * Iterate MainInvDeapMap
* to get inner values * to get inner values
* */ * */
// for(String key:mainInvDespMap.keySet()) // for(String key:mainInvDespMap.keySet())
// { // {
// despIdKey=key; // despIdKey=key;
// invDespMap=new HashMap<String, String>(); // invDespMap=new HashMap<String, String>();
// invDespMap=mainInvDespMap.get(despIdKey); // invDespMap=mainInvDespMap.get(despIdKey);
// System.out.println("Inner InvDespMap size:-["+invDespMap.size()+"]"); // System.out.println("Inner InvDespMap size:-["+invDespMap.size()+"]");
despIdKey=invDespMap.get("desp_id"); despIdKey=invDespMap.get("desp_id");
fos1.write(("\n Invoice in process for Dispatch Id :- [" + despIdKey +"]\r\n").getBytes()); fos1.write(("\n Invoice in process for Dispatch Id :- [" + despIdKey +"]\r\n").getBytes());
...@@ -382,7 +383,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -382,7 +383,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
dataList=getInvDespatchDet(invDespMap.get("sord_no"),invDespMap.get("status"),despIdKey,ldsInvHdrMp, dataList=getInvDespatchDet(invDespMap.get("sord_no"),invDespMap.get("status"),despIdKey,ldsInvHdrMp,
invDespMap.get("desp_site_code"),conn); invDespMap.get("desp_site_code"),conn);
// System.out.println("MainInvDespDetMap size :- ["+mainInvDespDetMap.size()+"]"); // System.out.println("MainInvDespDetMap size :- ["+mainInvDespDetMap.size()+"]");
System.out.println("@@@@@@@@dataList.size:::["+dataList.size()+"]::::::::dataList["+dataList+"]"); System.out.println("@@@@@@@@dataList.size:::["+dataList.size()+"]::::::::dataList["+dataList+"]");
System.out.println("@@@@@@@@:::::::ldsInvHdrMp[["+ldsInvHdrMp+"]]::::::::invDespMap["+invDespMap+"]"); System.out.println("@@@@@@@@:::::::ldsInvHdrMp[["+ldsInvHdrMp+"]]::::::::invDespMap["+invDespMap+"]");
...@@ -445,16 +446,21 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -445,16 +446,21 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
xmlBuff.append("<gp_date><![CDATA[" +invDespMap.get("gp_date")+ "]]></gp_date>"); xmlBuff.append("<gp_date><![CDATA[" +invDespMap.get("gp_date")+ "]]></gp_date>");
xmlBuff.append("<lr_no><![CDATA[" +ldsInvHdrMp.get("lr_no")+ "]]></lr_no>"); xmlBuff.append("<lr_no><![CDATA[" +ldsInvHdrMp.get("lr_no")+ "]]></lr_no>");
xmlBuff.append("<lr_date><![CDATA[" +ldsInvHdrMp.get("lr_date")+ "]]></lr_date>"); xmlBuff.append("<lr_date><![CDATA[" +ldsInvHdrMp.get("lr_date")+ "]]></lr_date>");
// xmlBuff.append("<lr_date><![CDATA[" +ldsInvHdrMp.get("lr_date")+ "]]></lr_date>"); // xmlBuff.append("<lr_date><![CDATA[" +ldsInvHdrMp.get("lr_date")+ "]]></lr_date>");
if(salesInvPstHdr.equalsIgnoreCase("NULLFOUND") || salesInvPstHdr.equalsIgnoreCase("H"))
{
sorderSalMap=new HashMap<String, String>(); sorderSalMap=new HashMap<String, String>();
sorderSalMap=getsorderSal(invDespMap.get("sord_no"),conn); sorderSalMap=getsorderSal(invDespMap.get("sord_no"),conn);
if(salesInvPstHdr.equalsIgnoreCase("NULLFOUND") || salesInvPstHdr.equalsIgnoreCase("H"))
{
System.out.println("SorderSalMap size :- ["+sorderSalMap.size()+"]"); System.out.println("SorderSalMap size :- ["+sorderSalMap.size()+"]");
xmlBuff.append("<acct_code__sal><![CDATA[" +sorderSalMap.get("lsacct_sal")+ "]]></acct_code__sal>"); xmlBuff.append("<acct_code__sal><![CDATA[" +sorderSalMap.get("lsacct_sal")+ "]]></acct_code__sal>");
xmlBuff.append("<cctr_code__sal><![CDATA[" +sorderSalMap.get("lscctr_sal")+ "]]></cctr_code__sal>"); xmlBuff.append("<cctr_code__sal><![CDATA[" +sorderSalMap.get("lscctr_sal")+ "]]></cctr_code__sal>");
xmlBuff.append("<posttype><![CDATA[" +"H"+ "]]></posttype>"); xmlBuff.append("<posttype><![CDATA[" +"H"+ "]]></posttype>");
marketReg = checknull(sorderSalMap.get("ls_market_reg"));
if(marketReg.trim().length()>0)
{
xmlBuff.append("<market_reg><![CDATA["+marketReg+"]]></market_reg>");
}
} }
else if(salesInvPstHdr.equalsIgnoreCase("D")) else if(salesInvPstHdr.equalsIgnoreCase("D"))
{ {
...@@ -465,15 +471,32 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -465,15 +471,32 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
disItemserMap= new HashMap<String, String>(); disItemserMap= new HashMap<String, String>();
disItemserMap=getdisItemser(invDespMap.get("item_ser"),conn); disItemserMap=getdisItemser(invDespMap.get("item_ser"),conn);
xmlBuff.append("<acct_code__dis><![CDATA["+disItemserMap.get("lsacct_dis")+"]]></acct_code__dis>"); acctCodeDis=checknull(disItemserMap.get("lsacct_dis"));
xmlBuff.append("<cctr_code__dis><![CDATA["+disItemserMap.get("lscctr_dis")+"]]></cctr_code__dis>"); cctrCodeDis=checknull(disItemserMap.get("lscctr_dis"));
if(acctCodeDis.trim().length()>0)
{
xmlBuff.append("<acct_code__dis><![CDATA["+acctCodeDis+"]]></acct_code__dis>");
}
if(cctrCodeDis.trim().length()>0)
{
xmlBuff.append("<cctr_code__dis><![CDATA["+cctrCodeDis+"]]></cctr_code__dis>");
}
xmlBuff.append("<bank_code><![CDATA["+invDespMap.get("bank_code")+"]]></bank_code>"); xmlBuff.append("<bank_code><![CDATA["+invDespMap.get("bank_code")+"]]></bank_code>");
xmlBuff.append("<market_reg><![CDATA["+sorderSalMap.get("ls_market_reg")+"]]></market_reg>"); System.out.println("sorderSalMap["+sorderSalMap+"]");
arCustomerMap=new HashMap<String, String>(); arCustomerMap=new HashMap<String, String>();
arCustomerMap=getarCustomer(invDespMap.get("cust_code__bil"),conn); arCustomerMap=getarCustomer(invDespMap.get("cust_code__bil"),conn);
xmlBuff.append("<acct_code__ar><![CDATA["+arCustomerMap.get("macctar")+"]]></acct_code__ar>");
xmlBuff.append("<cctr_code__ar><![CDATA["+arCustomerMap.get("mcctrar")+"]]></cctr_code__ar>"); acctCodeAr=checknull(arCustomerMap.get("macctar"));
cctrCodeAr=checknull(arCustomerMap.get("mcctrar"));
if(acctCodeAr.trim().length()>0)
{
xmlBuff.append("<acct_code__ar><![CDATA["+acctCodeAr+"]]></acct_code__ar>");
}
if(cctrCodeAr.trim().length()>0)
{
xmlBuff.append("<cctr_code__ar><![CDATA["+cctrCodeAr+"]]></cctr_code__ar>");
}
xmlBuff.append("<cr_term><![CDATA["+invDespMap.get("cr_term")+"]]></cr_term>"); xmlBuff.append("<cr_term><![CDATA["+invDespMap.get("cr_term")+"]]></cr_term>");
xmlBuff.append("<cr_days><![CDATA["+invDespMap.get("cr_days")+"]]></cr_days>"); xmlBuff.append("<cr_days><![CDATA["+invDespMap.get("cr_days")+"]]></cr_days>");
...@@ -502,18 +525,27 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -502,18 +525,27 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
xmlBuff.append("<ins_amt><![CDATA["+invDespMap.get("ins_amt")+"]]></ins_amt>"); xmlBuff.append("<ins_amt><![CDATA["+invDespMap.get("ins_amt")+"]]></ins_amt>");
xmlBuff.append("<remarks><![CDATA["+ldsInvHdrMp.get("remarks")+"]]></remarks>"); xmlBuff.append("<remarks><![CDATA["+ldsInvHdrMp.get("remarks")+"]]></remarks>");
xmlBuff.append("<stan_code__init><![CDATA["+ldsInvHdrMp.get("stan_code__init")+"]]></stan_code__init>"); xmlBuff.append("<stan_code__init><![CDATA["+ldsInvHdrMp.get("stan_code__init")+"]]></stan_code__init>");
xmlBuff.append("<frt_amt><![CDATA["+invDespMap.get("frt_amt")+"]]></frt_amt>"); //xmlBuff.append("<frt_amt><![CDATA["+invDespMap.get("frt_amt")+"]]></frt_amt>");
xmlBuff.append("<exch_rate__frt><![CDATA["+invDespMap.get("exch_rate__frt")+"]]></exch_rate__frt>"); xmlBuff.append("<exch_rate__frt><![CDATA["+invDespMap.get("exch_rate__frt")+"]]></exch_rate__frt>");
xmlBuff.append("<acct_code__pr><![CDATA["+acctSchemehdrMap.get("ls_acct_code__pr")+"]]></acct_code__pr>");
xmlBuff.append("<cctr_code__pr><![CDATA["+acctSchemehdrMap.get("ls_cctr_code__pr")+"]]></cctr_code__pr>"); acctCodePr=checknull(acctSchemehdrMap.get("ls_acct_code__pr"));
cctrCodePr=checknull(acctSchemehdrMap.get("ls_cctr_code__pr"));
if(acctCodePr.trim().length()>0)
{
xmlBuff.append("<acct_code__pr><![CDATA["+acctCodePr+"]]></acct_code__pr>");
}
if(cctrCodePr.trim().length()>0)
{
xmlBuff.append("<cctr_code__pr><![CDATA["+cctrCodePr+"]]></cctr_code__pr>");
}
xmlBuff.append("<comm_amt><![CDATA["+invDespMap.get("comm_amt")+"]]></comm_amt>"); xmlBuff.append("<comm_amt><![CDATA["+invDespMap.get("comm_amt")+"]]></comm_amt>");
xmlBuff.append("<tax_amt><![CDATA["+invDespMap.get("tax_amt")+"]]></tax_amt>"); xmlBuff.append("<tax_amt><![CDATA["+invDespMap.get("tax_amt")+"]]></tax_amt>");
// xmlBuff.append("<disc_amt><![CDATA[]]></disc_amt>"); //Get disc_amt from inv_det // xmlBuff.append("<disc_amt><![CDATA[]]></disc_amt>"); //Get disc_amt from inv_det
// xmlBuff.append("<inv_amt><![CDATA[]]></inv_amt>"); //Get inv_amt from inv_det // xmlBuff.append("<inv_amt><![CDATA[]]></inv_amt>"); //Get inv_amt from inv_det
xmlBuff.append("<disc_schem_billback_amt><![CDATA["+invDespMap.get("disc_schem_billback_amt")+"]]></disc_schem_billback_amt>"); xmlBuff.append("<disc_schem_billback_amt><![CDATA["+invDespMap.get("disc_schem_billback_amt")+"]]></disc_schem_billback_amt>");
xmlBuff.append("<disc_schem_offinv_amt><![CDATA["+invDespMap.get("disc_schem_offinv_amt")+"]]></disc_schem_offinv_amt>"); xmlBuff.append("<disc_schem_offinv_amt><![CDATA["+invDespMap.get("disc_schem_offinv_amt")+"]]></disc_schem_offinv_amt>");
// xmlBuff.append("<disc_offinv_amt_hdr><![CDATA[]]></disc_offinv_amt_hdr>"); // get by method gbf_calc_hdrdisc_amt() // xmlBuff.append("<disc_offinv_amt_hdr><![CDATA[]]></disc_offinv_amt_hdr>"); // get by method gbf_calc_hdrdisc_amt()
// xmlBuff.append("<disc_billback_amt_hdr><![CDATA[]]></disc_billback_amt_hdr>"); // get by method gbf_calc_hdrdisc_amt() // xmlBuff.append("<disc_billback_amt_hdr><![CDATA[]]></disc_billback_amt_hdr>"); // get by method gbf_calc_hdrdisc_amt()
lcCommAmtOc=Double.parseDouble(invDespMap.get("comm_amt"))/Double.parseDouble(ldsInvHdrMp.get("exch_rate")); lcCommAmtOc=Double.parseDouble(invDespMap.get("comm_amt"))/Double.parseDouble(ldsInvHdrMp.get("exch_rate"));
xmlBuff.append("<comm_amt__oc><![CDATA["+lcCommAmtOc+"]]></comm_amt__oc>"); xmlBuff.append("<comm_amt__oc><![CDATA["+lcCommAmtOc+"]]></comm_amt__oc>");
...@@ -535,8 +567,8 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -535,8 +567,8 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
for(String keyStr:mainInvDespDetMap.keySet()) for(String keyStr:mainInvDespDetMap.keySet())
{ {
System.out.println("Detail 2:::"); System.out.println("Detail 2:::");
// if(!keyStr.contains("@")) // if(!keyStr.contains("@"))
// { // {
/** /**
* Generating XML for * Generating XML for
* Invoice Trace * Invoice Trace
...@@ -583,8 +615,17 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -583,8 +615,17 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
xmlBuff.append("<lot_no><![CDATA["+invTraceDetMap.get("lot_no")+"]]></lot_no>"); xmlBuff.append("<lot_no><![CDATA["+invTraceDetMap.get("lot_no")+"]]></lot_no>");
xmlBuff.append("<lot_sl><![CDATA["+invTraceDetMap.get("lot_sl")+"]]></lot_sl>"); xmlBuff.append("<lot_sl><![CDATA["+invTraceDetMap.get("lot_sl")+"]]></lot_sl>");
xmlBuff.append("<site_code__mfg><![CDATA["+invTraceDetMap.get("site_code__mfg")+"]]></site_code__mfg>"); xmlBuff.append("<site_code__mfg><![CDATA["+invTraceDetMap.get("site_code__mfg")+"]]></site_code__mfg>");
xmlBuff.append("<mfg_date><![CDATA["+invTraceDetMap.get("mfg_date")+"]]></mfg_date>");
xmlBuff.append("<exp_date><![CDATA["+invTraceDetMap.get("exp_date")+"]]></exp_date>"); mfgDateStr = checknull(invTraceDetMap.get("mfg_date"));
if(mfgDateStr.trim().length()>0)
{
xmlBuff.append("<mfg_date><![CDATA["+mfgDateStr+"]]></mfg_date>");
}
expDateStr = checknull(invTraceDetMap.get("exp_date"));
if(expDateStr.trim().length()>0)
{
xmlBuff.append("<exp_date><![CDATA["+expDateStr+"]]></exp_date>");
}
xmlBuff.append("<exp_lev><![CDATA["+invTraceDetMap.get("exp_lev")+"]]></exp_lev>"); xmlBuff.append("<exp_lev><![CDATA["+invTraceDetMap.get("exp_lev")+"]]></exp_lev>");
xmlBuff.append("<fob_value><![CDATA[]]></fob_value>"); xmlBuff.append("<fob_value><![CDATA[]]></fob_value>");
xmlBuff.append("<rate__clg><![CDATA["+invTraceDetMap.get("rate__clg")+"]]></rate__clg>"); xmlBuff.append("<rate__clg><![CDATA["+invTraceDetMap.get("rate__clg")+"]]></rate__clg>");
...@@ -602,11 +643,11 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -602,11 +643,11 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
xmlBuff.append("<item_flg><![CDATA[I]]></item_flg>"); xmlBuff.append("<item_flg><![CDATA[I]]></item_flg>");
xmlBuff.append("</Detail2>"); xmlBuff.append("</Detail2>");
// } // }
// else // else
// { // {
// } // }
} // END of Detail [mainInvDespDetMap] for loop } // END of Detail [mainInvDespDetMap] for loop
...@@ -616,7 +657,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -616,7 +657,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
* Generating XML for * Generating XML for
* Invoice Det * Invoice Det
* */ * */
// invDetBeanMap=mainInvDespDetMap.get(keyStr); // invDetBeanMap=mainInvDespDetMap.get(keyStr);
invDetBeanMap=(HashMap<String, Object>) dataList.get(1); invDetBeanMap=(HashMap<String, Object>) dataList.get(1);
System.out.println("@@@@@@@@@@@ invDetBeanMap["+invDetBeanMap+"]"); System.out.println("@@@@@@@@@@@ invDetBeanMap["+invDetBeanMap+"]");
for(String keyStr:invDetBeanMap.keySet()) for(String keyStr:invDetBeanMap.keySet())
...@@ -695,7 +736,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -695,7 +736,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
if (retString.indexOf("Success") > -1) if (retString.indexOf("Success") > -1)
{ {
System.out.println("Master statefull SAVE success.."); System.out.println("Master statefull SAVE success..");
// conn.commit(); // conn.commit();
String[] arrayForTranIdIssue = retString.split("<TranID>"); String[] arrayForTranIdIssue = retString.split("<TranID>");
int endIndexIssue = arrayForTranIdIssue[1].indexOf("</TranID>"); int endIndexIssue = arrayForTranIdIssue[1].indexOf("</TranID>");
...@@ -708,11 +749,11 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -708,11 +749,11 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
* Call Credit check component * Call Credit check component
* PostOrdCreditChk.java * PostOrdCreditChk.java
* */ * */
// PostOrdCreditChk pCrdChk=new PostOrdCreditChk(); // PostOrdCreditChk pCrdChk=new PostOrdCreditChk();
//net amount is not exist in //net amount is not exist in
//invDespMap //invDespMap
// retString=pCrdChk.creditCheck(invDespMap.get("cust_code"),invDespMap.get("cust_code__bil"), invDespMap.get("item_ser"), "0.00",runOpt,//Net amount missing // retString=pCrdChk.creditCheck(invDespMap.get("cust_code"),invDespMap.get("cust_code__bil"), invDespMap.get("item_ser"), "0.00",runOpt,//Net amount missing
// invDespMap.get("sord_no"), ldsInvHdrMp.get("invoice__date"), invDespMap.get("desp_site_code"), "I", despId,conn); // invDespMap.get("sord_no"), ldsInvHdrMp.get("invoice__date"), invDespMap.get("desp_site_code"), "I", despId,conn);
/** /**
* Invoice Posting * Invoice Posting
...@@ -732,7 +773,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -732,7 +773,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
{ {
fos1.write(("Invoice fail for Dispatch id :- ["+despIdKey+"]\n END \r\n\n").getBytes()); fos1.write(("Invoice fail for Dispatch id :- ["+despIdKey+"]\n END \r\n\n").getBytes());
} }
// } // END of Header [mainInvDespMap] for loop // } // END of Header [mainInvDespMap] for loop
} catch (Exception e) } catch (Exception e)
{ {
...@@ -930,7 +971,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -930,7 +971,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
* @return HashMap<String, String> * @return HashMap<String, String>
* @throws ITMException * @throws ITMException
*/ */
// private HashMap<String, HashMap<String, String>> getInvDespatch(HashMap<String, String> ldsInvHdrMp,Connection conn) // private HashMap<String, HashMap<String, String>> getInvDespatch(HashMap<String, String> ldsInvHdrMp,Connection conn)
private HashMap<String, String> getInvDespatch(HashMap<String, String> ldsInvHdrMp,Connection conn) throws ITMException private HashMap<String, String> getInvDespatch(HashMap<String, String> ldsInvHdrMp,Connection conn) throws ITMException
{ {
// TODO Auto-generated method stub // TODO Auto-generated method stub
...@@ -989,15 +1030,15 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -989,15 +1030,15 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
+ " AND( sorder.order_type like (?) )" + " AND( sorder.order_type like (?) )"
+ " ORDER BY despatch.sord_no ASC,despatch.desp_id ASC"; + " ORDER BY despatch.sord_no ASC,despatch.desp_id ASC";
pstmt=conn.prepareStatement(invDespSql); pstmt=conn.prepareStatement(invDespSql);
// pstmt.setString(1, ldsInvHdrMp.get("desp_date__fr")); // pstmt.setString(1, ldsInvHdrMp.get("desp_date__fr"));
// pstmt.setString(2, ldsInvHdrMp.get("desp_date__to")); // pstmt.setString(2, ldsInvHdrMp.get("desp_date__to"));
// pstmt.setString(1, mFrDespDt); // pstmt.setString(1, mFrDespDt);
// pstmt.setString(2, mToDespDt); // pstmt.setString(2, mToDespDt);
// pstmt.setTimestamp(1, fromDateTimestamp);//changed by vishakha // pstmt.setTimestamp(1, fromDateTimestamp);//changed by vishakha
// pstmt.setTimestamp(2, fromDateTimestamp);//changed by vishakha // pstmt.setTimestamp(2, fromDateTimestamp);//changed by vishakha
pstmt.setString(1, ldsInvHdrMp.get("desp_id__fr")); pstmt.setString(1, ldsInvHdrMp.get("desp_id__fr"));
// pstmt.setString(4, ldsInvHdrMp.get("desp_id__to")); // pstmt.setString(4, ldsInvHdrMp.get("desp_id__to"));
pstmt.setString(2, ldsInvHdrMp.get("desp_id__fr")); pstmt.setString(2, ldsInvHdrMp.get("desp_id__fr"));
pstmt.setString(3, ldsInvHdrMp.get("cust_code__fr")); pstmt.setString(3, ldsInvHdrMp.get("cust_code__fr"));
pstmt.setString(4, ldsInvHdrMp.get("cust_code__to")); pstmt.setString(4, ldsInvHdrMp.get("cust_code__to"));
...@@ -1124,9 +1165,9 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -1124,9 +1165,9 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
System.out.println("MAP VALUES:::::::::::::::"+invDespMap); System.out.println("MAP VALUES:::::::::::::::"+invDespMap);
// mainInvDespMap.put(rs.getString("desp_id"), invDespMap); // mainInvDespMap.put(rs.getString("desp_id"), invDespMap);
// invDespMap=null; // invDespMap=null;
} }
pstmt.close(); pstmt.close();
pstmt=null; pstmt=null;
...@@ -1149,7 +1190,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -1149,7 +1190,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
throw new ITMException(e); throw new ITMException(e);
} }
// return mainInvDespMap; // return mainInvDespMap;
return invDespMap; return invDespMap;
} }
...@@ -1164,13 +1205,13 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -1164,13 +1205,13 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
* @return HashMap<String, String> * @return HashMap<String, String>
* @throws ITMException * @throws ITMException
*/ */
// private HashMap<String, HashMap<String, String>> getInvDespatchDet(String sordNo, String status,String despId,HashMap<String, String> ldsInvHdrMp, Connection conn) // private HashMap<String, HashMap<String, String>> getInvDespatchDet(String sordNo, String status,String despId,HashMap<String, String> ldsInvHdrMp, Connection conn)
private ArrayList<Object> getInvDespatchDet(String sordNo, String status,String despId,HashMap<String, String> ldsInvHdrMp, String despSiteCode, Connection conn) throws ITMException private ArrayList<Object> getInvDespatchDet(String sordNo, String status,String despId,HashMap<String, String> ldsInvHdrMp, String despSiteCode, Connection conn) throws ITMException
{ {
// TODO Auto-generated method stub // TODO Auto-generated method stub
// HashMap<String, String> invDespDetMap=null; // HashMap<String, String> invDespDetMap=null;
HashMap<String, String> invTraceMap=null; HashMap<String, String> invTraceMap=null;
// HashMap<String, HashMap<String, String>> mainInvDespDetMap=new HashMap<String, HashMap<String,String>>(); // HashMap<String, HashMap<String, String>> mainInvDespDetMap=new HashMap<String, HashMap<String,String>>();
HashMap<String, HashMap> mainInvDespDetMap=new HashMap<String, HashMap>(); HashMap<String, HashMap> mainInvDespDetMap=new HashMap<String, HashMap>();
HashMap<String, Object> invDetBeanMap= new HashMap<String, Object>(); HashMap<String, Object> invDetBeanMap= new HashMap<String, Object>();
HashMap<String, String> stockDetMap=new HashMap<String, String>(); HashMap<String, String> stockDetMap=new HashMap<String, String>();
...@@ -1330,10 +1371,10 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -1330,10 +1371,10 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
invTraceMap.put("exp_date",stockDetMap.get("ld_exp_date")); invTraceMap.put("exp_date",stockDetMap.get("ld_exp_date"));
//invTraceMap.put("exp_date",ldExpDtStr); //invTraceMap.put("exp_date",ldExpDtStr);
// lsCustitemRef=getlsCustitemRef(rs.getString("sord_no"),rs.getString("item_code"),conn); // lsCustitemRef=getlsCustitemRef(rs.getString("sord_no"),rs.getString("item_code"),conn);
// invDespDetMap.put("cust_item__ref", lsCustitemRef); // invDespDetMap.put("cust_item__ref", lsCustitemRef);
// mainInvDespDetMap.put(rs.getString("desp_id"), invDespDetMap); // mainInvDespDetMap.put(rs.getString("desp_id"), invDespDetMap);
System.out.println("@@@@@@@@@@@@@@@@@ invTraceMap["+invTraceMap+"]"); System.out.println("@@@@@@@@@@@@@@@@@ invTraceMap["+invTraceMap+"]");
mainInvDespDetMap.put(rs.getString("line_no"), invTraceMap); mainInvDespDetMap.put(rs.getString("line_no"), invTraceMap);
...@@ -1365,7 +1406,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -1365,7 +1406,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
invoiceDetBean.setLot_no(checknull(lot_no)); invoiceDetBean.setLot_no(checknull(lot_no));
invoiceDetBean.setLot_sl(checknull(lot_sl)); invoiceDetBean.setLot_sl(checknull(lot_sl));
invoiceDetBean.setQuantity__ord(checknull(quantity__ord)); invoiceDetBean.setQuantity__ord(checknull(quantity__ord));
// invDespDetMap.put("quantity", checknull(rs.getString("quantity"))); // invDespDetMap.put("quantity", checknull(rs.getString("quantity")));
invoiceDetBean.setLoc_code(checknull(loc_code)); invoiceDetBean.setLoc_code(checknull(loc_code));
invoiceDetBean.setStatus(checknull(status)); invoiceDetBean.setStatus(checknull(status));
invoiceDetBean.setDesp_conv__qty_stduom(checknull(desp_quantity__stduom)); invoiceDetBean.setDesp_conv__qty_stduom(checknull(desp_quantity__stduom));
...@@ -1380,13 +1421,13 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -1380,13 +1421,13 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
invoiceDetBean.setSord_conv__qty_stduom(checknull(sord_conv__qty_stduom)); invoiceDetBean.setSord_conv__qty_stduom(checknull(sord_conv__qty_stduom));
invoiceDetBean.setConv__rtuom_stduom(checknull(conv__rtuom_stduom)); invoiceDetBean.setConv__rtuom_stduom(checknull(conv__rtuom_stduom));
invoiceDetBean.setSord_unit__std(checknull(sord_unit__std)); invoiceDetBean.setSord_unit__std(checknull(sord_unit__std));
// invDespDetMap.put("sord_quantity__stduom", checknull(rs.getString("quantity__stduom"))); // invDespDetMap.put("sord_quantity__stduom", checknull(rs.getString("quantity__stduom")));
invoiceDetBean.setSord_rate__stduom(checknull(sord_rate__stduom)); invoiceDetBean.setSord_rate__stduom(checknull(sord_rate__stduom));
invoiceDetBean.setRate(checknull(rate)); invoiceDetBean.setRate(checknull(rate));
// invDespDetMap.put("quantity_real", checknull(rs.getString("quantity_real"))); // invDespDetMap.put("quantity_real", checknull(rs.getString("quantity_real")));
invoiceDetBean.setQuantity_inv(checknull(quantity_inv)); invoiceDetBean.setQuantity_inv(checknull(quantity_inv));
invoiceDetBean.setInvoice_id(checknull(invoice_id)); invoiceDetBean.setInvoice_id(checknull(invoice_id));
// invDespDetMap.put("no_art", checknull(rs.getString("no_art"))); // invDespDetMap.put("no_art", checknull(rs.getString("no_art")));
invoiceDetBean.setRate__clg(checknull(rate__clg)); invoiceDetBean.setRate__clg(checknull(rate__clg));
invoiceDetBean.setDesp_rate__stduom(checknull(desp_rate__stduom)); invoiceDetBean.setDesp_rate__stduom(checknull(desp_rate__stduom));
invoiceDetBean.setDisc_amt(checknull(disc_amt)); invoiceDetBean.setDisc_amt(checknull(disc_amt));
...@@ -1423,7 +1464,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -1423,7 +1464,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
// mainInvDespDetMap.put(beanMapKey, invDetBeanMap); // mainInvDespDetMap.put(beanMapKey, invDetBeanMap);
pstmt.close(); pstmt.close();
pstmt=null; pstmt=null;
rs.close(); rs.close();
...@@ -1446,7 +1487,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -1446,7 +1487,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
throw new ITMException(e); throw new ITMException(e);
} }
// return mainInvDespDetMap; // return mainInvDespDetMap;
return mainArrayList; return mainArrayList;
} }
...@@ -1456,7 +1497,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -1456,7 +1497,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
String sql=""; String sql="";
PreparedStatement pstmt=null; PreparedStatement pstmt=null;
ResultSet rs=null; ResultSet rs=null;
String ld_mfg_date="",ld_exp_date="";
// TODO Auto-generated method stub // TODO Auto-generated method stub
try try
{ {
...@@ -1473,12 +1514,18 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -1473,12 +1514,18 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
{ {
//stockMap.put("ls_site_code__mfg", checknull(rs.getString("site_code__mfg"))); //stockMap.put("ls_site_code__mfg", checknull(rs.getString("site_code__mfg")));
//String ld_mfg_date = rs.getString("mfg_date"); //String ld_mfg_date = rs.getString("mfg_date");
ld_mfg_date=rs.getString("mfg_date");
String ld_mfg_date=genericUtility.getValidDateString(rs.getString("mfg_date"), genericUtility.getDBDateFormat(), ld_exp_date=rs.getString("exp_date");
if(ld_mfg_date!=null)
{
ld_mfg_date=genericUtility.getValidDateString(rs.getString("mfg_date"), genericUtility.getDBDateFormat(),
genericUtility.getApplDateFormat()); genericUtility.getApplDateFormat());
}
String ld_exp_date=genericUtility.getValidDateString(rs.getString("exp_date"), genericUtility.getDBDateFormat(), if(ld_exp_date!=null)
{
ld_exp_date=genericUtility.getValidDateString(rs.getString("exp_date"), genericUtility.getDBDateFormat(),
genericUtility.getApplDateFormat()); genericUtility.getApplDateFormat());
}
//Timestamp ld_exp_date = rs.getTimestamp("exp_date"); //Timestamp ld_exp_date = rs.getTimestamp("exp_date");
System.out.println("@@@@@@@@@ ld_mfg_date["+ld_mfg_date+"]ld_exp_date["+ld_exp_date+"]"); System.out.println("@@@@@@@@@ ld_mfg_date["+ld_mfg_date+"]ld_exp_date["+ld_exp_date+"]");
......
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