Skip to content

B
business-java
Commit 569f9869 authored by manohar's avatar manohar
Browse files
Options

Optimization of code 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@104114 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 4439adbb
Hide whitespace changes
Inline Side-by-side
Showing with 114 additions and 34 deletions
webitm-dis/ibase/webitm/ejb/dis/PostOrdDespatchGen.java
View file @ 569f9869
...@@ -1616,6 +1616,9 @@ public class PostOrdDespatchGen ...@@ -1616,6 +1616,9 @@ public class PostOrdDespatchGen
lineNum++; lineNum++;
//System.out.println("lineNum======"+lineNum); //System.out.println("lineNum======"+lineNum);
String lineNumber=String.valueOf(lineNum); String lineNumber=String.valueOf(lineNum);
lineNumber = " " + lineNumber;
lineNumber = lineNumber.substring(lineNumber.length() - 3,lineNumber.length());
//System.out.println("lineNumber======"+lineNumber); //System.out.println("lineNumber======"+lineNumber);
sordDetMap=new HashMap(); sordDetMap=new HashMap();
sordDetMap=(HashMap) sordDetList.get(sordCtr); sordDetMap=(HashMap) sordDetList.get(sordCtr);
...@@ -1647,6 +1650,7 @@ public class PostOrdDespatchGen ...@@ -1647,6 +1650,7 @@ public class PostOrdDespatchGen
"values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; "values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
pstmtdDet = conn.prepareStatement(sql); pstmtdDet = conn.prepareStatement(sql);
pstmtdDet.setString(1,tranId); pstmtdDet.setString(1,tranId);
pstmtdDet.setString(2,lineNumber);// pstmtdDet.setString(2,lineNumber);//
//pstmt.setString(2,sordDetMap.get("line_no").toString());// //pstmt.setString(2,sordDetMap.get("line_no").toString());//
pstmtdDet.setString(3,checkNull(sordDetMap.get("sord_no").toString())); pstmtdDet.setString(3,checkNull(sordDetMap.get("sord_no").toString()));
......
webitm-dis/ibase/webitm/ejb/dis/PostOrdInvoiceGen.java
View file @ 569f9869
...@@ -92,7 +92,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -92,7 +92,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
startDate = new java.util.Date(System.currentTimeMillis()); startDate = new java.util.Date(System.currentTimeMillis());
calendar.setTime(new java.sql.Timestamp(System.currentTimeMillis())); calendar.setTime(new java.sql.Timestamp(System.currentTimeMillis()));
startDateStr = sdf1.format(startDate)+" "+calendar.get(Calendar.HOUR)+":"+calendar.get(Calendar.MINUTE)+":"+calendar.get(Calendar.SECOND); startDateStr = sdf1.format(startDate)+" "+calendar.get(Calendar.HOUR)+":"+calendar.get(Calendar.MINUTE)+":"+calendar.get(Calendar.SECOND);
fos1.write(("Invoice Genertion Started At " + startDateStr +"\r\n").getBytes()); //fos1.write(("Invoice Genertion Started At " + startDateStr +"\r\n").getBytes());
//System.out.println("postUpto::::::::::::::::::::::"+postUpto); //System.out.println("postUpto::::::::::::::::::::::"+postUpto);
/** /**
* Check postUpto is not 'D' * Check postUpto is not 'D'
...@@ -284,7 +284,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -284,7 +284,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
long endTime2 = System.currentTimeMillis(); long endTime2 = System.currentTimeMillis();
System.out.println("DIFFERANCE IN TIME Creating INVoice IN SECONDS INSIDE POST ORDER ACTIVITY:::["+(endTime2-startTime2)/1000+"]"); System.out.println("DIFFERANCE IN TIME Creating INVoice IN SECONDS INSIDE POST ORDER ACTIVITY:::["+(endTime2-startTime2)/1000+"]");
//Changed By Nasruddin END 04-11-16 //Changed By Nasruddin END 04-11-16
fos1.write(("\n \n Final Return String :- [" + retString +"]\r\n").getBytes()); //fos1.write(("\n \n Final Return String :- [" + retString +"]\r\n").getBytes());
} }
...@@ -363,7 +363,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -363,7 +363,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
String loginEmpCode = null,itemDescr=""; String loginEmpCode = null,itemDescr="";
String lc_ratestd="0",lc_cstrate="0"; String lc_ratestd="0",lc_cstrate="0";
String round="",roundInvTo=""; String round="",roundInvTo="", discAmtStr = "";
double roundTo=0.0,netamt=0.0; double roundTo=0.0,netamt=0.0;
double lc_disc_amt=0.00,ld_discount=0.00; double lc_disc_amt=0.00,ld_discount=0.00;
double totalCommSp1=0.0,totalCommSp2=0.0,totalCommSp3=0.0,totalCommAmt=0.0; double totalCommSp1=0.0,totalCommSp2=0.0,totalCommSp3=0.0,totalCommAmt=0.0;
...@@ -420,7 +420,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -420,7 +420,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
// 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());
/** /**
* get dispat_det main map * get dispat_det main map
...@@ -736,6 +736,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -736,6 +736,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
* from despatchdet * from despatchdet
* *
* */ * */
/*
sql="select (case when rate__std is null then 0 else rate__std end ) as lc_ratestd," sql="select (case when rate__std is null then 0 else rate__std end ) as lc_ratestd,"
+ "(case when cost_rate is null then 0 else cost_rate end )as lc_cstrate, disc_amt " + "(case when cost_rate is null then 0 else cost_rate end )as lc_cstrate, disc_amt "
+ " from despatchdet " + " from despatchdet "
...@@ -757,11 +758,16 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -757,11 +758,16 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
pstmt=null; pstmt=null;
rs.close(); rs.close();
rs=null; rs=null;
*/
discAmtStr = invTraceDetMap.get("disc_amt");
if (discAmtStr == null || "null".equals(discAmtStr) || discAmtStr.trim().length() == 0)
{
discAmtStr = "0";
}
lc_disc_amt = Double.parseDouble(discAmtStr);
xmlBuff.append("<rate__stk><![CDATA[]]></rate__stk>"); xmlBuff.append("<rate__stk><![CDATA[]]></rate__stk>");
xmlBuff.append("<rate__std><![CDATA["+lc_ratestd+"]]></rate__std>"); xmlBuff.append("<rate__std><![CDATA["+invDespMap.get("rate__std")+"]]></rate__std>");
xmlBuff.append("<cost_rate><![CDATA["+lc_cstrate+"]]></cost_rate>"); xmlBuff.append("<cost_rate><![CDATA["+invDespMap.get("cost_rate")+"]]></cost_rate>");
/** /**
...@@ -828,7 +834,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -828,7 +834,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
invoiceDetBean=(InvoiceDetBean) invDetBeanMap.get(keyStr); invoiceDetBean=(InvoiceDetBean) invDetBeanMap.get(keyStr);
sql="select descr from item where item_code = ?"; /*sql="select descr from item where item_code = ?";
pstmt2= conn.prepareStatement(sql); pstmt2= conn.prepareStatement(sql);
pstmt2.setString(1, invoiceDetBean.getItem_code() ); pstmt2.setString(1, invoiceDetBean.getItem_code() );
rs2=pstmt2.executeQuery(); rs2=pstmt2.executeQuery();
...@@ -840,6 +846,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -840,6 +846,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
rs2 = null; rs2 = null;
pstmt2.close(); pstmt2.close();
pstmt2 = null; pstmt2 = null;
*/
/*String lineStr=String.valueOf(lineNoDet); /*String lineStr=String.valueOf(lineNoDet);
lineStr=" "+lineStr; lineStr=" "+lineStr;
...@@ -925,7 +932,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -925,7 +932,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
retString = saveData(loginSite, xmlInvString, xtraParams, conn); retString = saveData(loginSite, xmlInvString, xtraParams, conn);
// System.out.println("Return string after save data :- ["+retString+"]"); // System.out.println("Return string after save data :- ["+retString+"]");
fos1.write(("Return String after save data is :- [" + retString +"]\r\n").getBytes()); //fos1.write(("Return String after save data is :- [" + retString +"]\r\n").getBytes());
/** /**
* Check Save return string * Check Save return string
...@@ -978,7 +985,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -978,7 +985,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
taxAmt=0; taxAmt=0;
commAmt=0; commAmt=0;
discAmt=0; discAmt=0;
fos1.write(("Invoice successful for Dispatch id :- ["+despIdKey+"] TranId generated is:- [" + tranId +"]\n END \r\n\n").getBytes()); //fos1.write(("Invoice successful for Dispatch id :- ["+despIdKey+"] TranId generated is:- [" + tranId +"]\n END \r\n\n").getBytes());
/** /**
* Update invoice_trace * Update invoice_trace
...@@ -993,7 +1000,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -993,7 +1000,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
String sordNo="",soLineNo="",taxClass="",taxChap="",taxEnv=""; String sordNo="",soLineNo="",taxClass="",taxChap="",taxEnv="";
//double taxAmt=0,netAmt=0; //double taxAmt=0,netAmt=0;
double totTaxAmt=0,totNetAmt=0; double totTaxAmt=0,totNetAmt=0;
fos1.write(("Invoice successful for Dispatch id :- ["+despIdKey+"] TranId generated is:- [" + tranId +"]\n END \r\n\n").getBytes()); //fos1.write(("Invoice successful for Dispatch id :- ["+despIdKey+"] TranId generated is:- [" + tranId +"]\n END \r\n\n").getBytes());
/*pstmt=conn.prepareStatement("update invoice_trace set net_amt=(quantity__stduom*rate__stduom) where invoice_id=? "); /*pstmt=conn.prepareStatement("update invoice_trace set net_amt=(quantity__stduom*rate__stduom) where invoice_id=? ");
pstmt.setString(1, tranId); pstmt.setString(1, tranId);
...@@ -1150,7 +1157,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -1150,7 +1157,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
} }
else else
{ {
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
...@@ -1602,10 +1609,10 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -1602,10 +1609,10 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
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>();
String invDespDetSql="",mFrDespDt="",mToDespDt="",lsAcctSchemedet="",lsFinscheme="",lsCustitemRef="",mfgDtStr="",ldExpDtStr=""; String invDespDetSql="",mFrDespDt="",mToDespDt="",lsAcctSchemedet="",lsFinscheme="",lsCustitemRef="",mfgDtStr="",ldExpDtStr="",ld_mfg_date = "",ld_exp_date = "";
double lcDiscAmt=0.0,mTotDespQty=0.0,mTotStdQty=0.0,mRealQty=0.0; double lcDiscAmt=0.0,mTotDespQty=0.0,mTotStdQty=0.0,mRealQty=0.0;
int mNoArt=0; int mNoArt=0,schemeCount=0,finSchemeCount = 0;
String desp_id="",line_no="",sord_no="",line_no__sord="",exp_lev="",item_code__ord="",item_code="",lot_no="",lot_sl="",quantity__ord=""; String desp_id="",line_no="",sord_no="", preSordNo = "",line_no__sord="",exp_lev="",item_code__ord="",item_code="",lot_no="",lot_sl="",quantity__ord="";
String quantity="",loc_code="",desp_conv__qty_stduom="",desp_unit__std="",unit="",desp_quantity__stduom="",tax_class="",tax_chap="",tax_env=""; String quantity="",loc_code="",desp_conv__qty_stduom="",desp_unit__std="",unit="",desp_quantity__stduom="",tax_class="",tax_chap="",tax_env="";
String discount="",unit__rate="",sord_conv__qty_stduom="",conv__rtuom_stduom="",sord_unit__std="",sord_quantity__stduom="",sord_rate__stduom=""; String discount="",unit__rate="",sord_conv__qty_stduom="",conv__rtuom_stduom="",sord_unit__std="",sord_quantity__stduom="",sord_rate__stduom="";
String rate="",quantity_real="",quantity_inv="",invoice_id="",no_art="",rate__clg="",desp_rate__stduom="",disc_amt="",cust_item__ref=""; String rate="",quantity_real="",quantity_inv="",invoice_id="",no_art="",rate__clg="",desp_rate__stduom="",disc_amt="",cust_item__ref="";
...@@ -1630,10 +1637,21 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -1630,10 +1637,21 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
+ "sorddet.discount,sorddet.unit__rate,sorddet.conv__qty_stduom,sorddet.conv__rtuom_stduom,sorddet.unit__std," + "sorddet.discount,sorddet.unit__rate,sorddet.conv__qty_stduom,sorddet.conv__rtuom_stduom,sorddet.unit__std,"
+ "sorddet.quantity__stduom as squantity__stduom,sorddet.rate__stduom as srate__stduom,sorddet.rate,despatchdet.quantity_real,despatchdet.quantity_inv," + "sorddet.quantity__stduom as squantity__stduom,sorddet.rate__stduom as srate__stduom,sorddet.rate,despatchdet.quantity_real,despatchdet.quantity_inv,"
+ "despatchdet.invoice_id,despatchdet.no_art,despatchdet.rate__clg,despatchdet.rate__stduom as drate__stduom ,despatchdet.disc_amt," + "despatchdet.invoice_id,despatchdet.no_art,despatchdet.rate__clg,despatchdet.rate__stduom as drate__stduom ,despatchdet.disc_amt,"
+ "despatchdet.cust_item__ref,despatchdet.disc_schem_billback_amt,despatchdet.disc_schem_offinv_amt" + "despatchdet.cust_item__ref,despatchdet.disc_schem_billback_amt,despatchdet.disc_schem_offinv_amt, sorditem.nature, "
+ " FROM despatchdet,sorddet" + " (case when despatchdet.rate__std is null then 0 else despatchdet.rate__std end ) as rate__std,"
+ " (case when despatchdet.cost_rate is null then 0 else despatchdet.cost_rate end ) as cost_rate, sorddet.ITEM_DESCR, "
+ " stock.site_code__mfg, stock.mfg_date, stock.exp_date "
+ " FROM despatchdet,sorddet, sorditem, stock "
+ " WHERE ( despatchdet.sord_no = sorddet.sale_order )" + " WHERE ( despatchdet.sord_no = sorddet.sale_order )"
+ " and( despatchdet.line_no__sord = sorddet.line_no )" + " and( despatchdet.line_no__sord = sorddet.line_no )"
+ " and( sorditem.sale_order = sorddet.sale_order )"
+ " and( sorditem.line_no = sorddet.line_no )"
+ " and( sorditem.exp_lev = despatchdet.exp_lev )"
+ " and stock.item_code = despatchdet.item_code "
+ " and stock.site_code = sorditem.site_code "
+ " and stock.loc_code = despatchdet.loc_code "
+ " and stock.lot_no = despatchdet.lot_no "
+ " and stock.lot_sl = despatchdet.lot_sl "
+ " and( ( case when DESPATCHDET.STATUS is null then ' ' else despatchdet.STATUS end = ? )" + " and( ( case when DESPATCHDET.STATUS is null then ' ' else despatchdet.STATUS end = ? )"
//+ " AND( DESPATCHDET.SORD_NO = ?)" //+ " AND( DESPATCHDET.SORD_NO = ?)"
+ " AND( DESPATCHDET.DESP_ID >= ?)" + " AND( DESPATCHDET.DESP_ID >= ?)"
...@@ -1695,7 +1713,34 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -1695,7 +1713,34 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
cust_item__ref=checknull(rs.getString("cust_item__ref")); cust_item__ref=checknull(rs.getString("cust_item__ref"));
disc_schem_billback_amt=checknull(rs.getString("disc_schem_billback_amt")); disc_schem_billback_amt=checknull(rs.getString("disc_schem_billback_amt"));
disc_schem_offinv_amt=checknull(rs.getString("disc_schem_offinv_amt")); disc_schem_offinv_amt=checknull(rs.getString("disc_schem_offinv_amt"));
lsLineType=checknull(rs.getString("nature"));
ld_mfg_date=rs.getString("mfg_date");
ld_exp_date=rs.getString("exp_date");
invTraceMap.put("rate__std", rs.getString("rate__std"));
invTraceMap.put("cost_rate", rs.getString("cost_rate"));
invTraceMap.put("disc_amt", rs.getString("disc_amt"));
invTraceMap.put("item_descr", rs.getString("item_descr"));
if(ld_mfg_date!=null)
{
ld_mfg_date=genericUtility.getValidDateString(rs.getString("mfg_date"), genericUtility.getDBDateFormat(), genericUtility.getApplDateFormat());
}
if(ld_exp_date!=null)
{
ld_exp_date=genericUtility.getValidDateString(rs.getString("exp_date"), genericUtility.getDBDateFormat(), genericUtility.getApplDateFormat());
}
//Timestamp ld_exp_date = rs.getTimestamp("exp_date");
//System.out.println("@@@@@@@@@ ld_mfg_date["+ld_mfg_date+"]ld_exp_date["+ld_exp_date+"]");
stockDetMap=new HashMap<String, String>();
stockDetMap.put("ls_site_code__mfg", checknull(rs.getString("site_code__mfg")));
stockDetMap.put("ld_mfg_date", ld_mfg_date);
stockDetMap.put("ld_exp_date", ld_exp_date);
if(disc_schem_offinv_amt == null || disc_schem_offinv_amt.trim().length()==0) if(disc_schem_offinv_amt == null || disc_schem_offinv_amt.trim().length()==0)
{ {
disc_schem_offinv_amt="0"; disc_schem_offinv_amt="0";
...@@ -1742,7 +1787,11 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -1742,7 +1787,11 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
/*System.out.println("Detal map Size::::::::::::::"+invTraceMap.size()); /*System.out.println("Detal map Size::::::::::::::"+invTraceMap.size());
System.out.println("Map Values :::::::::::::::::::"+invTraceMap);*/ System.out.println("Map Values :::::::::::::::::::"+invTraceMap);*/
if (!preSordNo.trim().equals(sord_no.trim()))
{
totAmount = 0;
schemeCount = 0;
finSchemeCount = 0;
sql="select sum(quantity * rate) as amount from sorddet where sale_order = ? "; sql="select sum(quantity * rate) as amount from sorddet where sale_order = ? ";
pstmt1=conn.prepareStatement(sql); pstmt1=conn.prepareStatement(sql);
pstmt1.setString(1, sord_no); pstmt1.setString(1, sord_no);
...@@ -1755,24 +1804,42 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -1755,24 +1804,42 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
rs1 = null; rs1 = null;
pstmt1.close(); pstmt1.close();
pstmt1 = null; pstmt1 = null;
if (totAmount > 0)
sql="select count(1) as schemeCount from sorderdet_scheme where tran_id = ? ";
pstmt1=conn.prepareStatement(sql);
pstmt1.setString(1, sord_no);
rs1=pstmt1.executeQuery();
if(rs1.next())
{ {
schemeCount = rs1.getInt("schemeCount");
CalcSchemeAmt calcSchemeAmt=new CalcSchemeAmt();
calcSchemeAmt.updateAmt(sord_no, conn);
} }
rs1.close();
rs1 = null;
pstmt1.close();
pstmt1 = null;
lsFinscheme=getLsFinscheme(rs.getString("sord_no"),conn);
invTraceMap.put("fin_scheme", lsFinscheme);
preSordNo = sord_no;
}
if (totAmount > 0)
{
lsAcctSchemedet=getLsAcctSchemedet(rs.getString("sord_no"),rs.getString("line_no__sord"),conn); CalcSchemeAmt calcSchemeAmt=new CalcSchemeAmt();
invTraceMap.put("acc_code__item", lsAcctSchemedet); calcSchemeAmt.updateAmt(sord_no, conn);
}
lsFinscheme=getLsFinscheme(rs.getString("sord_no"),conn); if (schemeCount >0)
invTraceMap.put("fin_scheme", lsFinscheme); {
lsAcctSchemedet=getLsAcctSchemedet(rs.getString("sord_no"),rs.getString("line_no__sord"),conn);
lsLineType=getLineType(rs.getString("sord_no"),rs.getString("line_no__sord"),rs.getString("exp_lev"),conn); invTraceMap.put("acc_code__item", lsAcctSchemedet);
}
//lsLineType=getLineType(rs.getString("sord_no"),rs.getString("line_no__sord"),rs.getString("exp_lev"),conn);
invTraceMap.put("line_type",lsLineType); invTraceMap.put("line_type",lsLineType);
stockDetMap=getStockDetail(rs.getString("item_code"),despSiteCode,rs.getString("loc_code"),rs.getString("lot_no"), //stockDetMap=getStockDetail(rs.getString("item_code"),despSiteCode,rs.getString("loc_code"),rs.getString("lot_no"),rs.getString("lot_sl"),conn);
rs.getString("lot_sl"),conn);
// System.out.println("@@@@@@@@stockDetMap["+stockDetMap+"]"); // System.out.println("@@@@@@@@stockDetMap["+stockDetMap+"]");
invTraceMap.put("site_code__mfg",stockDetMap.get("ls_site_code__mfg")); invTraceMap.put("site_code__mfg",stockDetMap.get("ls_site_code__mfg"));
...@@ -1880,7 +1947,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -1880,7 +1947,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
invoiceDetBean.setSp2Comm(commissionMap.get("sp2Comm").toString());//Start Added by chandrashekar on 01-09-2016 invoiceDetBean.setSp2Comm(commissionMap.get("sp2Comm").toString());//Start Added by chandrashekar on 01-09-2016
invoiceDetBean.setSp3Comm(commissionMap.get("sp3Comm").toString());//Start Added by chandrashekar on 01-09-2016 invoiceDetBean.setSp3Comm(commissionMap.get("sp3Comm").toString());//Start Added by chandrashekar on 01-09-2016
invoiceDetBean.setNetComm(commissionMap.get("netComm").toString());//Start Added by chandrashekar on 01-09-2016 invoiceDetBean.setNetComm(commissionMap.get("netComm").toString());//Start Added by chandrashekar on 01-09-2016
invoiceDetBean.setItemDescr(invTraceMap.get("item_descr"));
invDetBeanMap.put(beanMapKey, invoiceDetBean); invDetBeanMap.put(beanMapKey, invoiceDetBean);
//System.out.println("@@@@@1634 invoiceDetBean added into invDetBeanMap........"); //System.out.println("@@@@@1634 invoiceDetBean added into invDetBeanMap........");
} }
...@@ -2078,7 +2145,16 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -2078,7 +2145,16 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
private String sp2Comm; private String sp2Comm;
private String sp3Comm; private String sp3Comm;
private String netComm; private String netComm;
private String itemDescr;
public String getItemDescr()
{
return itemDescr;
}
public void setItemDescr(String itemDescr)
{
this.itemDescr = itemDescr;
}
public String getNetComm() public String getNetComm()
{ {
return netComm; return netComm;
...@@ -2864,7 +2940,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -2864,7 +2940,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
startDate = new java.util.Date(System.currentTimeMillis()); startDate = new java.util.Date(System.currentTimeMillis());
calendar.setTime(new java.sql.Timestamp(System.currentTimeMillis())); calendar.setTime(new java.sql.Timestamp(System.currentTimeMillis()));
startDateStr = sdf1.format(startDate)+" "+calendar.get(Calendar.HOUR)+":"+calendar.get(Calendar.MINUTE)+":"+calendar.get(Calendar.SECOND); startDateStr = sdf1.format(startDate)+" "+calendar.get(Calendar.HOUR)+":"+calendar.get(Calendar.MINUTE)+":"+calendar.get(Calendar.SECOND);
fos1.write(("Fetching Records Started At " + startDateStr +"\r\n").getBytes()); //fos1.write(("Fetching Records Started At " + startDateStr +"\r\n").getBytes());
} }
catch(Exception e) catch(Exception e)
......
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