Skip to content

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

updated for diffrent user 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@96103 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 74cd0241
Show whitespace changes
Inline Side-by-side
Showing with 149 additions and 9 deletions
webitm-dis/ibase/webitm/ejb/dis/DistIssWiz.java
View file @ 7102b9cb
......@@ -680,7 +680,7 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
String rate = "";
double amount = 0;
int cnt = 0;
String addUser="";
String tranCode = "",tranName="",transMode="";
StringBuffer detail2xml = new StringBuffer();
String tranDate = null;
......@@ -729,6 +729,7 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
System.out.println("FORM NO IS"+currentFormNo);
valueXmlString = new StringBuffer("<?xml version = \"1.0\"?> <Root> <header> <editFlag>");
valueXmlString.append(editFlag).append("</editFlag> </header>");
userId = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
switch (currentFormNo) {
......@@ -741,6 +742,25 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
System.out.println("itm_default >>>>> 2>>");
distOrder = genericUtility.getColumnValue("dist_order1", dom1);
sql = "select add_user from distord_iss where CASE WHEN confirmed IS NULL THEN 'N' ELSE CONFIRMED END = 'N' and dist_order = ?";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1,distOrder);
rs = pstmt.executeQuery();
if(rs.next())
{
addUser = rs.getString("add_user")==null?"":rs.getString("add_user").trim();
}
pstmt.close();
rs.close();
pstmt = null;
rs = null;
//chgUser = genericUtility.getColumnValue("chg_user",dom2);
System.out.println("addUser><><jfjf"+addUser+"chgUserDDhfhf"+chgUser+"<D<V<V<Vfff"+distOrder);
sql = "select count(1) from distord_iss where CASE WHEN confirmed IS NULL THEN 'N' ELSE CONFIRMED END = 'N' and dist_order = ? and tran_ser = 'D-ISS'";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1,distOrder);
......@@ -757,8 +777,10 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
if(cnt > 0)
{
if(currentColumn.trim().equalsIgnoreCase("itm_default"))
if(currentColumn.trim().equalsIgnoreCase("itm_default") && addUser.equalsIgnoreCase(chgUser))
{
sql = "SELECT SITE_A.DESCR,SITE_B.DESCR,LOCATION.DESCR,DISTORD_ISS.TRAN_ID,DISTORD_ISS.TRAN_DATE,DISTORD_ISS.EFF_DATE,DISTORD_ISS.DIST_ORDER,DISTORD_ISS.SITE_CODE,DISTORD_ISS.SITE_CODE__DLV,"
+"DISTORD_ISS.DIST_ROUTE,DISTORD_ISS.TRAN_CODE,DISTORD_ISS.LR_NO,DISTORD_ISS.LR_DATE,DISTORD_ISS.LORRY_NO,DISTORD_ISS.GROSS_WEIGHT,"
+"DISTORD_ISS.TARE_WEIGHT,DISTORD_ISS.NET_WEIGHT,DISTORD_ISS.FRT_AMT,DISTORD_ISS.AMOUNT,DISTORD_ISS.TAX_AMT,DISTORD_ISS.NET_AMT,DISTORD_ISS.REMARKS,"
......@@ -807,7 +829,7 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
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>");
valueXmlString.append("<dist_route><![CDATA["+(rs.getString("DIST_ROUTE")==null?"":rs.getString("DIST_ROUTE"))+"]]></dist_route>");
valueXmlString.append("<tran_code><![CDATA["+(rs.getString("tran_code")==null?"":rs.getString("tran_code"))+"]]></tran_code>");
valueXmlString.append("<tran_code>").append("<![CDATA[" + (rs.getString("tran_code")==null?"":rs.getString("tran_code").trim()) + "]]>").append("</tran_code>");
valueXmlString.append("<lr_no><![CDATA[]]></lr_no>");
valueXmlString.append("<lr_date><![CDATA[]]></lr_date>");
valueXmlString.append("<lorry_no><![CDATA[]]></lorry_no>");
......@@ -818,7 +840,7 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
valueXmlString.append("<amount><![CDATA[0]]></amount>");
valueXmlString.append("<tax_amt><![CDATA[0]]></tax_amt>");
valueXmlString.append("<net_amt><![CDATA[0]]></net_amt>");
valueXmlString.append("<remarks><![CDATA["+(rs.getString("remarks")==null?"":rs.getString("remarks").trim())+"]]></remarks>");
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>");
valueXmlString.append("<chg_term><![CDATA["+(rs.getString("CHG_TERM")==null?"":rs.getString("CHG_TERM").trim())+"]]></chg_term>");
......@@ -827,13 +849,13 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
valueXmlString.append("<site_descr><![CDATA["+(rs.getString(1)==null?"":rs.getString(1).trim())+"]]></site_descr>");
valueXmlString.append("<site_to_descr><![CDATA["+(rs.getString(2)==null?"":rs.getString(2).trim())+"]]></site_to_descr>");
valueXmlString.append("<location_descr><![CDATA["+(rs.getString(3)==null?"":rs.getString(3).trim())+"]]></location_descr>");
valueXmlString.append("<tran_name><![CDATA["+(rs.getString("tran_name")==null?"":rs.getString("tran_name"))+"]]></tran_name>");
valueXmlString.append("<tran_name>").append("<![CDATA[" + (rs.getString("tran_name")==null?"":rs.getString("tran_name").trim()) + "]]>").append("</tran_name>");
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("<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("<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/>");
......@@ -886,6 +908,126 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
pstmt = null;
rs = null;
}
else
{
sql="SELECT D.DIST_ORDER AS DIST_ORDER,D.ORDER_DATE AS ORDER_DATE,D.SITE_CODE__SHIP AS SITE_CODE__SHIP,D.SITE_CODE__DLV AS SITE_CODE__DLV,D.SHIP_DATE AS SHIP_DATE,D.DUE_DATE AS DUE_DATE,D.REMARKS AS REMARKS,"
+" D.DIST_ROUTE AS DIST_ROUTE,D.PRICE_LIST AS PRICE_LIST,D.CONFIRMED AS CONFIRMED,D.CHG_USER AS CHG_USER,D.CHG_TERM AS CHG_TERM,D.TARGET_WGT AS TARGET_WGT,D.TARGET_VOL AS TARGET_VOL,D.LOC_CODE__GIT AS LOC_CODE__GIT,"
+" D.CHG_DATE AS CHG_DATE,SITE_A.DESCR AS SITEA_DESCR,SITE_B.DESCR AS SITEB_DESCR,LOCATION.DESCR AS LOCATION_DESCR,D.CONF_DATE AS CONF_DATE,D.SITE_CODE AS SITE_CODE,D.STATUS AS STATUS,D.SALE_ORDER AS SALE_ORDER,"
+" D.REMARKS1 AS REMARK1,D.REMARKS2 AS REMARK2,TRIM(D.ORDER_TYPE) AS ORDER_TYPE,SITE_A.ADD1 AS SITEA_ADD1,SITE_A.ADD2 AS SITEA_ADD2,SITE_A.CITY AS SITEA_CITY,SITE_A.PIN AS SITEA_PIN,SITE_A.STATE_CODE AS SITEA_STATE_CODE,"
+" SITE_B.ADD1 AS SITEB_ADD1,SITE_B.ADD2 AS SITEB_ADD2,SITE_B.CITY AS SITEB_CITY,SITE_B.PIN AS SITEB_PIN,SITE_B.STATE_CODE AS SITEB_STATE_CODE,D.LOC_CODE__CONS AS LOC_CODE__CONS,D.SUNDRY_TYPE AS SUNDRY_TYPE,"
+" D.SUNDRY_CODE AS SUNDRY_CODE,D.AUTO_RECEIPT AS AUTO_RECEIPT,D.TRAN_TYPE AS TRAN_TYPE,D.CURR_CODE AS CURR_CODE,D.EXCH_RATE AS EXCH_RATE,D.SALES_PERS AS SALES_PERS,SALES_PERS.SP_NAME AS SP_NAME,"
+" D.LOC_CODE__GITBF AS LOC_CODE__GITBF,D.CUST_CODE__DLV AS CUST_CODE__DLV,D.DLV_TO AS DLV_TO,D.DLV_ADD1 AS DLV_ADD1,D.DLV_ADD2 AS DLV_ADD2,D.DLV_ADD3 AS DLV_ADD3,D.DLV_CITY AS DLV_CITY,"
+" D.STATE_CODE__DLV AS STATE_CODE__DLV,D.COUNT_CODE__DLV AS COUNT_CODE__DLV,D.DLV_PIN AS DLV_PIN,D.STAN_CODE AS STAN_CODE,D.TEL1__DLV AS TEL1__DLV,D.TEL2__DLV AS TEL2__DLV,D.TEL3__DLV AS TEL3__DLV,"
+" D.FAX__DLV AS FAX__DLV,D.AVALIABLE_YN AS AVALIABLE_YN,D.PURC_ORDER AS PURC_ORDER,D.TOT_AMT AS TOT_AMT,D.TAX_AMT AS TAX_AMT,D.NET_AMT AS NET_AMT,D.TRAN_SER AS TRAN_SER,"
+" D.PRICE_LIST__CLG AS PRICE_LIST__CLG,SPACE(25) AS LOC,FN_SUNDRY_NAME(D.SUNDRY_TYPE,D.SUNDRY_CODE,'N') AS SUNDRY_NAME,"
+" D.PROJ_CODE AS PROJ_CODE,SITE_C.DESCR AS SITEC_DESCR,D.POLICY_NO AS POLICY_NO,D.LOC_CODE__DAMAGED AS LOC_CODE__DAMAGED,D.SITE_CODE__BIL AS SITE_CODE__BIL,SITE_D.DESCR AS SITED_DESCR,SITE_D.ADD1 AS SITED_ADD1,"
+" SITE_D.ADD2 AS SITED_ADD2,SITE_D.CITY AS SITED_CITY,SITE_D.PIN SITED_PIN ,SITE_D.STATE_CODE AS SITED_STATE_CODE,D.TRANS_MODE AS TRANS_MODE"
+" FROM DISTORDER D,SITE SITE_A,SITE SITE_B,LOCATION LOCATION,SALES_PERS SALES_PERS,SITE SITE_C,SITE SITE_D "
+" WHERE ( D.SITE_CODE__SHIP = SITE_A.SITE_CODE ) AND "
+" ( D.SITE_CODE__DLV = SITE_B.SITE_CODE (+) ) AND "
+" ( D.LOC_CODE__GIT = LOCATION.LOC_CODE (+) ) AND "
+" ( D.SITE_CODE = SITE_C.SITE_CODE (+) ) AND "
+" ( D.SALES_PERS=SALES_PERS.SALES_PERS(+)) AND "
+" ( D.SITE_CODE__BIL=SITE_D.SITE_CODE(+)) "
+" AND ( ( D.DIST_ORDER = '"+distOrder+"' ) ) ";
pstmt = conn.prepareStatement(sql);
rs = pstmt.executeQuery();
if(rs.next())
{
count = 1;
valueXmlString.append("<Detail2 domID='" + count + "' objContext = '"+currentFormNo+"' selected=\"N\">\r\n");
valueXmlString.append("<attribute selected=\"N\" updateFlag=\"A\" status=\"N\" pkNames=\"\"/>\r\n");
valueXmlString.append("<tran_id/>");
valueXmlString.append("<tran_date><![CDATA["+currAppdate+"]]></tran_date>");
valueXmlString.append("<eff_date><![CDATA["+currAppdate+"]]></eff_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>");
valueXmlString.append("<dist_route><![CDATA["+(rs.getString("DIST_ROUTE")==null?"":rs.getString("DIST_ROUTE"))+"]]></dist_route>");
valueXmlString.append("<tran_code><![CDATA[]]></tran_code>");
valueXmlString.append("<lr_no><![CDATA[]]></lr_no>");
valueXmlString.append("<lr_date><![CDATA[]]></lr_date>");
valueXmlString.append("<lorry_no><![CDATA[]]></lorry_no>");
valueXmlString.append("<gross_weight><![CDATA[0]]></gross_weight>");
valueXmlString.append("<tare_weight><![CDATA[0]]></tare_weight>");
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("<remarks><![CDATA[]]></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>");
valueXmlString.append("<chg_term><![CDATA["+(rs.getString("CHG_TERM")==null?"":rs.getString("CHG_TERM").trim())+"]]></chg_term>");
valueXmlString.append("<curr_code><![CDATA["+(rs.getString("curr_code")==null?"":rs.getString("curr_code").trim())+"]]></curr_code>");
valueXmlString.append("<chg_date><![CDATA["+currAppdate+"]]></chg_date>");
valueXmlString.append("<site_descr><![CDATA["+(rs.getString("SITEA_DESCR")==null?"":rs.getString("SITEA_DESCR").trim())+"]]></site_descr>");
valueXmlString.append("<site_to_descr><![CDATA["+(rs.getString("SITEB_DESCR")==null?"":rs.getString("SITEB_DESCR").trim())+"]]></site_to_descr>");
valueXmlString.append("<location_descr><![CDATA["+(rs.getString("LOCATION_DESCR")==null?"":rs.getString("LOCATION_DESCR").trim())+"]]></location_descr>");
valueXmlString.append("<tran_name><![CDATA[]]></tran_name>");
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("<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>");
valueXmlString.append("<ref_no><![CDATA[]]></ref_no>");
valueXmlString.append("<ref_date><![CDATA[]]></ref_date>");
valueXmlString.append("<available_yn><![CDATA["+(rs.getString("AVALIABLE_YN")==null?"N":rs.getString("AVALIABLE_YN").trim())+"]]></available_yn>");
valueXmlString.append("<site_add1><![CDATA["+(rs.getString("SITEA_ADD1")==null?"":rs.getString("SITEA_ADD1").trim())+"]]></site_add1>");
valueXmlString.append("<site_add2><![CDATA["+(rs.getString("SITEA_ADD2")==null?"":rs.getString("SITEA_ADD2").trim())+"]]></site_add2>");
valueXmlString.append("<site_city><![CDATA["+(rs.getString("SITEA_CITY")==null?"":rs.getString("SITEA_CITY").trim())+"]]></site_city>");
valueXmlString.append("<site_pin><![CDATA["+(rs.getString("SITEA_PIN")==null?"":rs.getString("SITEA_PIN").trim())+"]]></site_pin>");
valueXmlString.append("<site_state_code><![CDATA["+(rs.getString("SITEA_STATE_CODE")==null?"":rs.getString("SITEA_STATE_CODE").trim())+"]]></site_state_code>");
valueXmlString.append("<exch_rate><![CDATA["+(rs.getDouble("EXCH_RATE"))+" ]]></exch_rate>");
valueXmlString.append("<tran_type><![CDATA["+(rs.getString("TRAN_TYPE")==null?"":rs.getString("TRAN_TYPE").trim())+"]]></tran_type>");
valueXmlString.append("<emp_code__aprv><![CDATA[]]></emp_code__aprv>");
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("<currency_descr__frt><![CDATA[]]></currency_descr__frt>");
valueXmlString.append("<rd_permit_no><![CDATA[]]></rd_permit_no>");
valueXmlString.append("<dc_no><![CDATA[]]></dc_no>");
valueXmlString.append("<tran_ser><![CDATA[D-ISS ]]></tran_ser>");
valueXmlString.append("<part_qty><![CDATA[A]]></part_qty>");
valueXmlString.append("<sundry_details><![CDATA[]]></sundry_details>");
valueXmlString.append("<sundry_name><![CDATA["+(rs.getString("SUNDRY_NAME")==null?"":rs.getString("SUNDRY_NAME"))+"]]></sundry_name>");
valueXmlString.append("<proj_code><![CDATA["+(rs.getString("PROJ_CODE")==null?"":rs.getString("PROJ_CODE").trim())+"]]></proj_code>");
valueXmlString.append("<site_tele1><![CDATA[]]></site_tele1>");
valueXmlString.append("<site_tele2><![CDATA[]]></site_tele2>");
valueXmlString.append("<site_tele3><![CDATA[]]></site_tele3>");
valueXmlString.append("<site_code__bil><![CDATA[]]></site_code__bil>");
valueXmlString.append("<site_descr_bill><![CDATA[]]></site_descr_bill>");
valueXmlString.append("<site_add1_bill><![CDATA[]]></site_add1_bill>");
valueXmlString.append("<site_add2_bill><![CDATA[]]></site_add2_bill>");
valueXmlString.append("<site_city_bill><![CDATA[]]></site_city_bill>");
valueXmlString.append("<site_pin_bill><![CDATA[]]></site_pin_bill>");
valueXmlString.append("<site_state_code_bill><![CDATA[]]></site_state_code_bill>");
valueXmlString.append("<pallet_wt><![CDATA[]]></pallet_wt>");
valueXmlString.append("<auto_receipt><![CDATA[N]]></auto_receipt>");
System.out.println("chgUser>>"+chgUser+">>>chgTerm"+chgTerm+"currAppdate>>>"+currAppdate);
valueXmlString.append("<add_user>").append("<![CDATA[" + chgUser + "]]>").append("</add_user>"); //changes done by deepak
valueXmlString.append("<add_term>").append("<![CDATA[" + chgTerm + "]]>").append("</add_term>");
valueXmlString.append("<add_date>").append("<![CDATA[" + currAppdate + "]]>").append("</add_date>");
valueXmlString.append("</Detail2>");
}
pstmt.close();
rs.close();
pstmt = null;
rs = null;
}
}
else
{
......@@ -1029,8 +1171,6 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
rs1 = null;
valueXmlString.append("<tran_name protect=\"0\">").append("<![CDATA[" + tranName + "]]>").append("</tran_name>");
setNodeValue( dom, "tran_name", getAbsString(""+tranName));
......
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