Request_id-D14LSUN004

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

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

@@ -1878,9 +1878,11 @@ insert into obj_itemchange(obj_name,form_no,field_name)values('porderamd
 			    pstmt.setString(15,vouchcreated);
 			    pstmt.setString(16,sitecodeadv);
 			    pstmt.setDouble(17,  adjustmentperc);
-			    pstmt.setString(18,taskcode);System.out.println("@@@@@@@@@trem update executed.... lineNoPO:[" + lineNoPO + "]");
+			    pstmt.setString(18,taskcode);
+			    System.out.println("@@@@@@@@@trem update executed.... lineNoPO:[" + lineNoPO + "]");
 			  //  pstmt.setDate(19,duedate);
 				cnt = pstmt.executeUpdate();
+				
 				pstmt.close();
 				pstmt = null;
 
@@ -2239,6 +2241,7 @@ insert into obj_itemchange(obj_name,form_no,field_name)values('porderamd
 			System.out.println("Exception ::" + e.getMessage());
 			throw new ITMException(e);
 		}
+		
 
 		return errCode;
 	}

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

@@ -4133,6 +4133,16 @@ 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("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[]]>").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>");
@@ -4158,39 +4168,17 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde
 					valueXmlString.append("<site_code__adv__o>").append("<![CDATA[" + siteCode + "]]>").append("</site_code__adv__o>");
 					valueXmlString.append("<adj_perc >").append("<![CDATA[" + adjustmentperc + "]]>").append("</adj_perc>");
 					valueXmlString.append("<adj_perc__o >").append("<![CDATA[" + adjustmentperc + "]]>").append("</adj_perc__o>");
-					valueXmlString.append("<task_code >").append("<![CDATA[" + task_code + "]]>").append("</task_code>");
+					//valueXmlString.append("<task_code >").append("<![CDATA[" + task_code + "]]>").append("</task_code>");
 					valueXmlString.append("<task_code__o >").append("<![CDATA[" + task_code + "]]>").append("</task_code__o>");
 
 				}
-		    /*    else if (currentColumn.trim().equalsIgnoreCase("acct_code")) 
-		        {
-		        purcOrder = genericUtility.getColumnValue("purc_order",dom1);
-				value = genericUtility.getColumnValue("acct_code", dom1);
-				lineNoOrd = genericUtility.getColumnValue("line_no_ord",dom);
-				if (lineNoOrd != null && lineNoOrd.trim().length() > 0) 
-				{
-				sql = " Select descr From Accounts Where acct_code = ?";
-				pstmt = conn.prepareStatement(sql);
-				pstmt.setString(1, value);
-				rs = pstmt.executeQuery();
-				if (rs.next()) {
-					descr = checkNull(rs.getString(1));
-				}
-				rs.close();
-				rs = null;
-				pstmt.close();
-				pstmt = null;
-				valueXmlString.append("<accounts_descr>").append("<![CDATA[" + descr + "]]>").append("</accounts_descr>");
-				}
-				// valueXmlString.append("<descr>").append("<![CDATA["+descr+"]]>").append("</descr>");
-
-			}*/ 
 		    else if (currentColumn.trim().equalsIgnoreCase("rel_agnst")) 
 			        {
 				
 				value = genericUtility.getColumnValue("rel_agnst", dom);
-			task_code=genericUtility.getColumnValue("task_code", dom);
-				System.out.println("Release against@@@@@@"+value);
+			  task_code=genericUtility.getColumnValue("task_code", dom);
+			  System.out.println("Release against#####@@@@@@"+value);
+				System.out.println("Task code Release against!!!!!!!!!!@@@@@@"+task_code);
 				
 				if (value.equalsIgnoreCase("05")|| value.equalsIgnoreCase("06")) 
 				{
@@ -4207,6 +4195,8 @@ 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 item default edit#####@@@@@@"+value);
+				System.out.println("Task code itm default edit!!!!!!!!!!@@@@@@"+task_code);
 				if (value.equalsIgnoreCase("05")|| value.equalsIgnoreCase("06")) 
 				{
 					valueXmlString.append("<task_code protect = \"0\">").append("<![CDATA[" + task_code + "]]>").append("</task_code>");