Skip to content

B
business-java
Commit d283d9f7 authored by kmandhre's avatar kmandhre
Browse files
Options

allow space in Cost center code 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@92963 ce508802-f39f-4f6c-b175-0d175dae99d5
parent dac3a675
Hide whitespace changes
Inline Side-by-side
Showing with 126 additions and 56 deletions
webitm-dis/ibase/webitm/ejb/dis/BillofQuantityAct.java
View file @ d283d9f7
......@@ -272,11 +272,11 @@ implements BillofQuantityActLocal, BillofQuantityActRemote
System.out.println("proj_code-->>["+projCode+"]");
rateStduom = rs.getDouble("rate__stduom");
System.out.println("te Stduom --[" + rateStduom + "]>>");
dlvDate = rs.getDate("dlv_date");
acctCode = checkNull(rs.getString("acct_code__dr"));
cctrCode = checkNull(rs.getString("cctr_code__dr"));
sql = "select descr from item where item_code = ? ";
pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1, ditemCode);
......@@ -303,9 +303,9 @@ implements BillofQuantityActLocal, BillofQuantityActRemote
valueXmlString.append("<Detail>\r\n");
valueXmlString.append("<item_code>").append("<![CDATA[").append(ditemCode).append("]]>").append("</item_code>\r\n");
valueXmlString.append("<item_descr>").append("<![CDATA[").append(descr).append("]]>").append("</item_descr>\r\n");
valueXmlString.append("<item_ser>").append("<![CDATA[").append(itemSer).append("]]>").append("</item_ser>\r\n");
valueXmlString.append("<rate>").append("<![CDATA[").append(rate).append("]]>").append("</rate>\r\n");
valueXmlString.append("<quantity>").append("<![CDATA[").append(quantity).append("]]>").append("</quantity>\r\n");
......@@ -314,10 +314,10 @@ implements BillofQuantityActLocal, BillofQuantityActRemote
valueXmlString.append("<no_art>").append("<![CDATA[").append(noArt).append("]]>").append("</no_art>\r\n");
valueXmlString.append("<pack_code>").append("<![CDATA[").append(packCode).append("]]>").append("</pack_code>\r\n");
valueXmlString.append("<pack_instr>").append("<![CDATA[").append(packInstr).append("]]>").append("</pack_instr>\r\n");
valueXmlString.append("<specific_instr>").append("<![CDATA[").append(specInstr).append("]]>").append("</specific_instr>\r\n");
valueXmlString.append("<special_instr>").append("<![CDATA[").append(splInstr).append("]]>").append("</special_instr>\r\n");
valueXmlString.append("<site_code>").append("<![CDATA[").append(siteCode).append("]]>").append("</site_code>\r\n");
valueXmlString.append("<unit__rate>").append("<![CDATA[").append(unitRate).append("]]>").append("</unit__rate>\r\n");
valueXmlString.append("<conv__qty_stduom>").append("<![CDATA[").append(convQtyStduom).append("]]>").append("</conv__qty_stduom>\r\n");
......@@ -343,7 +343,7 @@ implements BillofQuantityActLocal, BillofQuantityActRemote
{
valueXmlString.append("<req_date>").append("<![CDATA[").append(sdf.format(reqDate)).append("]]>").append("</req_date>\r\n");
}
if(dlvDate == null)
{
valueXmlString.append("<dlv_date>").append("<![CDATA[").append(sdf.format(new Date())).append("]]>").append("</dlv_date>\r\n");
......@@ -531,18 +531,20 @@ implements BillofQuantityActLocal, BillofQuantityActRemote
String pordType = "";
//String cctrCode = "";
//String acctCode = "";
String itemCodeRef = " ";
String itemCodeRef = "";
//String indentNo = "";
//String suppCodeMnfr = " ";
//String qcReqd = "" ;
//String costctr = "";
//String CctrLoccode = "";
String acctCr = "" ;
String cctrCr = "" ;
//String acctCr = "" ;
//String cctrCr = "" ;
String acctCr = " " ;
String cctrCr = " " ;
String invacct = "";
String invacctQc = "";
String acctDr = "" ;
String cctrDr = "" ;
String acctDr = " " ;
String cctrDr = " " ;
String Cr[] = null;
String Dr[] = null;
//String unitStd = "";
......@@ -566,7 +568,7 @@ implements BillofQuantityActLocal, BillofQuantityActRemote
try
{
//conn = connDriver.getConnectDB("DriverITM");
sql = "Select loc_code, emp_code__qcaprv ,item_ser from item where item_code = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,ditemCode);
......@@ -634,7 +636,7 @@ implements BillofQuantityActLocal, BillofQuantityActRemote
ordDate =genericUtility.getColumnValue("ord_date", dom1);
priceList = disCommon.getDisparams("999999", "STD_PO_PL", conn);
if(priceList == null || priceList.trim().length() == 0 || priceList.equals("NULLFOUND"))
{
priceList = genericUtility.getColumnValue("price_list", dom1);
......@@ -664,7 +666,7 @@ implements BillofQuantityActLocal, BillofQuantityActRemote
{
empCodeQcaprv = " ";
}
XmlString.append("<emp_code__qcaprv>").append("<![CDATA[").append(empCodeQcaprv).append("]]>").append("</emp_code__qcaprv>\r\n");
......@@ -702,37 +704,43 @@ implements BillofQuantityActLocal, BillofQuantityActRemote
//itemSer = genericUtility.getColumnValue("item_ser", dom1);
System.out.println("boqAcctCode="+boqAcctCode+"boqCctrCode="+boqCctrCode);
pordType = genericUtility.getColumnValue("pord_type", dom1);
System.out.println("pordType::"+pordType);
if(boqAcctCode != null && boqAcctCode.trim().length() > 0)
//if(boqAcctCode != null )
{
acctDr = boqAcctCode;
cctrDr = boqCctrCode;
}
if(acctDr == null || acctDr.trim().length() == 0)
//if(acctDr == null )
{
acctDet = finCommon.getAcctDetrTtype(ditemCode, itemSer, "IN", pordType, conn);
System.out.println("cctrCode::"+acctDet);
if(acctDet != null)
{
Dr = acctDet.split(",");
System.out.println(Dr.toString()+" "+Dr.length);
if(Dr.length > 0)
acctDet = finCommon.getAcctDetrTtype(ditemCode, itemSer, "IN", pordType, conn);
System.out.println("cctrCode::"+acctDet);
if(acctDet != null)
{
acctDr = Dr[0];
}
if(Dr.length > 1)//change done by kunal on 13/04/13 for set cctr code
{
cctrDr = Dr[1];
Dr = acctDet.split(",");
System.out.println(Dr.toString()+" "+Dr.length);
if(Dr.length > 0)
{
acctDr = Dr[0];
}
if(Dr.length > 1)//change done by kunal on 13/04/13 for set cctr code
{
cctrDr = Dr[1];
}
else
{
cctrDr = " ";
}
System.out.println("acctCode::"+acctDr);
}
System.out.println("acctCode::"+acctDr);
}
}
//XmlString.append("<acct_code__dr>").append("<![CDATA[").append(acctDr).append("]]>").append("</acct_code__dr>\r\n");
//XmlString.append("<cctr_code__dr>").append("<![CDATA[").append(cctrDr).append("]]>").append("</cctr_code__dr>\r\n");
/*pordType = genericUtility.getColumnValue("ord_date", dom1);
mcctr = nvo_dis_obj.gbf_acct_detr_ttype(mcode,ls_itemser,"IN", pordType);
macct = f_get_token(mcctr,'~t');
......@@ -854,6 +862,7 @@ implements BillofQuantityActLocal, BillofQuantityActRemote
}*/
if(acctDr == null || acctDr.trim().length() == 0)
//if(acctDr == null || acctDr.length() > 10)
{
if(contractNo != null && contractNo.trim().length() > 0)
{
......@@ -866,10 +875,10 @@ implements BillofQuantityActLocal, BillofQuantityActRemote
rs = pstmt.executeQuery();
if (rs.next())
{
acctDr = checkNull(rs.getString(1));
cctrDr = checkNull(rs.getString(2));
acctCr = checkNull(rs.getString(3));
cctrCr = checkNull(rs.getString(4));
acctDr = rs.getString(1) == null ? " ":rs.getString(1);
cctrDr = rs.getString(2) == null ? " ":rs.getString(2);
acctCr = rs.getString(3) == null ? " ":rs.getString(3);
cctrCr = rs.getString(4) == null ? " ":rs.getString(4);
}
rs.close();
......@@ -887,8 +896,8 @@ implements BillofQuantityActLocal, BillofQuantityActRemote
rs = pstmt.executeQuery();
if (rs.next())
{
acctDr = checkNull(rs.getString(1));
cctrDr = checkNull(rs.getString(2));
acctDr = rs.getString(1) == null ?" ":rs.getString(1);
cctrDr = rs.getString(2) == null ?" ":rs.getString(2);
}
rs.close();
......@@ -898,7 +907,7 @@ implements BillofQuantityActLocal, BillofQuantityActRemote
}
}
if(acctDr == null || acctDr.trim().length() ==0 )
if(acctDr == null || acctDr.trim().length() == 0)
{
acctDet = finCommon.getAcctDetrTtype(ditemCode, itemSer, "IN", pordType, conn);
......@@ -913,6 +922,10 @@ implements BillofQuantityActLocal, BillofQuantityActRemote
{
cctrDr = Dr[1];
}
else
{
cctrDr = " ";
}
}
}
......@@ -944,11 +957,19 @@ implements BillofQuantityActLocal, BillofQuantityActRemote
{
acctCr = Cr[0];
}
else
{
acctCr = " ";
}
if(Cr.length > 1)
{
cctrCr = Cr[1];
}
else
{
cctrCr = " ";
}
}
else
{
......@@ -959,10 +980,18 @@ implements BillofQuantityActLocal, BillofQuantityActRemote
{
acctCr = Cr[0];
}
else
{
acctCr = " ";
}
if(Cr.length > 1)
{
cctrCr = Cr[1];
}
else
{
cctrCr = " ";
}
if(acctCr == null || acctCr.trim().length() == 0)
{
sql= " select acct_code__ap , cctr_code__ap from supplier where supp_code = ? " ;
......@@ -971,14 +1000,14 @@ implements BillofQuantityActLocal, BillofQuantityActRemote
rs = pstmt.executeQuery();
if (rs.next())
{
acctCr = checkNull(rs.getString(1));
cctrCr = checkNull(rs.getString(2));
acctCr = rs.getString(1) == null ?" ":rs.getString(1);
cctrCr = rs.getString(2) == null ?" ":rs.getString(2);
}
}
}
}
if (acctDr == null || acctDr.trim().length() == 0 )
/*if (acctDr == null || acctDr.trim().length() == 0 )
{
acctDr = " ";
}
......@@ -993,14 +1022,14 @@ implements BillofQuantityActLocal, BillofQuantityActRemote
if (cctrCr == null || cctrCr.trim().length() == 0 )
{
cctrCr = " ";
}
}*/
XmlString.append("<acct_code__dr>").append("<![CDATA[").append(acctDr).append("]]>").append("</acct_code__dr>\r\n");
XmlString.append("<cctr_code__dr>").append("<![CDATA[").append(cctrDr).append("]]>").append("</cctr_code__dr>\r\n");
XmlString.append("<acct_code__cr>").append("<![CDATA[").append(acctCr).append("]]>").append("</acct_code__cr>\r\n");
XmlString.append("<cctr_code__cr>").append("<![CDATA[").append(cctrCr).append("]]>").append("</cctr_code__cr>\r\n");
//cctr_code__dr and cctr_code__cr is allways Blank
/*costctr =genericUtility.getColumnValue("cctr_code__dr", dom1);
if(costctr == null || costctr.trim().length() == 0)
......@@ -1154,7 +1183,7 @@ implements BillofQuantityActLocal, BillofQuantityActRemote
XmlString.append("<std_cost>").append("<![CDATA[").append(stdCode).append("]]>").append("</std_cost>\r\n");
XmlString.append("<varience>").append("<![CDATA[").append(stdCode - actualCost).append("]]>").append("</varience>\r\n");
}
catch (Exception e)
{
......@@ -1239,6 +1268,7 @@ implements BillofQuantityActLocal, BillofQuantityActRemote
GenericUtility genericUtility = GenericUtility.getInstance();
String objName = "";
String discountType = "",bomCode = "";
String acctCodeCr = null,acctCodeDr = null,cctrCodeCr = null,cctrCodeDr = null;
try
{
conn = connDriver.getConnectDB("DriverITM");
......@@ -1299,32 +1329,72 @@ implements BillofQuantityActLocal, BillofQuantityActRemote
{
bomCode = "";
}
valueXmlString.append("<discount_type>").append("<![CDATA[").append(discountType).append("]]>").append("</discount_type>\r\n");
valueXmlString.append("<discount>").append("<![CDATA[").append(genericUtility.getColumnValueFromNode("discount", currDetail1)).append("]]>").append("</discount>\r\n");
valueXmlString.append("<bom_code>").append("<![CDATA[").append(bomCode).append("]]>").append("</bom_code>\r\n");
valueXmlString.append("<contract_detail>").append("<![CDATA[").append(genericUtility.getColumnValueFromNode("contract_detail", currDetail1)).append("]]>").append("</contract_detail>\r\n");
valueXmlString.append("<cctr_code__cr>").append("<![CDATA[").append( checkNull( genericUtility.getColumnValueFromNode("cctr_code__cr", currDetail1)).trim()).append("]]>").append("</cctr_code__cr>\r\n");
valueXmlString.append("<acct_code__cr>").append("<![CDATA[").append(checkNull( genericUtility.getColumnValueFromNode("acct_code__cr", currDetail1)).trim()).append("]]>").append("</acct_code__cr>\r\n");
valueXmlString.append("<cctr_code__dr>").append("<![CDATA[").append(checkNull( genericUtility.getColumnValueFromNode("cctr_code__dr", currDetail1)).trim()).append("]]>").append("</cctr_code__dr>\r\n");
valueXmlString.append("<acct_code__dr>").append("<![CDATA[").append(checkNull( genericUtility.getColumnValueFromNode("acct_code__dr", currDetail1)).trim()).append("]]>").append("</acct_code__dr>\r\n");
valueXmlString.append("<contract_detail>").append("<![CDATA[").append(genericUtility.getColumnValueFromNode("contract_detail", currDetail1)).append("]]>").append("</contract_detail>\r\n");
acctCodeDr = genericUtility.getColumnValueFromNode("acct_code__dr", currDetail1);
System.out.println("acctCodeDr="+acctCodeDr);
if(acctCodeDr != null && acctCodeDr.length() > 10)
{
valueXmlString.append("<acct_code__dr>").append("<![CDATA[").append(checkNull(acctCodeDr).trim()).append("]]>").append("</acct_code__dr>\r\n");
}
else
{
valueXmlString.append("<acct_code__dr>").append("<![CDATA[").append(acctCodeDr).append("]]>").append("</acct_code__dr>\r\n");
}
cctrCodeDr = genericUtility.getColumnValueFromNode("cctr_code__dr", currDetail1);
System.out.println("cctrCodeDr="+cctrCodeDr);
if (cctrCodeDr != null && cctrCodeDr.length() > 4)
{
valueXmlString.append("<cctr_code__dr>").append("<![CDATA[").append(cctrCodeDr.trim()).append("]]>").append("</cctr_code__dr>\r\n");
}
else
{
valueXmlString.append("<cctr_code__dr>").append("<![CDATA[").append(cctrCodeDr).append("]]>").append("</cctr_code__dr>\r\n");
}
acctCodeCr = genericUtility.getColumnValueFromNode("acct_code__cr", currDetail1);
if(acctCodeCr != null && acctCodeCr.length() > 10)
{
valueXmlString.append("<acct_code__cr>").append("<![CDATA[").append(acctCodeCr.trim()).append("]]>").append("</acct_code__cr>\r\n");
}
else
{
valueXmlString.append("<acct_code__cr>").append("<![CDATA[").append(acctCodeCr).append("]]>").append("</acct_code__cr>\r\n");
}
cctrCodeCr = genericUtility.getColumnValueFromNode("cctr_code__cr", currDetail1);
if (cctrCodeCr != null && cctrCodeCr.length() > 4)
{
valueXmlString.append("<cctr_code__cr>").append("<![CDATA[").append( cctrCodeCr.trim()).append("]]>").append("</cctr_code__cr>\r\n");
}
else
{
valueXmlString.append("<cctr_code__cr>").append("<![CDATA[").append( cctrCodeCr).append("]]>").append("</cctr_code__cr>\r\n");
}
//valueXmlString.append("<cctr_code__cr>").append("<![CDATA[").append( checkNull( genericUtility.getColumnValueFromNode("cctr_code__cr", currDetail1)).trim()).append("]]>").append("</cctr_code__cr>\r\n");
//valueXmlString.append("<acct_code__cr>").append("<![CDATA[").append(checkNull( genericUtility.getColumnValueFromNode("acct_code__cr", currDetail1)).trim()).append("]]>").append("</acct_code__cr>\r\n");
//valueXmlString.append("<cctr_code__dr>").append("<![CDATA[").append(checkNull( genericUtility.getColumnValueFromNode("cctr_code__dr", currDetail1)).trim()).append("]]>").append("</cctr_code__dr>\r\n");
//valueXmlString.append("<acct_code__dr>").append("<![CDATA[").append(checkNull( genericUtility.getColumnValueFromNode("acct_code__dr", currDetail1)).trim()).append("]]>").append("</acct_code__dr>\r\n");
valueXmlString.append("<loc_code>").append("<![CDATA[").append(genericUtility.getColumnValueFromNode("loc_code", currDetail1)).append("]]>").append("</loc_code>\r\n");
valueXmlString.append("<rate__clg>").append("<![CDATA[").append(genericUtility.getColumnValueFromNode("rate__clg", currDetail1)).append("]]>").append("</rate__clg>\r\n");
valueXmlString.append("<supp_item__ref>").append("<![CDATA[").append( checkNull(genericUtility.getColumnValueFromNode("supp_item__ref", currDetail1)).trim() ).append("]]>").append("</supp_item__ref>\r\n");
valueXmlString.append("<supp_code__mnfr>").append("<![CDATA[").append( checkNull(genericUtility.getColumnValueFromNode("supp_code__mnfr", currDetail1)).trim()).append("]]>").append("</supp_code__mnfr>\r\n");
valueXmlString.append("<std_cost>").append("<![CDATA[").append(genericUtility.getColumnValueFromNode("std_cost", currDetail1)).append("]]>").append("</std_cost>\r\n");
valueXmlString.append("<varience>").append("<![CDATA[").append(genericUtility.getColumnValueFromNode("varience", currDetail1)).append("]]>").append("</varience>\r\n");
valueXmlString.append("<emp_code__qcaprv>").append("<![CDATA[").append( checkNull(genericUtility.getColumnValueFromNode("emp_code__qcaprv", currDetail1)).trim()).append("]]>").append("</emp_code__qcaprv>\r\n");
valueXmlString.append("<emp_fname>").append("<![CDATA[").append( checkNull(genericUtility.getColumnValueFromNode("emp_fname", currDetail1)).trim()).append("]]>").append("</emp_fname>\r\n");
valueXmlString.append("<emp_mname>").append("<![CDATA[").append( checkNull(genericUtility.getColumnValueFromNode("emp_mname", currDetail1)).trim()).append("]]>").append("</emp_mname>\r\n");
valueXmlString.append("<emp_lname>").append("<![CDATA[").append( checkNull(genericUtility.getColumnValueFromNode("emp_lname", currDetail1)).trim()).append("]]>").append("</emp_lname>\r\n");
//added by kunal on 05/04/13 set request date and dlv date
valueXmlString.append("<req_date>").append("<![CDATA[").append(genericUtility.getColumnValueFromNode("req_date", currDetail1)).append("]]>").append("</req_date>\r\n");
valueXmlString.append("<dlv_date>").append("<![CDATA[").append(genericUtility.getColumnValueFromNode("dlv_date", currDetail1)).append("]]>").append("</dlv_date>\r\n");
valueXmlString.append("</Detail>");
}
}//rate__stduom
......
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