Skip to content

B
business-java
Commit bc9713ff authored by dsawant's avatar dsawant
Browse files
Options

following all values set 

tax_amt,Net_amt,retest_date,rate_clg,cost_rate,Rate_alt,conv_rate_alt,shelf_life_type
SIte_code_mfg,Mfg_date,Expiry_date
Net_amt,conf_date,Gp_date


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@96428 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 4a547b7d
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 22 deletions
webitm-dis/ibase/webitm/ejb/dis/DistIssWiz.java
View file @ bc9713ff
......@@ -4,7 +4,7 @@
Author: Deepak Sawant.
********************************************************/
package ibase.webitm.ejb.dis;
package ibase.webitm.ejb.mfg;
import ibase.system.config.ConnDriver;
import ibase.webitm.ejb.ITMDBAccessEJB;
......@@ -745,12 +745,13 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
int minShelfLife = 0, noArt1 = 0;
int mLineNoDist =0;
double qtyConfirm =0,qtyShipped =0,lcQtyOrderAlt =0,lcFact =0;
double ratefd =0,ratealt= 0;
String siteCodeMfg = "", sundryCode = "";
String priceList = "", tabValue = "", priceListClg = "", chkDate = "";
String res = "", locCodeDamaged = "",availableYn ="";
String checkIntegralQty = "", tranTypeParent ="";
String rate1 = "";
String active = "",errCode ="",sql2 ="",noArt ="",itemDescr="";
String active = "",errCode ="",sql2 ="",noArt ="",itemDescr="",shelflifetype="";
String errString ="",siteCodeShip ="";
String lotSl ="",rateClg ="",rateFmDistOrd = "";
java.util.Date chkDate1 = null;
......@@ -890,8 +891,10 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
{
currAppdate = simpleDateFormat.format(currDate);
}
valueXmlString.append("<tran_date><![CDATA["+currAppdate+"]]></tran_date>");
valueXmlString.append("<eff_date><![CDATA["+currAppdate+"]]></eff_date>");
valueXmlString.append("<tran_date>").append("<![CDATA[").append((rs.getDate("tran_date") == null) ? "":sdf.format(rs.getDate("tran_date"))).append("]]>").append("</tran_date>");
valueXmlString.append("<eff_date>").append("<![CDATA[").append((rs.getDate("eff_date") == null) ? "":sdf.format(rs.getDate("eff_date"))).append("]]>").append("</eff_date>");
/*valueXmlString.append("<tran_date><![CDATA["+currAppdate+"]]></tran_date>");
valueXmlString.append("<eff_date><![CDATA["+currAppdate+"]]></eff_date>");*/
valueXmlString.append("<dist_order><![CDATA["+(rs.getString("dist_order")==null?"":rs.getString("dist_order").trim())+"]]></dist_order>");
valueXmlString.append("<site_code><![CDATA["+(rs.getString("site_code")==null?"":rs.getString("site_code").trim())+"]]></site_code>");
valueXmlString.append("<site_code__dlv><![CDATA["+(rs.getString("SITE_CODE__DLV")==null?"":rs.getString("SITE_CODE__DLV").trim())+"]]></site_code__dlv>");
......@@ -905,8 +908,10 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
valueXmlString.append("<net_weight><![CDATA["+(rs.getDouble("net_weight"))+"]]></net_weight>");
valueXmlString.append("<frt_amt><![CDATA[0]]></frt_amt>");
valueXmlString.append("<amount><![CDATA[0]]></amount>");
valueXmlString.append("<tax_amt><![CDATA[0]]></tax_amt>");
valueXmlString.append("<net_amt><![CDATA[0]]></net_amt>");
/*valueXmlString.append("<tax_amt><![CDATA[0]]></tax_amt>");
valueXmlString.append("<net_amt><![CDATA[0]]></net_amt>");*/
valueXmlString.append("<tax_amt><![CDATA["+rs.getDouble("tax_amt")+"]]></tax_amt>");
valueXmlString.append("<net_amt><![CDATA["+rs.getDouble("net_amt")+"]]></net_amt>");
valueXmlString.append("<remarks>").append("<![CDATA[" + (rs.getString("remarks")==null?"":rs.getString("remarks").trim()) + "]]>").append("</remarks>");
valueXmlString.append("<frt_type><![CDATA[T]]></frt_type>");
valueXmlString.append("<chg_user><![CDATA["+(rs.getString("CHG_USER")==null?"":rs.getString("CHG_USER").trim())+"]]></chg_user>");
......@@ -920,12 +925,12 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
valueXmlString.append("<currency_descr><![CDATA[]]></currency_descr>");
valueXmlString.append("<confirmed><![CDATA[N]]></confirmed>");
valueXmlString.append("<loc_code__git><![CDATA["+(rs.getString("loc_code__git")==null?"":rs.getString("loc_code__git"))+"]]></loc_code__git>");
valueXmlString.append("<conf_date><![CDATA["+currAppdate+"]]></conf_date>");
valueXmlString.append("<conf_date>").append("<![CDATA[").append((rs.getDate("conf_date") == null) ? "":sdf.format(rs.getDate("conf_date"))).append("]]>").append("</conf_date>");
valueXmlString.append("<no_art><![CDATA["+(rs.getDouble("no_art"))+"]]></no_art>");
valueXmlString.append("<trans_mode>").append("<![CDATA[" + (rs.getString("trans_mode")==null?"":rs.getString("trans_mode").trim()) + "]]>").append("</trans_mode>");
valueXmlString.append("<gp_no><![CDATA[]]></gp_no>");
valueXmlString.append("<gp_date/>");
valueXmlString.append("<conf_passwd/>");
valueXmlString.append("<gp_date>").append("<![CDATA[").append((rs.getDate("gp_date") == null) ? "":sdf.format(rs.getDate("gp_date"))).append("]]>").append("</gp_date>");
valueXmlString.append("<conf_passwd/>");
valueXmlString.append("<order_type><![CDATA["+(rs.getString("ORDER_TYPE")==null?"":rs.getString("ORDER_TYPE").trim())+"]]></order_type>");
valueXmlString.append("<gp_ser><![CDATA[I]]></gp_ser>");
valueXmlString.append("<ref_no><![CDATA[]]></ref_no>");
......@@ -942,8 +947,8 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
valueXmlString.append("<discount><![CDATA[0]]></discount>");
valueXmlString.append("<permit_no><![CDATA[]]></permit_no>");
valueXmlString.append("<shipment_id><![CDATA[]]></shipment_id>");
valueXmlString.append("<curr_code__frt><![CDATA[ ]]></curr_code__frt>");
valueXmlString.append("<exch_rate__frt><![CDATA[]]></exch_rate__frt>");
valueXmlString.append("<curr_code__frt><![CDATA["+(rs.getString("curr_code__frt")==null?"":rs.getString("curr_code__frt").trim())+"]]></curr_code__frt>");
valueXmlString.append("<exch_rate__frt><![CDATA["+rs.getDouble("exch_rate__frt")+"]]></exch_rate__frt>");
valueXmlString.append("<currency_descr__frt><![CDATA[]]></currency_descr__frt>");
valueXmlString.append("<rd_permit_no><![CDATA[]]></rd_permit_no>");
valueXmlString.append("<dc_no><![CDATA[]]></dc_no>");
......@@ -1015,6 +1020,7 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
valueXmlString.append("<tran_id/>");
valueXmlString.append("<tran_date><![CDATA["+currAppdate+"]]></tran_date>");
valueXmlString.append("<eff_date><![CDATA["+currAppdate+"]]></eff_date>");
valueXmlString.append("<gp_date><![CDATA["+currAppdate+"]]></gp_date>");
valueXmlString.append("<dist_order><![CDATA["+distOrder+"]]></dist_order>");
valueXmlString.append("<site_code><![CDATA["+(rs.getString("SITE_CODE__SHIP")==null?"":rs.getString("SITE_CODE__SHIP").trim())+"]]></site_code>");
valueXmlString.append("<site_code__dlv><![CDATA["+(rs.getString("SITE_CODE__DLV")==null?"":rs.getString("SITE_CODE__DLV").trim())+"]]></site_code__dlv>");
......@@ -1028,8 +1034,10 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
valueXmlString.append("<net_weight><![CDATA[0]]></net_weight>");
valueXmlString.append("<frt_amt><![CDATA[0]]></frt_amt>");
valueXmlString.append("<amount><![CDATA[0]]></amount>");
valueXmlString.append("<tax_amt><![CDATA[0]]></tax_amt>");
valueXmlString.append("<net_amt><![CDATA[0]]></net_amt>");
/* valueXmlString.append("<tax_amt><![CDATA[0]]></tax_amt>");
valueXmlString.append("<net_amt><![CDATA[0]]></net_amt>");*/
valueXmlString.append("<tax_amt><![CDATA["+rs.getDouble("tax_amt")+"]]></tax_amt>");
valueXmlString.append("<net_amt><![CDATA["+rs.getDouble("net_amt")+"]]></net_amt>");
valueXmlString.append("<remarks><![CDATA["+(rs.getString("remarks")==null?"":rs.getString("remarks").trim())+"]]></remarks>");
valueXmlString.append("<frt_type><![CDATA[T]]></frt_type>");
valueXmlString.append("<chg_user><![CDATA["+(rs.getString("CHG_USER")==null?"":rs.getString("CHG_USER").trim())+"]]></chg_user>");
......@@ -1043,11 +1051,11 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
valueXmlString.append("<currency_descr><![CDATA[]]></currency_descr>");
valueXmlString.append("<confirmed><![CDATA[N]]></confirmed>");
valueXmlString.append("<loc_code__git><![CDATA["+(rs.getString("LOC_CODE__GITBF")==null?"":rs.getString("LOC_CODE__GITBF"))+"]]></loc_code__git>");
valueXmlString.append("<conf_date><![CDATA["+sdf.format(rs.getTimestamp("CONF_DATE"))+"]]></conf_date>");
//valueXmlString.append("<conf_date><![CDATA["+sdf.format(rs.getTimestamp("CONF_DATE"))+"]]></conf_date>");
valueXmlString.append("<conf_date><![CDATA[]]></conf_date>");
valueXmlString.append("<no_art><![CDATA[0]]></no_art>");
valueXmlString.append("<trans_mode><![CDATA["+(rs.getString("TRANS_MODE")==null?"":rs.getString("TRANS_MODE").trim())+"]]></trans_mode>");
valueXmlString.append("<gp_no><![CDATA[]]></gp_no>");
valueXmlString.append("<gp_date/>");
valueXmlString.append("<conf_passwd/>");
valueXmlString.append("<order_type><![CDATA["+(rs.getString("ORDER_TYPE")==null?"":rs.getString("ORDER_TYPE").trim())+"]]></order_type>");
valueXmlString.append("<gp_ser><![CDATA[I]]></gp_ser>");
......@@ -1141,6 +1149,7 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
valueXmlString.append("<tran_id/>");
valueXmlString.append("<tran_date><![CDATA["+currAppdate+"]]></tran_date>");
valueXmlString.append("<eff_date><![CDATA["+currAppdate+"]]></eff_date>");
valueXmlString.append("<gp_date><![CDATA["+currAppdate+"]]></gp_date>");
valueXmlString.append("<dist_order><![CDATA["+distOrder+"]]></dist_order>");
valueXmlString.append("<site_code><![CDATA["+(rs.getString("SITE_CODE__SHIP")==null?"":rs.getString("SITE_CODE__SHIP").trim())+"]]></site_code>");
valueXmlString.append("<site_code__dlv><![CDATA["+(rs.getString("SITE_CODE__DLV")==null?"":rs.getString("SITE_CODE__DLV").trim())+"]]></site_code__dlv>");
......@@ -1154,8 +1163,8 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
valueXmlString.append("<net_weight><![CDATA[0]]></net_weight>");
valueXmlString.append("<frt_amt><![CDATA[0]]></frt_amt>");
valueXmlString.append("<amount><![CDATA[0]]></amount>");
valueXmlString.append("<tax_amt><![CDATA[0]]></tax_amt>");
valueXmlString.append("<net_amt><![CDATA[0]]></net_amt>");
valueXmlString.append("<tax_amt><![CDATA["+rs.getDouble("tax_amt")+"]]></tax_amt>");
valueXmlString.append("<net_amt><![CDATA["+rs.getDouble("net_amt")+"]]></net_amt>");
valueXmlString.append("<remarks><![CDATA["+(rs.getString("remarks")==null?"":rs.getString("remarks").trim())+"]]></remarks>");
valueXmlString.append("<frt_type><![CDATA[T]]></frt_type>");
valueXmlString.append("<chg_user><![CDATA["+(rs.getString("CHG_USER")==null?"":rs.getString("CHG_USER").trim())+"]]></chg_user>");
......@@ -1169,11 +1178,11 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
valueXmlString.append("<currency_descr><![CDATA[]]></currency_descr>");
valueXmlString.append("<confirmed><![CDATA[N]]></confirmed>");
valueXmlString.append("<loc_code__git><![CDATA["+(rs.getString("loc_code__git")==null?"":rs.getString("loc_code__git"))+"]]></loc_code__git>");
valueXmlString.append("<conf_date><![CDATA["+sdf.format(rs.getTimestamp("CONF_DATE"))+"]]></conf_date>");
// valueXmlString.append("<conf_date><![CDATA["+sdf.format(rs.getTimestamp("CONF_DATE"))+"]]></conf_date>");
valueXmlString.append("<conf_date><![CDATA[]]></conf_date>");
valueXmlString.append("<no_art><![CDATA[0]]></no_art>");
valueXmlString.append("<trans_mode><![CDATA["+(rs.getString("TRANS_MODE")==null?"":rs.getString("TRANS_MODE").trim())+"]]></trans_mode>");
valueXmlString.append("<gp_no><![CDATA[]]></gp_no>");
valueXmlString.append("<gp_date/>");
valueXmlString.append("<conf_passwd/>");
valueXmlString.append("<order_type><![CDATA["+(rs.getString("ORDER_TYPE")==null?"":rs.getString("ORDER_TYPE").trim())+"]]></order_type>");
valueXmlString.append("<gp_ser><![CDATA[I]]></gp_ser>");
......@@ -1599,7 +1608,8 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
//availableYn ="Y"; // 28/05/09 manoharan commented taken from distorder table
sql = " SELECT (CASE WHEN ACTIVE IS NULL THEN 'Y' ELSE ACTIVE END) ACT, MIN_SHELF_LIFE, "
+ " (CASE WHEN TRACK_SHELF_LIFE IS NULL THEN 'N' ELSE TRACK_SHELF_LIFE END) TRK_SHELF_LIFE, "
+ " (CASE WHEN SUPP_SOUR IS NULL THEN 'M' ELSE SUPP_SOUR END) SUP_SOUR, DESCR "
+ " (CASE WHEN SUPP_SOUR IS NULL THEN 'M' ELSE SUPP_SOUR END) SUP_SOUR, DESCR, "
+ " (case when shelf_life_type is null then 'E' else shelf_life_type end) "
+ " FROM ITEM WHERE ITEM_CODE = '"+itemCode+"' ";
pstmt1= conn.prepareStatement(sql);
rs1 = pstmt1.executeQuery();
......@@ -1608,6 +1618,7 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
active = rs1.getString( 1 );
minShelfLife = rs1.getInt( 2 );
itemDescr = rs1.getString( 5 );
shelflifetype = rs1.getString( 6 );
if( active.equals("N") )
{
System.out.println("VTITEM4 error through");
......@@ -1620,6 +1631,9 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
rs1 = null;
pstmt1.close();
pstmt1 = null ;
valueXmlString.append("<shelf_life_type><![CDATA["+shelflifetype+"]]></shelf_life_type>");
sql = " SELECT LOC_CODE__DAMAGED, SUNDRY_CODE, PRICE_LIST, PRICE_LIST__CLG, SITE_CODE__SHIP "
+ " FROM DISTORDER WHERE DIST_ORDER = '"+distOrder+"' ";
pstmt1= conn.prepareStatement(sql);
......@@ -1975,9 +1989,14 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
valueXmlString.append("<unit>").append("<![CDATA[").append(rs1.getString(5)).append("]]>").append("</unit>\r\n");
valueXmlString.append("<unit__alt>").append("<![CDATA[").append(unitAlt).append("]]>").append("</unit__alt>\r\n");
valueXmlString.append("<conv__qty__alt>").append("<![CDATA[").append(lcFact).append("]]>").append("</conv__qty__alt>\r\n");
ratefd = Double.parseDouble(rateFmDistOrd);
ratealt = lcFact * ratefd;
valueXmlString.append("<rate__alt>").append("<![CDATA[").append(ratealt).append("]]>").append("</rate__alt>\r\n");
valueXmlString.append("<conv__rate_alt>").append("<![CDATA[").append(lcFact).append("]]>").append("</conv__rate_alt>\r\n");
valueXmlString.append("<qty_order__alt>").append("<![CDATA[").append(0).append("]]>").append("</qty_order__alt>\r\n");
//valueXmlString.append("<qty_details>").append("<![CDATA[").append((rs1.getString("qty_details") == null) ? "":rs1.getString("qty_details")).append("]]>").append("</qty_details>\r\n");
String tLocCode = null;
tLocCode = rs1.getString(12);
// valueXmlString.append("<loc_code>").append("<![CDATA[").append( (tLocCode == null ? "" : tLocCode.trim()) ).append("]]>").append("</loc_code>\r\n");
......@@ -2011,11 +2030,12 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
System.out.println("supp_code__mfg>>>>>>>>DD>>>>ass"+rs1.getString(20) == null ? "":rs1.getString(20));
valueXmlString.append("<supp_code__mfg>").append("<![CDATA[").append((rs1.getString(20) == null) ? "":rs1.getString(20)).append("]]>").append("</supp_code__mfg>\r\n"); //Gulzar 24/03/07
System.out.println("site_code__mfg>>>>>>DDFF>>>>>>ass"+siteCodeDlv+" F>>>>>>>>"+rs1.getString("site_code__mfg") == null ? "":rs1.getString("site_code__mfg"));
valueXmlString.append("<site_code__mfg>").append("<![CDATA[").append(siteCodeDlv).append("]]>").append("</site_code__mfg>\r\n");
valueXmlString.append("<cost_rate>").append("<![CDATA["+rs1.getDouble("rate")+"]]>").append("</cost_rate>\r\n"); // CHANGED BY RITESH ON 18/SEP/2014
valueXmlString.append("<site_code__mfg>").append("<![CDATA[").append(siteCodeMfg).append("]]>").append("</site_code__mfg>\r\n");
valueXmlString.append("<mfg_date>").append("<![CDATA[").append((rs1.getDate(8) == null) ? "":sdf.format(rs1.getDate(8))).append("]]>").append("</mfg_date>\r\n");
valueXmlString.append("<exp_date>").append("<![CDATA[").append((rs1.getDate(4) == null) ? "":sdf.format(rs1.getDate(4))).append("]]>").append("</exp_date>\r\n");
valueXmlString.append("<potency_perc>").append("<![CDATA[").append( ( (rs1.getString(9) == null) ? "": rs1.getString(9) ) ).append("]]>").append("</potency_perc>\r\n");
// valueXmlString.append("<no_art>").append("<![CDATA[").append(noArt).append("]]>").append("</no_art>\r\n");
valueXmlString.append("<no_art>").append("<![CDATA[").append(noArt).append("]]>").append("</no_art>\r\n");
valueXmlString.append("<batch_no>").append("<![CDATA[").append( ( (rs1.getString(13) == null) ? "":rs1.getString(13) ) ).append("]]>").append("</batch_no>\r\n");
valueXmlString.append("<grade>").append("<![CDATA[").append( ( (rs1.getString(14) == null) ? "": rs1.getString(14) ) ).append("]]>").append("</grade>\r\n");
// valueXmlString.append("<lot_no>").append("<![CDATA[").append(( (rs1.getString(1) == null) ? " ": rs1.getString(1))).append("]]>").append("</lot_no>\r\n");
......
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