Skip to content

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

adding quantity__alt , conv_qty_alt, rate clg 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@92878 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 6f1dae3e
Show whitespace changes
Inline Side-by-side
Showing with 140 additions and 2 deletions
webitm-dis/ibase/webitm/ejb/dis/adv/DistIssueAct.java
View file @ 4b1829a3
...@@ -23,6 +23,8 @@ import javax.xml.transform.TransformerFactory; ...@@ -23,6 +23,8 @@ import javax.xml.transform.TransformerFactory;
import javax.xml.transform.Transformer; import javax.xml.transform.Transformer;
import ibase.webitm.ejb.dis.DistCommon; import ibase.webitm.ejb.dis.DistCommon;
import ibase.webitm.ejb.fin.FinCommon;
import javax.ejb.Stateless; // added for ejb3 import javax.ejb.Stateless; // added for ejb3
@Stateless // added for ejb3 @Stateless // added for ejb3
...@@ -690,6 +692,20 @@ public class DistIssueAct extends ActionHandlerEJB implements DistIssueActLocal, ...@@ -690,6 +692,20 @@ public class DistIssueAct extends ActionHandlerEJB implements DistIssueActLocal,
java.util.Date mfgDate = null, expDate = null, retestDate = null; java.util.Date mfgDate = null, expDate = null, retestDate = null;
int tranIdListSize = 0, noOfDetails = 0; int tranIdListSize = 0, noOfDetails = 0;
boolean flag = false; boolean flag = false;
//
String unitAlt="";
String sql2="";
PreparedStatement pstmt2= null;
ResultSet rs2 = null;
String priceListClg="",itemCode_1="",lotNo_1="",lotSl_1="",lineNoOrd_1="",unit_1="",locCode_1="";
double rateClg=0;
double qty=0;
DistCommon distcommon= new DistCommon();
ArrayList convAr = null;
double fact = 0, qtOrderAlt=0;
//
try try
{ {
conn = connDriver.getConnectDB("DriverITM"); conn = connDriver.getConnectDB("DriverITM");
...@@ -742,7 +758,7 @@ public class DistIssueAct extends ActionHandlerEJB implements DistIssueActLocal, ...@@ -742,7 +758,7 @@ public class DistIssueAct extends ActionHandlerEJB implements DistIssueActLocal,
valueXmlString.append("<dist_order isSrvCallOnChg='0' >").append("<![CDATA[").append(distOrder.trim()).append("]]>").append("</dist_order>\r\n"); valueXmlString.append("<dist_order isSrvCallOnChg='0' >").append("<![CDATA[").append(distOrder.trim()).append("]]>").append("</dist_order>\r\n");
valueXmlString.append("<line_no_dist_order isSrvCallOnChg='0'>").append("<![CDATA[").append(rs.getString(1).trim()).append("]]>").append("</line_no_dist_order>\r\n"); valueXmlString.append("<line_no_dist_order isSrvCallOnChg='0'>").append("<![CDATA[").append(rs.getString(1).trim()).append("]]>").append("</line_no_dist_order>\r\n");
sql = "SELECT TAX_CLASS, TAX_CHAP, TAX_ENV, CASE WHEN RATE IS NULL THEN 0 ELSE RATE END " sql = "SELECT TAX_CLASS, TAX_CHAP, TAX_ENV, CASE WHEN RATE IS NULL THEN 0 ELSE RATE END, UNIT__ALT "
+"FROM DISTORDER_DET WHERE DIST_ORDER = ? AND LINE_NO = ? "; +"FROM DISTORDER_DET WHERE DIST_ORDER = ? AND LINE_NO = ? ";
pstmt1 = conn.prepareStatement(sql); pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1,distOrder) ; pstmt1.setString(1,distOrder) ;
...@@ -754,6 +770,8 @@ public class DistIssueAct extends ActionHandlerEJB implements DistIssueActLocal, ...@@ -754,6 +770,8 @@ public class DistIssueAct extends ActionHandlerEJB implements DistIssueActLocal,
taxChap = rs1.getString(2); taxChap = rs1.getString(2);
taxEnv = rs1.getString(3); taxEnv = rs1.getString(3);
rate = rs1.getDouble(4); rate = rs1.getDouble(4);
unitAlt = rs1.getString(5);
} }
rs1.close(); rs1.close();
rs1 = null; rs1 = null;
...@@ -783,6 +801,14 @@ public class DistIssueAct extends ActionHandlerEJB implements DistIssueActLocal, ...@@ -783,6 +801,14 @@ public class DistIssueAct extends ActionHandlerEJB implements DistIssueActLocal,
valueXmlString.append("<unit isSrvCallOnChg='0'>").append("<![CDATA[").append(rs.getString(6).trim()).append("]]>").append("</unit>\r\n"); valueXmlString.append("<unit isSrvCallOnChg='0'>").append("<![CDATA[").append(rs.getString(6).trim()).append("]]>").append("</unit>\r\n");
valueXmlString.append("<loc_code isSrvCallOnChg='0'>").append("<![CDATA[").append(rs.getString(9).trim()).append("]]>").append("</loc_code>\r\n"); valueXmlString.append("<loc_code isSrvCallOnChg='0'>").append("<![CDATA[").append(rs.getString(9).trim()).append("]]>").append("</loc_code>\r\n");
qty=Double.parseDouble(rs.getString("quantity"));
itemCode_1=rs.getString("item_code");
lotNo_1=rs.getString("lot_no");
lotSl_1=rs.getString("lot_sl");
lineNoOrd_1= rs.getString(1);
unit_1= rs.getString(6);
locCode_1 = rs.getString(9);
System.out.println("@@@@@@@@@@@@@@@@ 3[qty]::["+qty+"]itemCode_1["+itemCode_1+"]::lotNo_1["+lotNo_1+"]::lotSl_1["+lotSl_1+"]::lineNoOrd_1["+lineNoOrd_1+"]::unit_1["+unit_1+"]::locCode_1["+locCode_1+"]");
if (rate == 0) if (rate == 0)
{ {
sql = "SELECT PRICE_LIST FROM DISTORDER WHERE DIST_ORDER = ? "; sql = "SELECT PRICE_LIST FROM DISTORDER WHERE DIST_ORDER = ? ";
...@@ -801,6 +827,7 @@ public class DistIssueAct extends ActionHandlerEJB implements DistIssueActLocal, ...@@ -801,6 +827,7 @@ public class DistIssueAct extends ActionHandlerEJB implements DistIssueActLocal,
rate = pickRate(priceList, tranDate, rs.getString("ITEM_CODE"), rs.getString("LOT_NO"),'D'); 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"); valueXmlString.append("<rate isSrvCallOnChg='0'>").append("<![CDATA[").append(rate).append("]]>").append("</rate>\r\n");
valueXmlString.append("<lot_no isSrvCallOnChg='0'>").append("<![CDATA[").append(rs.getString(3).trim()).append("]]>").append("</lot_no>\r\n"); valueXmlString.append("<lot_no isSrvCallOnChg='0'>").append("<![CDATA[").append(rs.getString(3).trim()).append("]]>").append("</lot_no>\r\n");
valueXmlString.append("<lot_sl isSrvCallOnChg='0'>").append("<![CDATA[").append(rs.getString(4).trim()).append("]]>").append("</lot_sl>\r\n"); valueXmlString.append("<lot_sl isSrvCallOnChg='0'>").append("<![CDATA[").append(rs.getString(4).trim()).append("]]>").append("</lot_sl>\r\n");
...@@ -910,6 +937,116 @@ public class DistIssueAct extends ActionHandlerEJB implements DistIssueActLocal, ...@@ -910,6 +937,116 @@ public class DistIssueAct extends ActionHandlerEJB implements DistIssueActLocal,
valueXmlString.append("<dimension isSrvCallOnChg='0'>").append("<![CDATA[").append(dimension).append("]]>").append("</dimension>\r\n"); valueXmlString.append("<dimension isSrvCallOnChg='0'>").append("<![CDATA[").append(dimension).append("]]>").append("</dimension>\r\n");
valueXmlString.append("<pallet_wt isSrvCallOnChg='0'>").append("<![CDATA[").append(palletWt).append("]]>").append("</pallet_wt>\r\n"); valueXmlString.append("<pallet_wt isSrvCallOnChg='0'>").append("<![CDATA[").append(palletWt).append("]]>").append("</pallet_wt>\r\n");
// cpatil start
System.out.println("@@@@@@@@ cpatil start @@@@@@@["+distOrder+"]");
// 17-01-05 manoharan rate__clg from picelist price_list__clg
// mdist_order = dw_detedit[ii_currformno].getitemstring(1,"dist_order")
sql2 = " select price_list__clg from distorder where dist_order = ? ";
pstmt2 = conn.prepareStatement(sql2);
pstmt2.setString(1,distOrder);
rs2 = pstmt.executeQuery();
if (rs2.next())
{
priceListClg=rs2.getString(1);
}
pstmt2.close();
rs2.close();
pstmt2 = null;
rs2 = null;
if ((priceListClg != null) && ( priceListClg.trim().length() > 0 ))
{
sql2 = " select count(1) from pricelist where price_list = ? " +
" and list_type = 'I' ";
pstmt2 = conn.prepareStatement(sql2);
pstmt2.setString(1,priceListClg);
rs2 = pstmt.executeQuery();
if (rs2.next())
{
cnt=rs2.getInt(1);
}
pstmt2.close();
rs2.close();
pstmt2 = null;
rs2 = null;
System.out.println("@@@@@@ 1 qty::"+ qty);
if ( cnt > 0 )
{
if ( lotSl == null )
{
lotSl = "";
}
System.out.println("@@@@@@@@@@@@@@@@ testtttttttt[qty]::["+qty+"]itemCode_1["+itemCode_1+"]::lotNo_1["+lotNo_1+"]::lotSl_1["+lotSl_1+"]::lineNoOrd_1["+lineNoOrd_1+"]::unit_1["+unit_1+"]::locCode_1["+locCode_1+"]");
rateClg = distcommon.pickRate( priceListClg, tranDate, itemCode, siteCode.trim() +"~t"+ locCode_1.trim() +"~t"+ lotNo_1.trim() + "~t" + lotSl_1.trim(),"I", qty , conn);
//mrate_clg = i_nvo_gbf_func.gbf_pick_rate(mprice_list__clg,mtran_date,mitem_code,msite_code+'~t'+mloc_code+'~t'+mlot_no+'~t'+mlot_sl,'I',lc_qty)
System.out.println("@@@@@1::rateClg["+rateClg+"]");
}
else
{
//rate = pickRate(priceList, tranDate, rs.getString("item_code"), rs.getString("lot_no"),'L');
//mrate = i_nvo_gbf_func.gbf_pick_rate(mprice_list, mtran_date, mitem_code, mlot_no,'L') //Commented on 07/04/2k5 by Ruchira
rateClg = distcommon.pickRate( priceListClg, tranDate, itemCode_1, lotNo_1,"I", qty, conn );
//mrate_clg = i_nvo_gbf_func.gbf_pick_rate(mprice_list__clg, mtran_date, mitem_code, mlot_no,'I',lc_qty) //Added on 07/04/2k5 by Ruchira
System.out.println("@@@@@2::rateClg["+rateClg+"]");
}
valueXmlString.append("<rate__clg isSrvCallOnChg='0'>").append("<![CDATA[").append(rateClg).append("]]>").append("</rate__clg>\r\n");
}
else
{
sql2 = " Select rate__clg From distorder_det Where dist_order = ? and line_no = ? " ;
pstmt2 = conn.prepareStatement(sql2);
pstmt2.setString(1,distOrder);
pstmt2.setString(2,lineNoOrd_1); //lineNoOrd
rs2 = pstmt.executeQuery();
if (rs2.next())
{
rateClg = rs2.getInt("rate__clg");
}
pstmt2.close();
rs2.close();
pstmt2 = null;
rs2 = null;
System.out.println("@@@@@3::rateClg["+rateClg+"]");
// mrate = 0
if ( rateClg == 0 )
{ ////Ruchira 19/05/2k6, Added if condition to change the rate entered by user only if price list is defined for the item.
if ( priceList != null && priceList.trim().length() > 0 )
{
valueXmlString.append("<rate__clg isSrvCallOnChg='0'>").append("<![CDATA[").append(rate).append("]]>").append("</rate__clg>\r\n");
//w_detedit[ii_currformno].setitem(1,"rate__clg",mrate) // added by neelam 11-08-03
}
else
{
valueXmlString.append("<rate__clg isSrvCallOnChg='0'>").append("<![CDATA[").append(rateClg).append("]]>").append("</rate__clg>\r\n");
// dw_detedit[ii_currformno].setitem(1,"rate__clg",mrate_clg) // added by neelam 11-08-03
}
}
}
// added by cpatil as per sugestion
System.out.println("@@@@@1::unitAlt["+unitAlt+"]::::::unit:["+unit_1+"]"); //qty_order__alt quantity__alt
valueXmlString.append("<qty_order__alt isSrvCallOnChg='0'>").append("<![CDATA[").append( qty ).append("]]>").append("</qty_order__alt>\r\n");
if( unitAlt.equalsIgnoreCase(unit_1))
{
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(unit, unitStd, itemCode, quantity, convFact, conn);
fact = Double.parseDouble( convAr.get(0).toString() );
qtOrderAlt = Double.parseDouble( convAr.get(1).toString() );
System.out.println("@@@@@@@@ conv__qty__alt::fact["+fact+"]:::::qty_order__alt::qtOrderAlt["+qtOrderAlt+"]");
valueXmlString.append("<conv__qty__alt isSrvCallOnChg='0'>").append("<![CDATA[").append( fact ).append("]]>").append("</conv__qty__alt>\r\n");
valueXmlString.append("<qty_order__alt isSrvCallOnChg='0'>").append("<![CDATA[").append( qtOrderAlt ).append("]]>").append("</qty_order__alt>\r\n");
}
// cpatil end
valueXmlString.append("</Detail>\r\n"); valueXmlString.append("</Detail>\r\n");
cnt++; cnt++;
}//end while }//end while
...@@ -918,6 +1055,7 @@ public class DistIssueAct extends ActionHandlerEJB implements DistIssueActLocal, ...@@ -918,6 +1055,7 @@ public class DistIssueAct extends ActionHandlerEJB implements DistIssueActLocal,
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
valueXmlString.append("</Root>\r\n"); valueXmlString.append("</Root>\r\n");
} }
catch (Exception e) catch (Exception e)
{ {
......
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