Skip to content

B
business-java
Commit 35b3b581 authored by pgole's avatar pgole
Browse files
Options

Updated EJB 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@103572 ce508802-f39f-4f6c-b175-0d175dae99d5
parent aaf86567
Show whitespace changes
Inline Side-by-side
Showing with 532 additions and 503 deletions
webitm-dis/ibase/webitm/ejb/dis/adv/CustStockOrder.java
View file @ 35b3b581
/********************************************************
Title : CustStockOrder[D15ESUN013]
Title : CustStockOrder[D16EBAS009]
Date : 27/08/16
********************************************************/
package ibase.webitm.ejb.dis.adv;
......@@ -213,7 +213,6 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
pstmt = null;
}
if (errString.contains("VTORDSUCC"))
{
conn.commit();
......@@ -245,7 +244,7 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
prevScheme= "" ,itemStru = "" , sqlNew = "" , mitCode = "",mitFlg = "" ,sqlin = "" ,sqlinner = "" , mslabOn = "",packCode = "",plistDisc = "",
mpriceList= "",listType = "",mstanCode = "",typeTaxclass = "",mstanCodeSite = "",mtaxClass = "",mtaxChap = "",mtaxEnv = "",itemserProm = "" ,
mgenTrans = "",morderDtDtr = "",msetLine = "" ,oldInvoiceItemSer = "" , InvoiceItemSer= "" ,locType = "" , itemSerDesc = "",lineNoo = "",
remarks = "" ,termId = "" ,crTerm = "" ,cctrcodeSal = "" , xmlString = "",tempSplitCode = "",splitCode = "",oldLocType = "" ;// = "", = "" , = "", = "" , = "";
remarks = "" ,termId = "" ,crTerm = "" ,cctrcodeSal = "" , xmlString = "",tempSplitCode = "",splitCode = "";
String[] acctcodeSal= null;
HashMap splitCodeWiseMap = new HashMap(), tempMap = null;
......@@ -264,18 +263,14 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
String invoiceItemSerArr[]= null ;
Date mrestUpto = null ;
//Date schdt[] = new Date[6];
//Date tschdt[] = new Date[20];
ArrayList tschdtList = new ArrayList(6);
ArrayList schdtList = new ArrayList(6);
ArrayList<Double> schpercList = new ArrayList<Double>(6);
ArrayList tschpercList = new ArrayList(6);
ArrayList tschdtList = new ArrayList();
ArrayList schdtList = new ArrayList();
ArrayList<Double> schpercList = new ArrayList<Double>();
ArrayList tschpercList = new ArrayList();
Date dateNew = null;
int cnt1 = 0 ,mcount1 = 0 ,llCnt =0 ,llSchcnt = 0 ,llCount = 0 , k =0 ,updCnt1 = 0 , updCnt = 0,cnt = 0 ;
//double schperc[] = new double[6] ;
//double tschperc[] = new double[20] ;
double mminQty = 0.0 ,msales = 0.0 ,mclStock = 0.0 ,integralQty = 0.0 ,mintQty = 0.0 ,mmodqty = 0.0,
perc = 0.0 , qtyPerc = 0.0 ,lcQty = 0.0 ,batchQty = 0.0 ,discMerge = 0.0 ,lcPlistDisc = 0.0 ,mrate = 0.0 ,sorate = 0.0 ,
exchRate = 0.0,mrateClg = 0.0,mtotOrdAmt = 0.0,mtotTaxAmt = 0.0,mtotNetAmt = 0.0,lcOrderStock = 0.0 ,minOrderQty = 0.0,demandQty= 0.0,
......@@ -532,6 +527,20 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
rs.close();rs = null;
pstmt.close();pstmt = null;
if(priceListClg == null || priceListClg.trim().length() == 0)
{
sql = "select price_list__clg from customer where cust_code = ? " ;
pstmt = conn.prepareStatement(sql);
pstmt.setString( 1, custCode );
rs = pstmt.executeQuery();
if(rs.next())
{
priceListClg = checkNull(rs.getString("price_list__clg"));
}
rs.close();rs = null;
pstmt.close();pstmt = null;
}
if(priceListClg == null || priceListClg.trim().length() == 0)
{
priceListClg = distCommon.getDisparams("999999", "PRICE_LIST__CLG", conn);
......@@ -558,12 +567,12 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
schdtList.add( rs.getDate("sch_date__5"));
schdtList.add( rs.getDate("sch_date__6"));
schdtList.set(0,rs.getDate("sch_date__1"));
/*schdtList.set(0,rs.getDate("sch_date__1"));
schdtList.set(1,rs.getDate("sch_date__2"));
schdtList.set(2,rs.getDate("sch_date__3"));
schdtList.set(3,rs.getDate("sch_date__4"));
schdtList.set(4,rs.getDate("sch_date__5"));
schdtList.set(5,rs.getDate("sch_date__6"));
schdtList.set(5,rs.getDate("sch_date__6"));*/
schpercList.add( rs.getDouble("sch_perc__1"));
schpercList.add( rs.getDouble("sch_perc__2"));
......@@ -572,26 +581,14 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
schpercList.add( rs.getDouble("sch_perc__5"));
schpercList.add( rs.getDouble("sch_perc__6"));
schpercList.set(0, rs.getDouble("sch_perc__1"));
/*schpercList.set(0, rs.getDouble("sch_perc__1"));
schpercList.set(1, rs.getDouble("sch_perc__2"));
schpercList.set(2, rs.getDouble("sch_perc__3"));
schpercList.set(3, rs.getDouble("sch_perc__4"));
schpercList.set(4, rs.getDouble("sch_perc__5"));
schpercList.set(5, rs.getDouble("sch_perc__6"));
schpercList.set(5, rs.getDouble("sch_perc__6"));*/
/*schdt[1] = rs.getDate("sch_date__2");
schdt[2] = rs.getDate("sch_date__3");
schdt[3] = rs.getDate("sch_date__4");
schdt[4] = rs.getDate("sch_date__5");
schdt[5] = rs.getDate("sch_date__6");
schperc[0] = rs.getDouble("sch_perc__1");
schperc[1] = rs.getDouble("sch_perc__2");
schperc[2] = rs.getDouble("sch_perc__3");
schperc[3] = rs.getDouble("sch_perc__4");
schperc[4] = rs.getDouble("sch_perc__5");
schperc[5] = rs.getDouble("sch_perc__6");*/
}
rs.close();rs = null;
......@@ -599,22 +596,24 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
System.out.println("Array >>"+schdtList +"schperc" +schpercList);
System.out.println("Array length>>"+schdtList.size() +"schperc" +schpercList.size());
System.out.println("Array tschdtList>>"+tschdtList.size() +"schperc" +tschpercList.size());
System.out.println("Array BEFORE>>"+tschdtList.size() +"tschpercList" +tschpercList.size());
for ( k = 0 ; k < schdtList.size(); k++)
{
System.out.println("schdt array:["+schdtList.get(k)+"]");
System.out.println("schperc array:["+schpercList.get(k)+"]");
if(schdtList.get(k) != null && schpercList.get(k) != null )
{
//tschdtList[tschdt.length + 1] = schdt[k];
tschdtList.set(tschdtList.size()+1,schdtList.get(k)) ;
//tschperc[tschperc.length + 1] = schperc[k];
tschpercList.set(tschpercList.size() +1,schpercList.get(k));
tschdtList.add(schdtList.get(k)) ;
tschpercList.add(schpercList.get(k));
}
}
System.out.println("Array t>>"+tschdtList +"tschpercList" +tschpercList);
System.out.println("Array lengtht>>"+tschdtList.size() +"tschpercList" +tschpercList.size());
schdtList = tschdtList ;
schpercList = tschpercList ;
......@@ -632,8 +631,8 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
tschdt = schdt ;
tschperc = schperc ; */
schdtList.set(0,dateNew) ;
schpercList.set(0,(double) 100) ;
schdtList.add(dateNew) ;
schpercList.add((double) 100) ;
tschdtList = schdtList;
tschpercList = schpercList;
}
......@@ -650,13 +649,12 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
pstmtDet = conn.prepareStatement(sqlDet);
pstmtDet.setString( 1, asType );
pstmtDet.setString( 2, tranId );
//pstmt.setString(3, sqlAppendStr.replace("'",""));
rsDet = pstmtDet.executeQuery();
while(rsDet.next())
{
mitemCd = checkNull(rsDet.getString("item_code"));
mlocType = checkNull(rsDet.getString("loc_type"));
lineNo = checkNull(rsDet.getString("line_no"));
lineNo = rsDet.getString("line_no");
invoiceItemSer= checkNull(rsDet.getString("item_ser"));
munit = checkNull(rsDet.getString("unit"));
msales = rsDet.getDouble("sales");
......@@ -670,13 +668,10 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
if("P".equalsIgnoreCase(asType))
{
invoiceItemSer = distCommon.getItemSer(mitemCd, msiteCd, morderDt, custCode, "", conn);
//invoiceItemSerArr = invoiceItemSer.split(",");
//String invoiceItemSerArr[]= invoiceItemSer.split("~t");
}
else
{
invoiceItemSer = distCommon.getItemSer(mitemCd, msiteCd, morderDt, custCode, "C", conn);
//invoiceItemSerArr = invoiceItemSer.split(",");
}
System.out.println("invoiceItemSer"+invoiceItemSer+"invoiceItemSerArr"+invoiceItemSerArr);
......@@ -761,6 +756,8 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
rs.close();rs = null;
pstmt.close();pstmt = null;
}
if(mvarValue == null || mvarValue.trim().length() == 0)
{
sql = "select repl_factor from customer where cust_code = ? " ;
......@@ -773,6 +770,8 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
}
rs.close();rs = null;
pstmt.close();pstmt = null;
}
if(mvarValue == null || mvarValue.trim().length() == 0)
{
mvarValue = distCommon.getDisparams("999999", "REPL_FACTOR", conn);
......@@ -786,17 +785,13 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
mvarValue = "0";
}
}
}
}
System.out.println("mvarValue["+mvarValue +"]");
mminQty = Double.parseDouble(mvarValue) * msales;
System.out.println("mminQty["+mminQty +"]");
}
System.out.println("mminQty:"+mminQty + "mclStock :"+mclStock);
System.out.println("mminQty: "+mminQty + "mclStock :"+mclStock);
if(!"P".equalsIgnoreCase(asType))
{
......@@ -871,7 +866,6 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
}
itemSerProm = distCommon.getItemSer(mitemCd, msiteCd, morderDt, custCode, "O", conn);
//itemSerPromArr = itemSerProm.split("~t");
sql = "select count(*) from customer_series where cust_code = ? and item_ser = ? " ;
pstmt = conn.prepareStatement(sql);
......@@ -1041,7 +1035,6 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
continue;
}
schemeCode = getCustSchemeCode(custCode, mschemeCd, orderType, conn);
System.out.println("fetching scheme code from method"+schemeCode);
......@@ -1053,7 +1046,7 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
{
schemeCode = prevScheme ;
}
//System.out.println("llSchcnt["+llSchcnt+"]");
System.out.println("llSchcnt["+llSchcnt+"]");
//continue;
if(schemeCode == null || schemeCode.trim().length() == 0)
......@@ -1321,7 +1314,7 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
rs.close();rs = null;
pstmt.close();pstmt = null;
System.out.println("batchQty FOR integral_qty "+batchQty);
System.out.println("batchQty for integral_qty "+batchQty);
custStockSoGen.put("integral_qty", batchQty);
}
}
......@@ -1444,14 +1437,14 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
morderDtDtr = sdf1.format(morderDt);
}
System.out.println("morderDt["+morderDt + "]morderDtDtr>>["+morderDtDtr + "]replRate"+replRate);
System.out.println("morderDt["+morderDt + "]morderDtDtr>>["+morderDtDtr + "]replRate["+replRate +"]");
if(replRate == "0")
if("0".equalsIgnoreCase(replRate))
{
mrate = distCommon.pickRate(mpriceList, morderDtDtr, mitemCd, "","L",conn);
listType = distCommon.getPriceListType(mpriceList, conn);
System.out.println("mrate:["+mrate + "]listType>>["+listType+"]");
System.out.println("mrate:["+mrate + "]listType:["+listType+"]");
if(!"L".equalsIgnoreCase(listType) && mrate == -1)
{
mrate = 0;
......@@ -1478,17 +1471,6 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
rs.close();rs = null;
pstmt.close();pstmt = null;
sql = " select tax_class from sordertype where order_type = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, orderType);
rs = pstmt.executeQuery();
if(rs.next())
{
typeTaxclass = checkNull(rs.getString("tax_class"));
}
rs.close();rs = null;
pstmt.close();pstmt = null;
sql = " select stan_code from site where site_code = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, msiteCd);
......@@ -1502,14 +1484,14 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
if(typeTaxclass == null || typeTaxclass.trim().length() == 0 || replRate == "0")
{
mtaxClass = "TES1 ";//validatorEJB.getTaxClass('C', custCode, mitemCd, msiteCd);//poonam
mtaxClass = distCommon.getTaxClass("C", custCode, mitemCd, msiteCd,conn);
}
else
{
mtaxClass = typeTaxclass ;
}
mtaxChap = "TEST3 ";//validatorEJB.getTaxChapter(mitemCd, invoiceItemSer, 'C', custCode, msiteCd);
mtaxEnv = "ABC ";//validatorEJB.getTaxEnv(mstanCodeSite, mstanCode, mtaxChap, mtaxClass, msiteCd);
mtaxChap = distCommon.getTaxChap(mitemCd, invoiceItemSer, "C", custCode, msiteCd,conn);
mtaxEnv = distCommon.getTaxEnv(mstanCodeSite, mstanCode, mtaxChap, mtaxClass, msiteCd ,conn);
System.out.println("mtaxEnv["+mtaxEnv+"]mtaxChap["+mtaxChap+"]mtaxClass["+mtaxClass+"]");
......@@ -1584,14 +1566,12 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
pstmtDet.close();pstmtDet = null;
System.out.println("custStockSoGenList outside loop"+custStockSoGenList.size());
System.out.println("custStockSoGenList before after remove row"+custStockSoGenList.size());
System.out.println("custStockSoGenList before remove row"+custStockSoGenList.toString());
for(int m = 0 ;m < custStockSoGenList.size(); m++ )
//for(int m = 0 ;m < custStockSoGenList.size(); m++ )
for(int m = custStockSoGenList.size()-1 ; m >= 0 ; m-- )
{
System.out.println("Inside for loop ["+custStockSoGenList.size() + "] M ["+m + "]");
System.out.println("Inside for loop ["+custStockSoGenList.size() + "] M ["+ m + "]");
custStockSoGen = new HashMap();
custStockSoGen = (HashMap) custStockSoGenList.get(m);
......@@ -1600,6 +1580,7 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
System.out.println("Inside mclStock["+mclStock +"]");
System.out.println("Inside integralQty["+integralQty + "]" );
if("P".equalsIgnoreCase(asType))
{
if(mclStock < 0 )
......@@ -1625,9 +1606,9 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
if(custStockSoGenList.size() > 0)
{
System.out.println("Inside #######"+custStockSoGenList.size());
for(k = 0 ; k< schdtList.size() ; k++)
for(k = 1 ; k< schdtList.size() ; k++)
{
System.out.println("Inside^^^^^^^^"+custStockSoGenList.size());
System.out.println("Inside^^^^^^^^"+custStockSoGenList.size()+"K:"+k);
for(int p = 0 ;p < custStockSoGenList.size() ; p++)
{
System.out.println("INSIDE IF FOR FOR P LOOP");
......@@ -1654,8 +1635,13 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
}
integralQty= (Double) custStockSoGen.get("integral_qty");
mclStock= (Double) custStockSoGen.get("cl_stock");
System.out.println("integralQty:::["+integralQty+"]mclStock:::["+mclStock+"]");
System.out.println("integralQty:::["+integralQty+"] mclStock:::["+mclStock+"]schpercList.get(k)["+schpercList.get(k)+"]");
if( mclStock > integralQty)
{
mclStock = mclStock * schpercList.get(k) / 100 ;
System.out.println("mclStock:::::::["+mclStock+"]");
if (integralQty > 0)
{
sql = "Select mod(?,?) from dual";
......@@ -1716,32 +1702,41 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
}
mclStock = (perc * integralQty) ;
System.out.println("mclStock["+mclStock+"]integralQty["+integralQty+"]perc["+perc+"]perc * integralQty["+perc * integralQty+"]");
System.out.println("mclStock["+mclStock+"] integralQty["+integralQty+"] perc["+perc+"] perc * integralQty["+perc * integralQty+"]");
}
lcOrderStock = (Double) custStockSoGen.get("order_stock");
NewCustStockSoGen.put("order_stock", lcOrderStock + mclStock);
System.out.println("lcOrderStock["+lcOrderStock+"]lcOrderStock + mclStock["+lcOrderStock + mclStock);
System.out.println("mclStock["+mclStock);
System.out.println("lcOrderStock["+lcOrderStock+"] lcOrderStock + mclStock["+lcOrderStock + mclStock+"]");
System.out.println("mclStock["+mclStock+"]");
NewCustStockSoGenList.add(NewCustStockSoGen);
}
}
}
}
System.out.println("NewCustStockSoGenList ["+NewCustStockSoGenList.size()+"]");
/*StringBuffer xmlBuffkeyGen = new StringBuffer();
xmlBuffkeyGen.append("<Detail1 dbID='' domID=\"1\" objName=\"sorder\" objContext=\"1\">");
xmlBuffkeyGen.append("<attribute pkNames=\"\" selected=\"N\" updateFlag=\"A\" status=\"N\" />");
xmlBuffkeyGen.append("</Detail1>");
if(NewCustStockSoGenList == null || NewCustStockSoGenList.size() == 0)
{
for(int p = 0 ;p < custStockSoGenList.size() ; p++)
{
System.out.println("INSIDE IF FOR second P LOOP");
custStockSoGen = new HashMap();
custStockSoGen = (HashMap) custStockSoGenList.get(p);
NewCustStockSoGen = custStockSoGen;
NewCustStockSoGenList.add(NewCustStockSoGen);
System.out.println("NewCustStockSoGenList new list ["+NewCustStockSoGenList.toString()+"]");
}
}
}
}
TransIDGenerator tg = new TransIDGenerator(xmlBuffkeyGen.toString(), "SYSTEM", CommonConstants.DB_NAME);
msetTranId = tg.generateTranSeqID("S-ORD", "tran_id", keyStr, conn);
System.out.println("NewCustStockSoGenList ["+NewCustStockSoGenList.size()+"]");
System.out.println("msetTranId>>"+msetTranId);*/
if(NewCustStockSoGenList.size() > 0)
{
......@@ -1749,7 +1744,9 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
for(k = 0 ; k < schdtList.size() ; k++)
{
System.out.println("INSIDE IF FOR FOR K LOOP");
for(int q = 0 ;q < NewCustStockSoGenList.size() ; q++)
int q = 0 ;
for( q = 0 ;q < NewCustStockSoGenList.size() ; q++)
{
System.out.println("iNSIDE IF FOR FOR P LOOP");
custStockSoGen = new HashMap();
......@@ -1762,7 +1759,7 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
mitemCd = (String) custStockSoGen.get("item_code");
minOrderQty = gfGetMinOrderQty(custCode,msiteCd,mitemCd ,conn);
System.out.println("INSIDE IF FOR FOR K with mitemCd"+mitemCd+"minOrderQty"+minOrderQty+"K"+k);
System.out.println("INSIDE IF FOR FOR K with mitemCd :::["+mitemCd+"]minOrderQty["+minOrderQty+"]K["+k+"]");
System.out.println("minOrderQty >>"+minOrderQty);
demandQty = (Double) custStockSoGen.get("demand_qty");
clStockOrg = (Double) custStockSoGen.get("cl_stock__org");
......@@ -1780,8 +1777,8 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
if(k == 0)
{
System.out.println("K=====1 >>"+k);
schdtList.set(0,schdtList.get(1)) ;
schpercList.set(0,(double) 100 ) ;
schdtList.add(schdtList.get(1)) ;
schpercList.add((double) 100 ) ;
System.out.println("in sch12131"+schpercList+schdtList);
}
else
......@@ -1801,8 +1798,8 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
if(k == 0)
{
System.out.println("K=====1 >>"+k);
schdtList.set( 0,schdtList.get(schdtList.size())) ;
schpercList.set(0,(double) 100);
schdtList.add(schdtList.get(schdtList.size())) ;
schpercList.add((double) 100);
System.out.println("in sch234"+schpercList+schdtList);
}
else
......@@ -1833,7 +1830,7 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
{
if(k == 0)
{
schpercList.set(0,(double)100);
schpercList.add((double)100);
}
else
{
......@@ -1849,19 +1846,16 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
}
}
oldInvoiceItemSer = (String) custStockSoGen.get("invoice_item_ser");
oldLocType = (String) custStockSoGen.get("loc_type");
//oldLocType = (String) custStockSoGen.get("loc_type");
System.out.println("tranDate >>>"+morderDt +"SDF FORMat"+sdf.format(morderDt));
xmlBuff = new StringBuffer();
xmlBuffDet = new StringBuffer();
System.out.println("--XML CREATION --");
orderType = (String) custStockSoGen.get("order_type");
System.out.println("Before DETAIL2 LOG["+ NewCustStockSoGenList.size()+"]");
for(int j = 0 ;j< NewCustStockSoGenList.size(); j++)
/*for(int j = q ;j< NewCustStockSoGenList.size(); j++)
{
System.out.println("iNSIDE DETAIL2 LOG");
schdtList = tschdtList ;
......@@ -1870,13 +1864,13 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
custStockSoGen = new HashMap();
custStockSoGen = (HashMap) NewCustStockSoGenList.get(j);
*/
InvoiceItemSer = (String) custStockSoGen.get("invoice_item_ser");
locType = (String) custStockSoGen.get("loc_type");
lineNo = (String) custStockSoGen.get("line_no");
System.out.println("Line noooo"+lineNo);
System.out.println(" "+lineNo);
mclStock = (Double) custStockSoGen.get("cl_stock");
mrate = (Double) custStockSoGen.get("rate");
......@@ -1901,10 +1895,10 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
mrateClg = (Double) custStockSoGen.get("rate__clg");
custItemRef = (String) custStockSoGen.get("cust_item__ref");
System.out.println("integralQtyintegralQtyintegralQty["+integralQty+"]asType["+asType+"]mitFlg["+mitFlg);
System.out.println("integralQtyintegralQtyintegralQty["+integralQty+"]asType["+asType+"]mitFlg["+mitFlg+"]");
if(!"P".equalsIgnoreCase(asType))
{
System.out.println("IN ! p LOOP>>>>>"+mclStock);
System.out.println("IN ! P LOOP>>>>>"+mclStock);
mitemCd = (String) custStockSoGen.get("item_code");
demandQty = (Double) custStockSoGen.get("demand_qty");
clStockOrg = (Double) custStockSoGen.get("cl_stock__org");
......@@ -1918,8 +1912,8 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
{
if(k == 0)
{
schdtList.set(0,schdtList.get(0));
schpercList.set(0,(double) 100);
schdtList.add(schdtList.get(0));
schpercList.add((double) 100);
System.out.println("in sch21"+schpercList+schdtList);
}
else
......@@ -1937,8 +1931,8 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
if(k == 0)
{
System.out.println("in sch11");
schdtList.set(0,schdtList.get(schdtList.size()));
schpercList.set(0,(double) 100);
schdtList.add(schdtList.get(schdtList.size()));
schpercList.add((double) 100);
System.out.println("in sch11"+schpercList+schdtList);
}
else
......@@ -1951,8 +1945,8 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
else
{
System.out.println("in sch12");
schdtList.set(0,schdtList.get(schdtList.size()));
schpercList.set(0,(double) 100);
schdtList.add(schdtList.get(schdtList.size()));
schpercList.add((double) 100);
System.out.println("in sch12"+schpercList+schdtList);
}
}
......@@ -1970,7 +1964,7 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
{
if(k == 0)
{
schpercList.set(0,(double) 100);
schpercList.add((double) 100);
}
else
{
......@@ -1980,9 +1974,8 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
}
else
{
schpercList.set(0,schpercTmp);
schpercList.add(schpercTmp);
}
System.out.println("schpercList"+schpercList.toString());
}
......@@ -2039,12 +2032,9 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
perc = (mclStock/integralQty) ;
}
mclStock = perc * integralQty ;
System.out.println("mclStock///...."+mclStock+"integralQty///...."+integralQty+"perc..."+perc);
System.out.println("mclStock///...."+mclStock+"integralQty...."+integralQty+"perc..."+perc);
}
custStockSoGen.put("order_stock", lcOrderStock + mclStock);
}
else
{
......@@ -2091,7 +2081,6 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
{
qtyPerc = gfGetQtyPerc(custCode,msiteCd,mitemCd,conn);
System.out.println("qtyPerc weqwrwe>>"+qtyPerc +"integralQty"+integralQty);
lcQty = integralQty * (qtyPerc/100) ;
......@@ -2109,7 +2098,6 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
rs.close();rs = null;
pstmt.close();pstmt = null;
System.out.println("mmodqty mmodqty>>"+mmodqty);
System.out.println("lcQty.....>>"+lcQty);
if(mmodqty < lcQty)
......@@ -2121,18 +2109,27 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
perc = (mclStock/integralQty) +1 ;
}
}
else
{
perc = (mclStock/integralQty) +1 ;
}
}
else
{
perc = (mclStock/integralQty) ;
}
mclStock = perc * integralQty ;
System.out.println("mclStock mmodqty>>["+mclStock +"]perc["+perc+"]integralQty["+integralQty+"]");
}
else
/*else
{
if(integralQty != 0)
{
perc = (mclStock / integralQty);
}
}
mclStock = perc * integralQty ;
}*/
//mclStock = perc * integralQty ;
System.out.println("perc11>>>>>"+perc);
System.out.println("integralQty111>>>>>"+integralQty);
System.out.println("mclStock1>>>>>"+mclStock);
......@@ -2168,10 +2165,13 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
System.out.println("mclStock*****>>>>>"+mclStock);
System.out.println("@@@@@ :Inside else.....");
tempSplitCode = InvoiceItemSer + "@" + locType.trim();
System.out.println("@@@@@ :Inside locType.trim().....["+locType.trim()+"]itemserProm["+itemserProm+"]");
tempSplitCode = itemserProm + "@" + locType.trim();
if (splitCodeWiseMap.containsKey(tempSplitCode))
{
tempList = (ArrayList) splitCodeWiseMap.get(tempSplitCode);
System.out.println("@@@@@ tempList in if....."+tempList);
} else
{
tempList = new ArrayList();
......@@ -2180,7 +2180,7 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
System.out.println("LINE NO PLAN["+lineNo+"][LINE NO SET["+msetLine +"]");
lineNo = getLineNewNo(lineNo);
//lineNo = getLineNewNo(lineNo);
System.out.println("lineNo["+lineNo+"]");
......@@ -2224,11 +2224,14 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
tempMap.put("quantity__stduom",mclStock);
System.out.println("Print tempMap{"+ tempMap +"}schdtList.get(k)["+schdtList.get(k)+"]");
System.out.println("sales parson = " + plistDisc );
System.out.println("sales parson = " + tempMap.size() );
tempList.add(tempMap);
System.out.println("Print Templist"+ tempList);
System.out.println("Print Templist["+ tempList + "]");
System.out.println(" Templist"+ tempList.size() + "]");
if (splitCodeWiseMap.containsKey(tempSplitCode))
{
......@@ -2240,20 +2243,40 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
System.out.println("Print splitCodeWiseMap"+ splitCodeWiseMap);
System.out.println("Print splitCodeWiseMap>>["+ splitCodeWiseMap.size()+"]");
//}
}
System.out.println("INSIDE splitCodeWiseMap...."+splitCodeWiseMap.toString());
Set setItem = splitCodeWiseMap.entrySet();
tempList = null;
Iterator itrItem = setItem.iterator();
int cnt2 = 0 ;
System.out.println("itrItem>>>["+itrItem.toString()+"]");
while (itrItem.hasNext())
{
mtotOrdAmt = 0 ;
mtotTaxAmt = 0 ;
mtotNetAmt = 0 ;
System.out.println("------------------while(itrItem.hasNext())--------");
Map.Entry itemMapEntry = (Map.Entry) itrItem.next();
splitCode = (String) itemMapEntry.getKey();
System.out.println("splitCode>>>["+splitCode +"]");
int itemIndex = splitCode.indexOf('@');
itemSer = splitCode.substring(0, itemIndex);
//int custIndex = splitCode.indexOf('@');
//String custCd = splitCode.substring(itemIndex + 1, custIndex);
// modify by cpatil on 14-06-12 for splitting start
//int crIndex = splitCode.indexOf('.');
//crTerm = splitCode.substring(custIndex + 1, crIndex);
//String locTypeParent = splitCode.substring(crIndex + 1, splitCode.length());
//System.out.println(">>>>>>>>>locTypeParent===" + locTypeParent);
System.out.println("INSIDE WHILE....");
System.out.println("SDF DATE"+sdf.format(morderDt));
System.out.println("SDF1 DATE"+sdf1.format(morderDt));
......@@ -2263,6 +2286,15 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
morderDtApp = sdf1.format(morderDt);
}
System.out.println("@@@@@@@ [ splitCode[" + splitCode + "]");
System.out.println("itemSer[" + itemSer + "]");
//System.out.println("custCd[" + custCd + "]");
System.out.println("crTerm[" + crTerm + "]"+mcrterm);
// System.out.println("locTypeParent[" + locTypeParent + "] ] @@@@@@@@");
tempList = (ArrayList) splitCodeWiseMap.get(splitCode);
xmlBuff = null;
xmlBuff = new StringBuffer();
xmlBuff.append("<?xml version='1.0' encoding='ISO-8859-1'?>\n");
xmlBuff.append("<DocumentRoot>");
xmlBuff.append("<description>").append("Datawindow Root").append("</description>");
......@@ -2290,7 +2322,7 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
xmlBuff.append("<sale_order/>");
xmlBuff.append("<order_date><![CDATA["+ morderDtApp +"]]></order_date>");
xmlBuff.append("<site_code><![CDATA["+ checkNull(msiteCd) +"]]></site_code>");
xmlBuff.append("<item_ser><![CDATA["+ checkNull(oldInvoiceItemSer) +"]]></item_ser>");
xmlBuff.append("<item_ser><![CDATA["+ itemSer +"]]></item_ser>");
xmlBuff.append("<dlv_to><![CDATA["+ checkNull(descr )+"]]></dlv_to>");
xmlBuff.append("<dlv_add1><![CDATA["+ checkNull(descr1 )+"]]></dlv_add1>");
xmlBuff.append("<dlv_add2><![CDATA["+ checkNull(descr2) +"]]></dlv_add2>");
......@@ -2353,25 +2385,30 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
System.out.println("@@@@@@@ [splitCode[" + splitCode + "]");
tempList = (ArrayList) splitCodeWiseMap.get(splitCode);
//tempList = (ArrayList) splitCodeWiseMap.get(splitCode);
System.out.println("tempList before loop"+tempList.size());
String lineNoNewStr = "";
int lineNoNew = 1 ;
xmlBuffDet = new StringBuffer();
for (int itemCtr = 0; itemCtr < tempList.size(); itemCtr++)
{
System.out.println("Inside itemCtr >> detail2");
tempMap = (HashMap) tempList.get(itemCtr);
lineNoNewStr = getLineNewNo(Integer.toString(lineNoNew));
xmlBuffDet.append("<Detail2 dbID='' domID=\""+lineNoNew +"\" objName=\"sorder\" objContext=\"2\">");
xmlBuffDet.append("<attribute pkNames=\"\" selected=\"N\" updateFlag=\"A\" status=\"N\" />");
xmlBuffDet.append("<sale_order/>");
//xmlBuffDet.append("<sale_order><![CDATA["+msetTranId +"]]></sale_order>");
xmlBuffDet.append("<line_no><![CDATA["+lineNoNew +"]]></line_no>");
xmlBuffDet.append("<line_no><![CDATA["+lineNoNewStr +"]]></line_no>");
xmlBuffDet.append("<site_code><![CDATA["+(String)tempMap.get("site_code") +"]]></site_code>");
xmlBuffDet.append("<item_code__ord><![CDATA["+(String) tempMap.get("item_code") +"]]></item_code__ord>");
xmlBuffDet.append("<item_code><![CDATA["+(String) tempMap.get("item_code") +"]]></item_code>");
xmlBuffDet.append("<item_descr><![CDATA["+mdescr +"]]></item_descr>");
xmlBuffDet.append("<item_ser><![CDATA["+ invoiceItemSer +"]]></item_ser>");
xmlBuffDet.append("<item_descr><![CDATA["+(String) tempMap.get("item_descr") +"]]></item_descr>");
xmlBuffDet.append("<item_ser><![CDATA["+ (String) tempMap.get("item_ser") +"]]></item_ser>");
xmlBuffDet.append("<item_ser__prom><![CDATA["+itemserProm +"]]></item_ser__prom>");
sql = "Select descr from itemser where item_ser = ? ";
......@@ -2391,14 +2428,16 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
xmlBuffDet.append("<chg_user><![CDATA["+userId +"]]></chg_user>");
xmlBuffDet.append("<chg_term><![CDATA["+ termId +"]]></chg_term>");
xmlBuffDet.append("<chg_date><![CDATA["+sdf.format(sysdate) +"]]></chg_date>");
//xmlBuffDet.append("<chg_date><![CDATA["+morderDtApp +"]]></chg_date>");
xmlBuffDet.append("<item_flg><![CDATA["+(String) tempMap.get("item_flg") +"]]></item_flg>");
xmlBuffDet.append("<unit><![CDATA["+(String) tempMap.get("unit") +"]]></unit>");
xmlBuffDet.append("<unit__std><![CDATA["+(String) tempMap.get("unit__std") +"]]></unit__std>");
xmlBuffDet.append("<unit__rate><![CDATA["+(String) tempMap.get("unit__rate") +"]]></unit__rate>");
xmlBuffDet.append("<status><![CDATA["+'N' +"]]></status>");
xmlBuffDet.append("<status_date><![CDATA["+ morderDtApp +"]]></status_date>");
xmlBuffDet.append("<conv__qty_stduom><![CDATA["+1 +"]]></conv__qty_stduom>");
xmlBuffDet.append("<conv__rtuom_stduom><![CDATA["+1 +"]]></conv__rtuom_stduom>");
xmlBuffDet.append("<conv__qty_stduom><![CDATA["+ 1 +"]]></conv__qty_stduom>");
xmlBuffDet.append("<conv__rtuom_stduom><![CDATA["+ 1 +"]]></conv__rtuom_stduom>");
xmlBuffDet.append("<pack_code><![CDATA["+(String) tempMap.get("pack_code") +"]]></pack_code>");
xmlBuffDet.append("<loc_type><![CDATA["+(String) tempMap.get("loc_type") +"]]></loc_type>");
xmlBuffDet.append("<discount><![CDATA["+(Double) tempMap.get("discount") +"]]></discount>");
......@@ -2411,7 +2450,7 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
xmlBuffDet.append("<dsp_date><![CDATA["+ schdtList.get(k) +"]]></dsp_date>");
xmlBuffDet.append("<cust_item__ref><![CDATA["+(String) tempMap.get("cust_item__ref") +"]]></cust_item__ref>");
remarks = "Sale order created from Cust Stock Order :" + tranId ;
remarks = tranId + " "+lineNoNewStr;
xmlBuffDet.append("<remarks><![CDATA["+remarks +"]]></remarks>");
//msetLine = getLineNewNo(msetLine);
......@@ -2438,7 +2477,6 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
if(rs.next())
{
crTerm = rs.getString("cr_term_map");
mcrterm = crTerm ;
}
rs.close();rs = null;
......@@ -2446,22 +2484,14 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
xmlBuff.append("<cr_term><![CDATA["+mcrterm +"]]></cr_term>");
if(mtaxAmt == -999999999)
{
errString = itmDBAccess.getErrorString("", "Error in Calculating Tax", "");
return errString;
}
mclStock = (Double)tempMap.get("quantity");
mrate = (Double)tempMap.get("rate");
mrate = (Double)tempMap.get("rate") ;
System.out.println("(mclStock * mrate)"+(mclStock));
System.out.println("(mclStock * mrate)"+( mrate));
System.out.println("(mclStock)"+(mclStock));
System.out.println("(mrate)"+( mrate)) ;
System.out.println("(mclStock * mrate)"+(mclStock * mrate));
mordAmt = (mclStock * mrate);
mnetAmt = mordAmt + mtaxAmt ;
System.out.println("(mordAmt)"+(mordAmt));
......@@ -2493,7 +2523,7 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
xmlString = xmlBuff.toString();
System.out.println("@@@@@2: xmlString:"+xmlBuff.toString());
System.out.println("...............just before savdata()");
System.out.println("...............just before savedata()");
errString = saveData(msiteCd,xmlString,conn);
System.out.println("@@@@@2: retString:"+errString);
System.out.println("--retString finished--");
......@@ -2535,7 +2565,7 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
pstmt.close();pstmt = null;
rs.close();rs = null;
for(int r = 0;r < lineNooInt ;r++)
for(int r = 1 ; r <= lineNooInt ; r++)
{
System.out.println("INSIDE FOR LOOP>>"+r);
if(r == lineNoInt)
......@@ -2549,7 +2579,6 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
updCnt1 = pstmt.executeUpdate();
pstmt.close();pstmt = null;
}
}
System.out.println("updCnt1>>"+updCnt1);
errString = "";
......@@ -2565,19 +2594,19 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
mtotTaxAmt = 0 ;
mtotNetAmt = 0 ;
cnt2++;
System.out.println("Count while loop"+cnt2);
}
}
}
sql = "update cust_stock set status = 'Y' where tran_id = ? and status <> 'Y' ";
sql = "update cust_stock set status = 'Y' where tran_id = ? and status <> 'Y'";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId);
updCnt = pstmt.executeUpdate();
pstmt.close();pstmt = null;
System.out.println("updCnt>>"+updCnt);
System.out.println("updCnt status>>"+updCnt);
}
}
catch (Exception e)
{
e.printStackTrace();
......@@ -2596,7 +2625,7 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
}
public String getCustSchemeCode(String custCode,String schemeCode,String orderType,Connection conn) throws ITMException
{
System.out.println("Inside getCustSchemeCode......"+schemeCode);
System.out.println("Inside getCustSchemeCode......"+schemeCode+"orderType"+orderType);
boolean lbProceed = false;
String noapplyCustList = "",applicableOrdTypes = "" ,applyCustList = "" ,curscheme = "";
try
......@@ -2617,7 +2646,7 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
pstmt1.close();
pstmt1 = null;
if("NE".equalsIgnoreCase(orderType) && (applicableOrdTypes == null || applicableOrdTypes.trim().length() == 0))
if("NE".equalsIgnoreCase(orderType.trim()) && (applicableOrdTypes == null || applicableOrdTypes.trim().length() == 0))
{
//continue;
}
......@@ -2629,7 +2658,7 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
for(int i=0;i<lsApplicableOrdTypesArr.length;i++)
{
System.out.println("lsApplicableOrdTypesArr[i]"+lsApplicableOrdTypesArr[i]);
if(orderType.equalsIgnoreCase(lsApplicableOrdTypesArr[i]))
if(orderType.trim().equalsIgnoreCase(lsApplicableOrdTypesArr[i]))
{
lbProceed=true;
break;
......@@ -2645,7 +2674,7 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
for(int i=0;i<applyCustListArr.length;i++)
{
System.out.println("applyCustListArr[i]"+applyCustListArr[i]);
if(applyCustListArr[i].equalsIgnoreCase(custCode))
if(applyCustListArr[i].equalsIgnoreCase(custCode.trim()))
{
schemeCode = curscheme;
break;
......@@ -2658,11 +2687,11 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
if(noapplyCustList.trim().length() > 0 && schemeCode != null)
{
//custCode = checkNull(genericUtility.getColumnValue("cust_code", dom1));
String noapplyCustListArr[]=noapplyCustList.split(",");
String noapplyCustListArr[] = noapplyCustList.split(",");
for(int i=0; i < noapplyCustListArr.length;i++)
{
System.out.println("noapplyCustListArr[i]" + noapplyCustListArr[i]);
if(noapplyCustListArr[i].equalsIgnoreCase(custCode))
if(noapplyCustListArr[i].equalsIgnoreCase(custCode.trim()))
{
schemeCode = "";
break;
......@@ -2723,7 +2752,7 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
qtyPercStr = distCommon.getDisparams("999999", "QTY_PERC", conn);
if(!"NULLFOUND".equalsIgnoreCase(qtyPercStr) && qtyPercStr != null && qtyPercStr.trim().length() > 0)
{
qtyPerc = Double.parseDouble(qtyPercStr ) ;
qtyPerc = Double.parseDouble(qtyPercStr) ;
}
}
}
......
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