Skip to content

B
business-java
Commit 4da8e0ea authored by cpatil's avatar cpatil
Browse files
Options

update for rate 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@92933 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 7bf1a833
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 7 deletions
webitm-dis/ibase/webitm/ejb/dis/adv/DistIssueAct.java
View file @ 4da8e0ea
......@@ -704,6 +704,7 @@ public class DistIssueAct extends ActionHandlerEJB implements DistIssueActLocal,
ArrayList convAr = null;
double fact = 0, qtOrderAlt=0;
String type="";
//
try
......@@ -825,7 +826,19 @@ public class DistIssueAct extends ActionHandlerEJB implements DistIssueActLocal,
pstmt1.close();
pstmt1 = null;
rate = pickRate(priceList, tranDate, rs.getString("ITEM_CODE"), rs.getString("LOT_NO"),'D');
// added by cpatil
System.out.println("@@@@@@@@ testttttttt");
type = Character.toString( priceListType(priceList) );
System.out.println("@@@@@@@@ type:["+type+"]");
if("I".equalsIgnoreCase(type))
{
rate = pickRate(priceList, tranDate, rs.getString("ITEM_CODE"), siteCode +"\t"+rs.getString("LOC_CODE")+"\t"+rs.getString("LOT_NO")+"\t"+rs.getString("lot_sl"),'I'); // D
}
else
{
rate = pickRate(priceList, tranDate, rs.getString("ITEM_CODE"), rs.getString("LOT_NO"),'D');
}
}
valueXmlString.append("<rate isSrvCallOnChg='0'>").append("<![CDATA[").append(rate).append("]]>").append("</rate>\r\n");
......@@ -1036,8 +1049,8 @@ public class DistIssueAct extends ActionHandlerEJB implements DistIssueActLocal,
valueXmlString.append("<conv__qty__alt isSrvCallOnChg='0'>").append("<![CDATA[").append( "1" ).append("]]>").append("</conv__qty__alt>\r\n");
}
else
{
convAr= distcommon.convQtyFactor(unitAlt, unit_1, itemCode_1, qty, fact, conn);
{
convAr= distcommon.convQtyFactor(unitAlt, unit_1, itemCode_1, qty, fact, conn);
//convAr = distCommon.convQtyFactor(unit, unitStd, itemCode, quantity, convFact, conn);
fact = Double.parseDouble( convAr.get(0).toString() );
qtOrderAlt = Double.parseDouble( convAr.get(1).toString() );
......@@ -1963,18 +1976,19 @@ public class DistIssueAct extends ActionHandlerEJB implements DistIssueActLocal,
{
count = rs2.getInt(1);
}
//System.out.println("count :" + count);
System.out.println("count :" + count);
if (count == 0)
{
rate2 = pickRate(priceList, tranDate, itemCode, rs.getString(1),'D');
//System.out.println("rate2 :" + rate2);
System.out.println("rate2 :" + rate2);
}
else
{
tabValue = siteCode + "\t" + rs.getString(12) + "\t" + rs.getString(1) + "\t";
//System.out.println("tabValue :" + tabValue);
System.out.println("tabValue :[" + tabValue+"]");
rate2 = pickRate(priceList, tranDate, itemCode, tabValue, 'I');
//System.out.println("rate2 :" + rate2);
System.out.println("rate2 :" + rate2);
}
/*if (rate2 <= 0)//Commented as during conversion it was uncommented in PB but at the time of Source walkthrough it was commented in PB
{
......
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