D16JSUN0002 updated source on head for contract_type

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@43520 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-dis/ibase/webitm/ejb/dis/ScontractGwtIC.java

@@ -1438,6 +1438,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
 							valueXmlString.append("<chg_user >").append("<![CDATA["+userId+"]]>").append("</chg_user>");
 							valueXmlString.append("<chg_term >").append("<![CDATA["+chgTerm+"]]>").append("</chg_term>");
 							valueXmlString.append("<edit_status>").append("<![CDATA["+editFlag+"]]>").append("</edit_status>");
+							valueXmlString.append("<dlv_city>").append("<![CDATA[]]>").append("</dlv_city>");
 						}
 					}
 					else if(currentColumn.trim().equalsIgnoreCase("order_type__appl"))
@@ -1453,6 +1454,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
 						custType = checkNullAndTrim(genericUtility.getColumnValue("cust_type", dom));
 						custTypeDescr = checkNullAndTrim(genericUtility.getColumnValue("cust_type__descr", dom));
 						siteCode = checkNullAndTrim(genericUtility.getColumnValue("site_code", dom));
+						contractType = checkNullAndTrim(genericUtility.getColumnValue("contract_type", dom));
 						
 						sql = " SELECT DESCR FROM SORDERTYPE WHERE ORDER_TYPE = ? ";
 						pstmt = conn.prepareStatement(sql);
@@ -1490,7 +1492,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
 						valueXmlString.append("<cust_type__descr>").append("<![CDATA["+custTypeDescr+"]]>").append("</cust_type__descr>");
 						valueXmlString.append("<confirmed>").append("<![CDATA[N]]>").append("</confirmed>");
 						valueXmlString.append("<edit_status>").append("<![CDATA["+editFlag+"]]>").append("</edit_status>");
-						valueXmlString.append("<site_code>").append("<![CDATA["+siteCode+"]]>").append("</site_code>");
+						valueXmlString.append("<contract_type>").append("<![CDATA["+contractType+"]]>").append("</contract_type>");
 					}
 					else if(currentColumn.trim().equalsIgnoreCase("cust_code") || currentColumn.trim().equalsIgnoreCase("cust_type"))
 					{
@@ -1775,7 +1777,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
 							valueXmlString.append("<dlv_add1 >").append("<![CDATA[" +  addr1 + "]]>").append("</dlv_add1>");
 							valueXmlString.append("<dlv_add2 >").append("<![CDATA[" +  addr2 + "]]>").append("</dlv_add2>");
 							valueXmlString.append("<dlv_add3 >").append("<![CDATA[" +  addr3 + "]]>").append("</dlv_add3>");
-							valueXmlString.append("<dlv_city >").append("<![CDATA[" +  city + "]]>").append("</dlv_city>");
+							//valueXmlString.append("<dlv_city >").append("<![CDATA[" +  city + "]]>").append("</dlv_city>");
 							valueXmlString.append("<dlv_pin >").append("<![CDATA[" +  pin + "]]>").append("</dlv_pin>");
 							valueXmlString.append("<count_code__dlv >").append("<![CDATA[" +  countCode + "]]>").append("</count_code__dlv>");
 							valueXmlString.append("<tran_code >").append("<![CDATA[" +  tranCode + "]]>").append("</tran_code>");
@@ -2044,6 +2046,8 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
 							
 							valueXmlString.append("<edit_status>").append("<![CDATA["+editFlag+"]]>").append("</edit_status>");
 							valueXmlString.append("<site_code>").append("<![CDATA["+siteCode+"]]>").append("</site_code>");
+							
+							valueXmlString.append("<dlv_city>").append("<![CDATA[" +  city + "]]>").append("</dlv_city>");
 						}
 					}
 					valueXmlString.append("</Detail1>");