Skip to content

B
business-java
Commit 0e06d0ab authored by wansari's avatar wansari
Browse files
Options

D162JSUN002 updated on HEAD to remove customer series and unnecessory code. 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@43776 ce508802-f39f-4f6c-b175-0d175dae99d5
parent e3bbe9c9
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 22 deletions
webitm-dis/ibase/webitm/ejb/dis/ScontractGwtIC.java
View file @ 0e06d0ab
...@@ -432,7 +432,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -432,7 +432,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
childNode = childNodeList.item(childRow); childNode = childNodeList.item(childRow);
childNodeName = childNode.getNodeName(); childNodeName = childNode.getNodeName();
System.out.println("Detail2 childNodeName ["+childNodeName+"] childNode["+childNode+"] "); //System.out.println("Detail2 childNodeName ["+childNodeName+"] childNode["+childNode+"] ");
if("attribute".equalsIgnoreCase(childNodeName)) if("attribute".equalsIgnoreCase(childNodeName))
{ {
...@@ -665,7 +665,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -665,7 +665,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
childNode = childNodeList.item(childRow); childNode = childNodeList.item(childRow);
childNodeName = childNode.getNodeName(); childNodeName = childNode.getNodeName();
System.out.println("Detail3 childNodeName ["+childNodeName+"]"); //System.out.println("Detail3 childNodeName ["+childNodeName+"]");
if("attribute".equalsIgnoreCase(childNodeName)) if("attribute".equalsIgnoreCase(childNodeName))
{ {
...@@ -896,7 +896,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -896,7 +896,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
childNode = childNodeList.item(childRow); childNode = childNodeList.item(childRow);
childNodeName = childNode.getNodeName(); childNodeName = childNode.getNodeName();
System.out.println("Detail4 childNodeName ["+childNodeName+"]"); //System.out.println("Detail4 childNodeName ["+childNodeName+"]");
if(childNode == null || childNode.getNodeType() != childNode.ELEMENT_NODE) if(childNode == null || childNode.getNodeType() != childNode.ELEMENT_NODE)
{ {
...@@ -1064,9 +1064,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -1064,9 +1064,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
String begPart = errString.substring(0,errString.indexOf("</description>")); String begPart = errString.substring(0,errString.indexOf("</description>"));
String endDesc = errString.substring(errString.indexOf("</description>"),errString.length()); String endDesc = errString.substring(errString.indexOf("</description>"),errString.length());
//mainStr = begPart + " for item code ["+itemCode+"]. " + endDesc; mainStr = begPart + message + endDesc;
mainStr = begPart + message + endDesc;
System.out.println("mainStr:::::::::::::::::: "+mainStr);
begPart = null; begPart = null;
} }
catch(Exception e) catch(Exception e)
...@@ -1497,7 +1495,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -1497,7 +1495,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
} }
else if(currentColumn.trim().equalsIgnoreCase("cust_code") || currentColumn.trim().equalsIgnoreCase("cust_type")) else if(currentColumn.trim().equalsIgnoreCase("cust_code") || currentColumn.trim().equalsIgnoreCase("cust_type"))
{ {
String contractDateAppl = "";
custCode = genericUtility.getColumnValue("cust_code", dom); custCode = genericUtility.getColumnValue("cust_code", dom);
siteCode = genericUtility.getColumnValue("site_code", dom); siteCode = genericUtility.getColumnValue("site_code", dom);
custType = checkNullAndTrim(genericUtility.getColumnValue("cust_type", dom)); custType = checkNullAndTrim(genericUtility.getColumnValue("cust_type", dom));
...@@ -2037,7 +2035,6 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -2037,7 +2035,6 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
} }
valueXmlString.append("<dlv_term >").append("<![CDATA[" + dlvTerm + "]]>").append("</dlv_term>"); valueXmlString.append("<dlv_term >").append("<![CDATA[" + dlvTerm + "]]>").append("</dlv_term>");
valueXmlString.append("<confirmed>").append("<![CDATA[N]]>").append("</confirmed>"); valueXmlString.append("<confirmed>").append("<![CDATA[N]]>").append("</confirmed>");
valueXmlString.append("<valid_upto>").append("<![CDATA["+genericUtility.getValidDateString(validUpTostr , genericUtility.getApplDateFormat()) + "]]>").append("</valid_upto>"); valueXmlString.append("<valid_upto>").append("<![CDATA["+genericUtility.getValidDateString(validUpTostr , genericUtility.getApplDateFormat()) + "]]>").append("</valid_upto>");
valueXmlString.append("<eff_from>").append("<![CDATA["+genericUtility.getValidDateString(effFromStr , genericUtility.getApplDateFormat()) + "]]>").append("</eff_from>"); valueXmlString.append("<eff_from>").append("<![CDATA["+genericUtility.getValidDateString(effFromStr , genericUtility.getApplDateFormat()) + "]]>").append("</eff_from>");
valueXmlString.append("<price_rule>").append("<![CDATA["+priceRule+"]]>").append("</price_rule>"); valueXmlString.append("<price_rule>").append("<![CDATA["+priceRule+"]]>").append("</price_rule>");
...@@ -2047,10 +2044,8 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -2047,10 +2044,8 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
valueXmlString.append("<chg_date >").append("<![CDATA["+ldDate+"]]>").append("</chg_date>"); valueXmlString.append("<chg_date >").append("<![CDATA["+ldDate+"]]>").append("</chg_date>");
valueXmlString.append("<chg_user >").append("<![CDATA["+userId+"]]>").append("</chg_user>"); valueXmlString.append("<chg_user >").append("<![CDATA["+userId+"]]>").append("</chg_user>");
valueXmlString.append("<chg_term >").append("<![CDATA["+chgTerm+"]]>").append("</chg_term>"); valueXmlString.append("<chg_term >").append("<![CDATA["+chgTerm+"]]>").append("</chg_term>");
valueXmlString.append("<edit_status>").append("<![CDATA["+editFlag+"]]>").append("</edit_status>"); valueXmlString.append("<edit_status>").append("<![CDATA["+editFlag+"]]>").append("</edit_status>");
valueXmlString.append("<site_code>").append("<![CDATA["+siteCode+"]]>").append("</site_code>"); valueXmlString.append("<site_code>").append("<![CDATA["+siteCode+"]]>").append("</site_code>");
valueXmlString.append("<dlv_city>").append("<![CDATA[" + city + "]]>").append("</dlv_city>"); valueXmlString.append("<dlv_city>").append("<![CDATA[" + city + "]]>").append("</dlv_city>");
} }
} }
...@@ -2516,7 +2511,8 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -2516,7 +2511,8 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
} }
} }
sql = "select item_ser__inv from customer_series where cust_code = ? and item_ser = ?"; //Changed on 09-MAY-2017 as per mail suggested by Sudessh Achari
/*sql = "select item_ser__inv from customer_series where cust_code = ? and item_ser = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, custCode); pstmt.setString(1, custCode);
pstmt.setString(2, itemSer); pstmt.setString(2, itemSer);
...@@ -2537,7 +2533,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -2537,7 +2533,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
if(itemSerInv != null && itemSerInv.trim().length() > 0) if(itemSerInv != null && itemSerInv.trim().length() > 0)
{ {
itemSer = itemSerInv; itemSer = itemSerInv;
} }*/
sql = "Select descr, unit, item_stru,pack_instr from item where item_code = ?"; sql = "Select descr, unit, item_stru,pack_instr from item where item_code = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -2591,7 +2587,8 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -2591,7 +2587,8 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
pstmt.close();pstmt = null; pstmt.close();pstmt = null;
} }
sql = "SELECT stan_code FROM site WHERE site_code = ?"; //Commented by wasim on 09-MAY-17 for unnecessory code [START]
/*sql = "SELECT stan_code FROM site WHERE site_code = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, siteCodeShip); pstmt.setString(1, siteCodeShip);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
...@@ -2606,9 +2603,9 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -2606,9 +2603,9 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
if(pstmt!=null) if(pstmt!=null)
{ {
pstmt.close();pstmt = null; pstmt.close();pstmt = null;
} }*/
sql = "select tax_chap from customeritem where cust_code = ? and item_code = ?"; /*sql = "select tax_chap from customeritem where cust_code = ? and item_code = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, custCode); pstmt.setString(1, custCode);
pstmt.setString(2, itemCode); pstmt.setString(2, itemCode);
...@@ -2990,7 +2987,8 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -2990,7 +2987,8 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
{ {
pstmt.close();pstmt = null; pstmt.close();pstmt = null;
} }
} }*/
//Commented by wasim on 09-MAY-17 for unnecessory code [END]
valueXmlString.append("<tax_chap >").append("<![CDATA[" + taxChap + "]]>").append("</tax_chap>"); valueXmlString.append("<tax_chap >").append("<![CDATA[" + taxChap + "]]>").append("</tax_chap>");
valueXmlString.append("<tax_class >").append("<![CDATA[" + taxClass + "]]>").append("</tax_class>"); valueXmlString.append("<tax_class >").append("<![CDATA[" + taxClass + "]]>").append("</tax_class>");
valueXmlString.append("<tax_env >").append("<![CDATA[" + taxEnv + "]]>").append("</tax_env>"); valueXmlString.append("<tax_env >").append("<![CDATA[" + taxEnv + "]]>").append("</tax_env>");
...@@ -3268,14 +3266,13 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -3268,14 +3266,13 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
valueXmlString.append("<chg_term >").append("<![CDATA["+chgTerm+"]]>").append("</chg_term>"); valueXmlString.append("<chg_term >").append("<![CDATA["+chgTerm+"]]>").append("</chg_term>");
//Changed by wasim to set discount% [START] /*HashMap hm = new HashMap();
HashMap hm = new HashMap();
hm = getDiscountPer(dom2,"2",itemSer); hm = getDiscountPer(dom2,"2",itemSer);
discount = (String) hm.get("DISCOUNT"); discount = (String) hm.get("DISCOUNT");
priceList = (String) hm.get("PRICE_LIST"); priceList = (String) hm.get("PRICE_LIST");
valueXmlString.append("<discount>").append("<![CDATA["+discount+"]]>").append("</discount>"); valueXmlString.append("<discount>").append("<![CDATA["+discount+"]]>").append("</discount>");
valueXmlString.append("<price_list>").append("<![CDATA["+priceList+"]]>").append("</price_list>"); valueXmlString.append("<price_list>").append("<![CDATA["+priceList+"]]>").append("</price_list>");*/
//Changed by wasim to set discount% [END]
valueXmlString.append("<edit_status>").append("<![CDATA["+editFlag+"]]>").append("</edit_status>"); valueXmlString.append("<edit_status>").append("<![CDATA["+editFlag+"]]>").append("</edit_status>");
valueXmlString.append("<cust_code>").append("<![CDATA["+custCode+"]]>").append("</cust_code>"); valueXmlString.append("<cust_code>").append("<![CDATA["+custCode+"]]>").append("</cust_code>");
valueXmlString.append("</Detail3>"); valueXmlString.append("</Detail3>");
...@@ -4507,7 +4504,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -4507,7 +4504,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
childNode = childNodeList.item(ctr); childNode = childNodeList.item(ctr);
childNodeName = childNode.getNodeName(); childNodeName = childNode.getNodeName();
System.out.println("childNodeName["+childNodeName+"]"); //System.out.println("childNodeName["+childNodeName+"]");
if("attribute".equalsIgnoreCase(childNodeName)) if("attribute".equalsIgnoreCase(childNodeName))
{ {
mode = childNode.getAttributes().getNamedItem("updateFlag").getNodeValue(); mode = childNode.getAttributes().getNamedItem("updateFlag").getNodeValue();
...@@ -4752,5 +4749,4 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -4752,5 +4749,4 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
System.out.println("Returning Detail2 XML from getPreFormXML="+valueXmlString.toString()); System.out.println("Returning Detail2 XML from getPreFormXML="+valueXmlString.toString());
return valueXmlString.toString(); return valueXmlString.toString();
} }
} }
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