D14LSUN004

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

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

@@ -1847,7 +1847,9 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde
 						{
 
 							String rel_amount = checkNull(genericUtility.getColumnValue("rel_amt", dom));
+							rel_amount = rel_amount != null && rel_amount.trim().length() > 0 ? rel_amount.trim() : "0";
 							rel_amt =Double.parseDouble(rel_amount);
+							
 							System.out.println("<rel_amt > " + rel_amt);
 							if (rel_amt == 0 || rel_amt <= 0) 
 							{
@@ -1859,11 +1861,11 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde
 							noOfParent = detail4List.getLength();
 							String ordamt1=checkNull(genericUtility.getColumnValue("ord_amt", dom1));
 							System.out.println("<ord_amt >@@@@@@ " + ordamt1); 
-							//ordamt1 = ordamt1 != null && ordamt1.length() > 0 ? ordamt1.trim() : "0";
+							ordamt1 = ordamt1 != null && ordamt1.trim().length() > 0 ? ordamt1.trim() : "0";
 							ord_amt =Double.parseDouble(ordamt1);
 							System.out.println("<ord_amt > " + ord_amt); 		
 							String totamt1=checkNull(genericUtility.getColumnValue("tot_amt", dom1));
-							//totamt1 = totamt1 == null ? "0" : totamt1.trim();
+							totamt1 = totamt1 != null && totamt1.trim().length() > 0 ? totamt1.trim() : "0";
 							System.out.println("<tot_amt > @@@@@@@@@@@@@@@@@" + totamt1);
 							System.out.println("Total Amount"+totamt1);
 							tot_amt = Double.parseDouble(totamt1);
@@ -1872,6 +1874,7 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde
 							{
 							String lineno=checkNull(genericUtility.getColumnValueFromNode("line_no", detail4List.item(ctr1)));
 							//lineno = lineno == null ? "0" : lineno.trim();
+							lineno = lineno != null && lineno.trim().length() > 0 ? lineno.trim() : "0";
 							
 							 lineNoo = Integer.parseInt(lineno);
 							System.out.println("Line Number"+lineNoo);
@@ -4130,18 +4133,6 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde
 					valueXmlString.append("<type >").append("<![CDATA[" + type + "]]>").append("</type>");
 					valueXmlString.append("<amt_type>").append("<![CDATA[" + amttype + "]]>").append("</amt_type>");
 					valueXmlString.append("<amt_type__o>").append("<![CDATA[" + amttype + "]]>").append("</amt_type__o>");
-					if (relagnst.equalsIgnoreCase("05")|| relagnst.equalsIgnoreCase("06")) 
-					{
-						System.out.println("LIne Noooooooooo order release against@@@@@@");
-						/*valueXmlString.append("<item_code protect = \"0\">").append("<![CDATA["+itemCode+"]]>").append("</item_code>");*/
-						valueXmlString.append("<task_code protect = \"0\">").append("<![CDATA[" + task_code + "]]>").append("</task_code>");
-					} else 
-					{
-					
-						valueXmlString.append("<task_code protect = \"1\">").append("<![CDATA[" + task_code + "]]>").append("</task_code>");
-					}
-					
-					
 					valueXmlString.append("<rel_agnst >").append("<![CDATA[" + relagnst + "]]>").append("</rel_agnst>");
 					//valueXmlString.append("<item_code protect = \"0\">").append("<![CDATA["+itemCode+"]]>").append("</item_code>");
 					valueXmlString.append("<rel_agnst__o>").append("<![CDATA[" + relagnst + "]]>").append("</rel_agnst__o>");
@@ -4198,6 +4189,7 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde
 			        {
 				
 				value = genericUtility.getColumnValue("rel_agnst", dom);
+			task_code=genericUtility.getColumnValue("task_code", dom);
 				System.out.println("Release against@@@@@@"+value);
 				
 				if (value.equalsIgnoreCase("05")|| value.equalsIgnoreCase("06")) 
@@ -4208,18 +4200,19 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde
 				} else 
 				{
 				
-					valueXmlString.append("<task_code protect = \"1\">").append("<![CDATA[" + task_code + "]]>").append("</task_code>");
+					valueXmlString.append("<task_code protect = \"1\">").append("<![CDATA[]]>").append("</task_code>");
 				}
 			} 
 			else if (currentColumn.trim().equalsIgnoreCase("itm_defaultedit"))
 			{
 				value = genericUtility.getColumnValue("rel_agnst", dom);
+				task_code=genericUtility.getColumnValue("task_code", dom);
 				if (value.equalsIgnoreCase("05")|| value.equalsIgnoreCase("06")) 
 				{
 					valueXmlString.append("<task_code protect = \"0\">").append("<![CDATA[" + task_code + "]]>").append("</task_code>");
 				} else
 				{
-					valueXmlString.append("<task_code protect = \"1\">").append("<![CDATA[" + task_code + "]]>").append("</task_code>");
+					valueXmlString.append("<task_code protect = \"1\">").append("<![CDATA[]]>").append("</task_code>");
 				}
 			}
 			valueXmlString.append("</Detail4>");