updated

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

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

@@ -147,15 +147,15 @@ public class DistIssDelWiz extends ValidatorEJB implements DistIssDelWizLocal, D
 					childNode = childNodeList.item(ctr);
 					childNodeName = childNode.getNodeName();
 
-					if(childNodeName.equalsIgnoreCase("dist_order"))
+					if(childNodeName.equalsIgnoreCase("dist_order1"))
 					{
 
-						distOrder = genericUtility.getColumnValue("dist_order",dom);
+						distOrder = genericUtility.getColumnValue("dist_order1",dom);
 
 						if (distOrder == null || distOrder.trim().length() == 0)
 						{
 							errCode = "DIDONULL";
-							errString = getErrorString("dist_order",errCode,userId);
+							errString = getErrorString("dist_order1",errCode,userId);
 							break;
 						}
 						else
@@ -176,7 +176,7 @@ public class DistIssDelWiz extends ValidatorEJB implements DistIssDelWizLocal, D
 							if(cnt == 0)
 							{
 								errCode = "DIDONOTEX";
-								errString = getErrorString("dist_order",errCode,userId);
+								errString = getErrorString("dist_order1",errCode,userId);
 								break;
 							}else
 							{
@@ -196,7 +196,7 @@ public class DistIssDelWiz extends ValidatorEJB implements DistIssDelWizLocal, D
 								if(!confirmed.equals("Y"))
 								{
 									errCode = "DIDONOTCO";
-									errString = getErrorString("dist_order",errCode,userId);
+									errString = getErrorString("dist_order1",errCode,userId);
 									break;
 								}else
 								{
@@ -216,7 +216,7 @@ public class DistIssDelWiz extends ValidatorEJB implements DistIssDelWizLocal, D
 									if(cnt > 0)
 									{
 										errCode = "DIDOEISHDO";
-										errString = getErrorString("dist_order",errCode,userId);
+										errString = getErrorString("dist_order1",errCode,userId);
 										break;
 									}
 									else
@@ -500,7 +500,7 @@ public class DistIssDelWiz extends ValidatorEJB implements DistIssDelWizLocal, D
 							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("<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>");
 							valueXmlString.append("<chg_term><![CDATA["+(rs.getString("CHG_TERM")==null?"":rs.getString("CHG_TERM").trim())+"]]></chg_term>");