Commit 68a40cad authored by ssalve's avatar ssalve

Sarita : changed done for proj_code on 03 APR2019

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@199143 ce508802-f39f-4f6c-b175-0d175dae99d5
parent dfa3eb09
......@@ -6171,10 +6171,6 @@ public class PoReceiptIc extends ValidatorEJB implements PoReceiptIcLocal,PoRec
valueXmlString.append("<reas_code protect =\"1\">").append("<![CDATA[]]>").append("</reas_code>");
//gbf_itemchg_modifier_ds(dw_detedit[ii_currformno],"mfg_date","protect","0") //Added by fatema - 05/06/2007
//gbf_itemchg_modifier_ds(dw_detedit[ii_currformno],"expiry_date","protect","0") //Added by fatema - 05/06/2007
//Commented and Added by sarita to set add proj_code and set to header on 29 MARCH 2019 [START]
projectCode = checkNull(genericUtility.getColumnValue("proj_code", dom1));
valueXmlString.append("<proj_code>").append("<![CDATA[" + projectCode + "]]>").append("</proj_code>");
//Commented and Added by sarita to set add proj_code and set to header on 29 MARCH 2019 [END]
} //remaining code
else if (currentColumn.trim().equalsIgnoreCase("itm_defaultedit"))
{
......@@ -6408,8 +6404,8 @@ public class PoReceiptIc extends ValidatorEJB implements PoReceiptIcLocal,PoRec
valueXmlString.append("<line_no__ord >").append("<![CDATA[" + mPordLine + "]]>").append("</line_no__ord>");
//26 may changes
sql="Select Item_code,(quantity - (case when dlv_qty is null then 0 else dlv_qty end)),unit, " +
//Commented and added by sarita to set proj_code in sql on 03 APRIL 2019 [START]
/* sql="Select Item_code,(quantity - (case when dlv_qty is null then 0 else dlv_qty end)),unit, " +
"rate, discount, tax_amt, tot_amt, loc_code, tax_class, tax_chap," +
" tax_env, conv__qty_stduom, conv__rtuom_stduom, unit__rate ,acct_code__dr," +
" cctr_code__dr,acct_code__cr,cctr_code__cr,remarks,rate__stduom , specific_instr, " +
......@@ -6418,7 +6414,18 @@ public class PoReceiptIc extends ValidatorEJB implements PoReceiptIcLocal,PoRec
"acct_code__prov_dr, acct_code__prov_cr, cctr_code__prov_dr, cctr_code__prov_cr,"+
"(quantity - (case when dlv_qty is null then 0 else dlv_qty end)) as lcodrqty," +
" form_no, duty_paid,anal_code ,quantity " +
" From PordDet Where Purc_order = ? and Line_no =? ";
" From PordDet Where Purc_order = ? and Line_no =? ";*/
sql="Select Item_code,(quantity - (case when dlv_qty is null then 0 else dlv_qty end)),unit, " +
"rate, discount, tax_amt, tot_amt, loc_code, tax_class, tax_chap," +
" tax_env, conv__qty_stduom, conv__rtuom_stduom, unit__rate ,acct_code__dr," +
" cctr_code__dr,acct_code__cr,cctr_code__cr,remarks,rate__stduom , specific_instr, " +
"special_instr, pack_instr, rate__clg, supp_code__mnfr, item_code__mfg,spec_ref," +
"std_rate,dept_code,benefit_type,licence_no," +
"acct_code__prov_dr, acct_code__prov_cr, cctr_code__prov_dr, cctr_code__prov_cr,"+
"(quantity - (case when dlv_qty is null then 0 else dlv_qty end)) as lcodrqty," +
" form_no, duty_paid,anal_code ,quantity,proj_code " +
" From PordDet Where Purc_order = ? and Line_no =? ";
//Commented and added by sarita to set proj_code in sql on 03 APRIL 2019 [END]
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, mPordNo);
pstmt.setString(2, mPordLine);
......@@ -6465,12 +6472,20 @@ public class PoReceiptIc extends ValidatorEJB implements PoReceiptIcLocal,PoRec
//26 may changes
mOrdQty = rs.getDouble("quantity");
lcOdrQty = rs.getDouble("lcodrqty");
//Added by sarita to get ProjectCode Value on 03 APR 2019 [START]
projectCode = checkNull(rs.getString("proj_code"));
System.out.println("PROJECTCODEDETAIL :: ["+projectCode+"]");
//Added by sarita to get ProjectCode Value on 03 APR 2019 [END]
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
//<quantity
//Added by sarita to get ProjectCode Value on 03 APR 2019 [START]
valueXmlString.append("<proj_code protect =\"1\">").append("<![CDATA[" + projectCode + "]]>").append("</proj_code>");
//Added by sarita to get ProjectCode Value on 03 APR 2019 [END]
valueXmlString.append("<anal_code >").append("<![CDATA[" + lsanalcode + "]]>").append("</anal_code>");
if(lsanalcode != null && lsanalcode.trim().length() >0)
{
......
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