Skip to content

B
business-java
Commit 3d424479 authored by agaikwad's avatar agaikwad
Browse files
Options

discount set from sorditem when schem is define 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@106204 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 105cf137
Hide whitespace changes
Inline Side-by-side
Showing with 95 additions and 5 deletions
webitm-dis/ibase/webitm/ejb/dis/adv/DespatchAct.java
View file @ 3d424479
...@@ -6886,12 +6886,13 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D ...@@ -6886,12 +6886,13 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
else if(currentColumn.equalsIgnoreCase("exp_lev")) else if(currentColumn.equalsIgnoreCase("exp_lev"))
{ {
String mitemflg=""; String mitemflg="";
String lstaxclass="" ,lstaxchap="",lstaxenv="",lstaxchapsoitem="";
mVal1 = genericUtility.getColumnValue("exp_lev",dom); mVal1 = genericUtility.getColumnValue("exp_lev",dom);
mcode = genericUtility.getColumnValue("line_no__sord",dom);///genericUtility. mcode = genericUtility.getColumnValue("line_no__sord",dom);///genericUtility.
mVal = genericUtility.getColumnValue("sord_no",dom); mVal = genericUtility.getColumnValue("sord_no",dom);
System.out.println("exp_lev CASE....:"+mVal1+"..."+mcode+"..."+mVal); System.out.println("exp_lev CASE....:"+mVal1+"..."+mcode+"..."+mVal);
sql = "Select site_code, unit__std, conv__qty_stduom, unit,item_flg from sorddet " sql = "Select site_code, unit__std, conv__qty_stduom, unit,item_flg,tax_class,tax_chap,tax_env from sorddet "
+"where sale_order = ? and line_no = ? "; +"where sale_order = ? and line_no = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,mVal); pstmt.setString(1,mVal);
...@@ -6905,6 +6906,9 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D ...@@ -6905,6 +6906,9 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
mNum2 = rs.getDouble("conv__qty_stduom"); mNum2 = rs.getDouble("conv__qty_stduom");
mUnit = rs.getString("unit"); mUnit = rs.getString("unit");
mitemflg = rs.getString("item_flg"); mitemflg = rs.getString("item_flg");
lstaxclass = rs.getString("tax_class");
lstaxchap = rs.getString("tax_chap");
lstaxenv = rs.getString("tax_env");
} }
rs.close(); rs.close();
...@@ -6912,7 +6916,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D ...@@ -6912,7 +6916,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
//Added by Abhijit //Added by Abhijit
sql = "Select item_code__ord, quantity, item_code, qty_alloc, nature from sorditem " sql = "Select item_code__ord, quantity, item_code, qty_alloc, nature, tax_chap from sorditem "
+" where sale_order = ? and line_no = ? and " +" where sale_order = ? and line_no = ? and "
+" exp_lev = ? "; +" exp_lev = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -6929,6 +6933,8 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D ...@@ -6929,6 +6933,8 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
mdescr1 = rs.getString("item_code"); mdescr1 = rs.getString("item_code");
mNum1 = rs.getDouble("qty_alloc"); mNum1 = rs.getDouble("qty_alloc");
nature=rs.getString("nature"); nature=rs.getString("nature");
lstaxchapsoitem = rs.getString("tax_chap");
} }
rs.close(); rs.close();
rs = null; rs = null;
...@@ -6937,6 +6943,13 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D ...@@ -6937,6 +6943,13 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
System.out.println(".:nature" +nature); System.out.println(".:nature" +nature);
System.out.println(".:item_code" +mdescr1); System.out.println(".:item_code" +mdescr1);
System.out.println(".:lstaxchapsoitem" +lstaxchapsoitem);
System.out.println(".:lstaxchap" +lstaxchap);
if("B".equalsIgnoreCase(mitemflg))
{
System.out.println("Match Item Flag");
lstaxchap = lstaxchapsoitem;
}
sql = "Select descr from item where item_code = ? "; sql = "Select descr from item where item_code = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,mdescr1); pstmt.setString(1,mdescr1);
...@@ -7317,10 +7330,21 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D ...@@ -7317,10 +7330,21 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
setNodeValue( dom, "line_type", "S" ); setNodeValue( dom, "line_type", "S" );
} }
//gbf_set_rate_conversion() //miss13 function //gbf_set_rate_conversion() //miss13 function
//Added by Abhijit Gaikwad on 09/07/17
valueXmlString.append("<tax_class isSrvCallOnChg='0'>").append("<![CDATA[").append(lstaxclass).append("]]>").append("</tax_class>\r\n");
setNodeValue( dom, "tax_class", lstaxclass );
valueXmlString.append("<tax_chap isSrvCallOnChg='0'>").append("<![CDATA[").append(lstaxchap).append("]]>").append("</tax_chap>\r\n");
setNodeValue( dom, "tax_chap", lstaxchap );
valueXmlString.append("<tax_env isSrvCallOnChg='0'>").append("<![CDATA[").append(lstaxenv).append("]]>").append("</tax_env>\r\n");
setNodeValue( dom, "tax_env", lstaxenv );
//End
} }
else if(currentColumn.equalsIgnoreCase("quantity")) else if(currentColumn.equalsIgnoreCase("quantity"))
{ {
String lsexplev="";
smNum = genericUtility.getColumnValue("quantity",dom); smNum = genericUtility.getColumnValue("quantity",dom);
if(smNum != null && smNum.trim().length() > 0) if(smNum != null && smNum.trim().length() > 0)
{ {
...@@ -7332,7 +7356,9 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D ...@@ -7332,7 +7356,9 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
mVal1 = genericUtility.getColumnValue("unit__std",dom); mVal1 = genericUtility.getColumnValue("unit__std",dom);
itemCode = genericUtility.getColumnValue("item_code",dom); itemCode = genericUtility.getColumnValue("item_code",dom);
smNum1 = genericUtility.getColumnValue("conv__qty_stduom",dom); smNum1 = genericUtility.getColumnValue("conv__qty_stduom",dom);
lsexplev = genericUtility.getColumnValue("exp_lev",dom);
System.out.println("quantity case.. :"+mVal+" "+mVal1+" "+itemCode+" "+mNum +" "+smNum1); System.out.println("quantity case.. :"+mVal+" "+mVal1+" "+itemCode+" "+mNum +" "+smNum1);
System.out.println("quantity case..lsexplev.. :"+lsexplev);
//itemCode = genericUtility.getColumnValue("item_code",dom); //itemCode = genericUtility.getColumnValue("item_code",dom);
siteCode = genericUtility.getColumnValue("site_code",dom); siteCode = genericUtility.getColumnValue("site_code",dom);
...@@ -7406,9 +7432,8 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D ...@@ -7406,9 +7432,8 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
custCode = genericUtility.getColumnValue("cust_code",dom1); custCode = genericUtility.getColumnValue("cust_code",dom1);
saleOrder = genericUtility.getColumnValue("sord_no",dom); saleOrder = genericUtility.getColumnValue("sord_no",dom);
lineNo = genericUtility.getColumnValue("line_no__sord",dom); lineNo = genericUtility.getColumnValue("line_no__sord",dom);
String lsitemflg="";//Added by Abhijit
sql = "select site_code ,pack_code,item_flg from sorddet where sale_order = ? and line_no = ?";
sql = "select site_code ,pack_code from sorddet where sale_order = ? and line_no = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,saleOrder); pstmt.setString(1,saleOrder);
pstmt.setString(2,lineNo); pstmt.setString(2,lineNo);
...@@ -7418,11 +7443,14 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D ...@@ -7418,11 +7443,14 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
{ {
siteCodeDet = rs.getString("site_code"); siteCodeDet = rs.getString("site_code");
packCode = rs.getString("pack_code"); packCode = rs.getString("pack_code");
lsitemflg= rs.getString("item_flg");
} }
rs.close(); rs.close();
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
System.out.println("item_flg["+lsitemflg+"]");
//noArt = distCommon.getNoArt(siteCodeDet,custCode,itemCode,packCode,mNum,'B',acShipperQty,acIntQty ,conn); //noArt = distCommon.getNoArt(siteCodeDet,custCode,itemCode,packCode,mNum,'B',acShipperQty,acIntQty ,conn);
//System.out.println("manohar 15/10/10 noArt from distCommon [" + noArt + "]"); //System.out.println("manohar 15/10/10 noArt from distCommon [" + noArt + "]");
////noArt = gf_get_no_art(ls_site_code_det,ls_cust_code,itemCode,ls_pack_code,mNum,'B',ac_shipper_qty,ac_int_qty) //miss15 function ////noArt = gf_get_no_art(ls_site_code_det,ls_cust_code,itemCode,ls_pack_code,mNum,'B',ac_shipper_qty,ac_int_qty) //miss15 function
...@@ -7624,10 +7652,72 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D ...@@ -7624,10 +7652,72 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
System.out.println("discAmt from getChangeSord if priceVar is D 9 ::::::::" + discAmt); System.out.println("discAmt from getChangeSord if priceVar is D 9 ::::::::" + discAmt);
valueXmlString.append("<disc_amt isSrvCallOnChg='0'>").append("<![CDATA[").append(discAmt).append("]]>").append("</disc_amt>\r\n"); valueXmlString.append("<disc_amt isSrvCallOnChg='0'>").append("<![CDATA[").append(discAmt).append("]]>").append("</disc_amt>\r\n");
setNodeValue( dom, "disc_amt", discAmt ); setNodeValue( dom, "disc_amt", discAmt );
}
double disccsorditem=0;
String lsnature="",lslinetype="",disccsorditem1="";
// Added by Abhijit 10/07/2017 , discount set from sorditem when schem is define
if("B".equalsIgnoreCase(lsitemflg))
{
sql="select nature,line_type,discount from sorditem where sale_order= ? and line_no= ? and exp_lev=? and line_type <> 'B' ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,mVal);
pstmt.setString(2,lineNo);
pstmt.setString(3,lsexplev);
rs = pstmt.executeQuery();
if(rs.next())
{
lsnature=rs.getString("nature");
lslinetype =rs.getString("line_type");
disccsorditem1 = rs.getString("discount");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
System.out.println("disccsorditem1 ["+disccsorditem1 +"]");
if(disccsorditem1 != null && disccsorditem1.trim().length() > 0)
{
disccsorditem = Double.parseDouble(disccsorditem1);
}
else
{
disccsorditem = 0;
}
System.out.println("disccsorditem["+disccsorditem+"]");
if(disccsorditem > 0 && "C".equalsIgnoreCase(lsnature))
{
discAmt=(disccsorditem/100) * (mNum1 * mNum2);
System.out.println("disccsorditem from getChangeSord if lsitemflg is B ::::::::" + disccsorditem);
System.out.println("mNum1 from getChangeSord if lsitemflg is B ::::::::" + mNum1);
System.out.println("mNum2 from getChangeSord if lsitemflg is B ::::::::" + mNum2);
System.out.println("discAmt from getChangeSord if lsitemflg is B::::::::" + discAmt);
valueXmlString.append("<disc_amt isSrvCallOnChg='0'>").append("<![CDATA[").append(discAmt).append("]]>").append("</disc_amt>\r\n");
setNodeValue( dom, "disc_amt", discAmt );
valueXmlString.append("<discount isSrvCallOnChg='0'>").append("<![CDATA[").append(disccsorditem).append("]]>").append("</discount>\r\n");
setNodeValue( dom, "discount", disccsorditem );
}
} }
//End Abhijit Gaikwad 10/07/17
/*if ls_item_flg = 'B' then
select nature,line_type,discount into :ls_nature,:ls_line_type,:lc_discount from sorditem where sale_order = :mVal and line_no = :ls_line_no
and exp_lev = :ls_explev
and line_type <> 'B';
if isnull(lc_discount) then lc_discount = 0
if lc_discount > 0 and ls_nature = 'C' then
lc_disc_amt = (lc_discount/100) * (mNum1 * mNum2)
dw_detedit[ii_currformno].SetItem(1,"disc_amt", lc_disc_amt)
dw_detedit[ii_currformno].SetItem(1,"discount", lc_discount)
end if
end if*/
} }
else if(currentColumn.equalsIgnoreCase("lot_no") || currentColumn.equalsIgnoreCase("lot_sl")) else if(currentColumn.equalsIgnoreCase("lot_no") || currentColumn.equalsIgnoreCase("lot_sl"))
{ {
//disc_amt
String unitstd=""; String unitstd="";
itemCode = genericUtility.getColumnValue("item_code",dom); itemCode = genericUtility.getColumnValue("item_code",dom);
siteCode = genericUtility.getColumnValue("site_code",dom); siteCode = genericUtility.getColumnValue("site_code",dom);
......
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