Request_id-D14LSUN004

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

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

@@ -172,24 +172,28 @@ public class POrderAmdConf extends ActionHandlerEJB implements POrderAmdConfLoca
 		{
 			e.printStackTrace();
 			throw new ITMException(e);
-		} finally
+		}
+		finally
 		{
 			try
 			{
-				if (errString != null && errString.trim().length() > 0 && !("PRCUSUCCES".equalsIgnoreCase(errString)))
+				System.out.println( ">>>>>>>>>>>>>In finaly errString:"+errString);
+				if (errString != null && errString.trim().length() > 0 && !("d".equalsIgnoreCase(errString)))
 				{
 					conn.rollback();
 					System.out.println("Transaction rollback... ");
 					conn.close();
 					conn = null;
-				} else
+				}
+				else
 				{
 					conn.commit(); // test
 					System.out.println("@@@@ Transaction commit... ");
 					conn.close();
 					conn = null;
 				}
-			} catch (Exception e)
+			} 
+			catch (Exception e)
 			{
 				e.printStackTrace();
 				throw new ITMException(e);

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

@@ -4080,11 +4080,24 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde
 			while(ctr < childNodeListLength  && !childNodeName.equals(currentColumn));
 			System.out.println("[" + currentColumn + "] ==> '" + columnValue + "'");
 		        if (currentColumn.trim().equalsIgnoreCase("itm_default"))
+		        	
 		        {
 		        	purcOrder = genericUtility.getColumnValue("purc_order", dom1);
 		        	System.out.println("@@@@@3 purcOrder [" + purcOrder + "]");
+		        	//value2=genericUtility.getColumnValue("rel_agnst", dom);
+		        	value = genericUtility.getColumnValue("rel_agnst", dom);
+					task_code=genericUtility.getColumnValue("task_code", dom);
+					System.out.println("Release against item default #####@@@@@@"+value);
+					System.out.println("Task code itm default !!!!!!!!!!@@@@@@"+task_code);
+					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[]]>").append("</task_code>");
+					}
+		        	System.out.println("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ item default task code......");
 		        	valueXmlString.append("<purc_order>").append("<![CDATA[" + purcOrder + "]]>").append("</purc_order>");
-				
 			    }
 		        else  if (currentColumn.trim().equalsIgnoreCase("line_no__ord")) 
 		        {
@@ -4098,9 +4111,6 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde
 					System.out.println("purchase order@@@@@@@@@@@@@@@@@@@@@@@@@@22"+purcOrder);
 					System.out.println("line order@@@@@@@@@@@@@@@@@@@@@@@@@@22"+lineNoOrd);
 					
-					
-					
-					
 					sql = "select type,rel_agnst,amt_type,rel_amt,rel_after,adj_method,acct_code,cctr_code,tax_class,tax_chap,tax_env,retention_perc,site_code__adv,adj_perc,task_code from pord_pay_term where purc_order = ? and line_no = ? ";
 					pstmt = conn.prepareStatement(sql);
 					pstmt.setString(1, purcOrder);
@@ -4138,7 +4148,8 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde
 						System.out.println("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 
+					} 
+					else 
 					{
 					
 						valueXmlString.append("<task_code protect = \"1\">").append("<![CDATA[]]>").append("</task_code>");
@@ -4176,7 +4187,7 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde
 			    {
 				
 				value = genericUtility.getColumnValue("rel_agnst", dom);
-			  task_code=genericUtility.getColumnValue("task_code", dom);
+			    task_code=checkNull(genericUtility.getColumnValue("task_code", dom));
 			    System.out.println("Release against#####@@@@@@"+value);
 				System.out.println("Task code Release against!!!!!!!!!!@@@@@@"+task_code);
 				
@@ -4209,28 +4220,6 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde
 			break;
 		// //
 		case 5:
-			/*		parentNodeList = dom.getElementsByTagName("Detail3");
-				parentNode = parentNodeList.item(0);
-				childNodeList = parentNode.getChildNodes();
-				ctr = 0; 
-				valueXmlString.append("<Detail3>");
-				childNodeListLength = childNodeList.getLength();
-				do
-				{ 
-					childNode = childNodeList.item(ctr);
-					childNodeName = childNode.getNodeName();
-					if(childNodeName.equals(currentColumn))
-					{
-						if (childNode.getFirstChild()!= null)
-						{
-							columnValue = childNode.getFirstChild().getNodeValue().trim();
-						}
-					}
-					ctr++;
-				}
-				while(ctr < childNodeListLength  && !childNodeName.equals(currentColumn));
-				System.out.println("[" + currentColumn + "] ==> '" + columnValue + "'");
-*/
 			parentNodeList = dom.getElementsByTagName("Detail5");
 			parentNode = parentNodeList.item(0);
 			childNodeList = parentNode.getChildNodes();