changed by Manish for sales order on 12/12/16

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

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

@@ -6206,7 +6206,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 					rs = pstmt.executeQuery();
 					if (rs.next())
 					{
-						descr = rs.getString("cust_name");
+						custName = rs.getString("cust_name");
 						mbillto = rs.getString("cust_code__bil");
 					}
 					rs.close();
@@ -6641,7 +6641,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 					rs.close();
 					rs = null;
 
-					valueXmlString.append("<cust_name>").append("<![CDATA[" + descr + "]]>").append("</cust_name>");
+					valueXmlString.append("<cust_name>").append("<![CDATA[" + custName + "]]>").append("</cust_name>");
 					setNodeValue( dom, "cust_name", getAbsString( descr  ));
 					valueXmlString.append("<cust_code__bil>").append("<![CDATA[" + mbillto + "]]>").append("</cust_code__bil>");
 					setNodeValue( dom, "cust_code__bil", getAbsString( mbillto  ));
@@ -6659,6 +6659,19 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 					rs.close();
 					rs = null;
 				
+					sql = "select cust_name from customer where cust_code =?";
+					pstmt = conn.prepareStatement(sql);
+					pstmt.setString(1, custCode);
+					rs = pstmt.executeQuery();
+					if (rs.next())
+					{
+						lsDlvTo = rs.getString("cust_name");
+					}
+					pstmt.close();
+					pstmt = null;
+					rs.close();
+					rs = null;
+
 					valueXmlString.append("<cust_name__bil>").append("<![CDATA[" + lsCustnameBil + "]]>").append("</cust_name__bil>");
 					setNodeValue( dom, "cust_name__bil", getAbsString( lsCustnameBil  ));
 
@@ -6668,8 +6681,8 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 					valueXmlString.append("<crterm_descr>").append("<![CDATA[" + mCrdescr + "]]>").append("</crterm_descr>");
 					setNodeValue( dom, "crterm_descr", getAbsString(mCrdescr  ));
 
-					valueXmlString.append("<dlv_to>").append("<![CDATA[" + descr + "]]>").append("</dlv_to>");
-					setNodeValue( dom, "dlv_to", getAbsString( descr  ));
+					valueXmlString.append("<dlv_to>").append("<![CDATA[" + lsDlvTo + "]]>").append("</dlv_to>");
+					setNodeValue( dom, "dlv_to", getAbsString( lsDlvTo  ));
 
 					valueXmlString.append("<sales_pers>").append("<![CDATA[" + mslpers + "]]>").append("</sales_pers>");
 					setNodeValue( dom, "sales_pers", getAbsString( mslpers  ));
@@ -8757,7 +8770,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 						pstmt = null;
 					}
 
-					valueXmlString.append("<appl_seg>").append("<![CDATA[" + lsApplseg + "]]>").append("</appl_seg>");
+					valueXmlString.append("<appl_seg>").append("<![CDATA[" + checkNull(lsApplseg) + "]]>").append("</appl_seg>");
 					setNodeValue( dom, "appl_seg", getAbsString( lsApplseg) );
 
 					lsSordCommCal = distCommon.getDisparams("999999", "SORD_COMM_CAL", conn);