D14LSUN004

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

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

@@ -1965,7 +1965,7 @@ insert into obj_itemchange(obj_name,form_no,field_name)values('porderamd
 							System.out.println("@@@@@@@@@term for Line:[" + i + "]::lineNo[" + lineNo + "]");		
 	
 								// 31/10/13 manoharan print_opt added
-								sql = " select purc_order,line_no__ord,min_day,max_day,fin_chg,fchg_type,min_amt,max_amt from poamd_dlv_term where amd_no = ? and line_no = ? ";
+								sql = " select purc_order,line_no__ord,ref_code,min_day,max_day,fin_chg,fchg_type,min_amt,max_amt from poamd_dlv_term where amd_no = ? and line_no = ? ";
 								pstmt = conn.prepareStatement(sql);
 								pstmt.setString(1, amdNo);
 								// pstmt.setString(2, lineNo);
@@ -1975,6 +1975,7 @@ insert into obj_itemchange(obj_name,form_no,field_name)values('porderamd
 								{
 									purcOrder = rs.getString("purc_order");
 									lineNoPO = rs.getString("line_no__ord");
+									refcode = rs.getString("ref_code");
 									minday=rs.getDouble("min_day");
 									maxday=rs.getDouble("max_day");
 									finchg=rs.getDouble("fin_chg");
@@ -2015,7 +2016,7 @@ insert into obj_itemchange(obj_name,form_no,field_name)values('porderamd
 									else
 									{
 										System.out.println("@@@@@@@@@trem update executed.... lineNoPO:[" + lineNoPO + "]");
-										sql = "	update pord_dlv_term set min_day=?,max_day=?,fin_chg=?,fchg_type=?,min_amt=?,max_amt=?,ref_code=? where purc_order = ? and   line_no = ? ";
+										sql = "	update pord_dlv_term set  ref_code=?, min_day=?,max_day=?,fin_chg=?,fchg_type=?,min_amt=?,max_amt=?,ref_code=? where purc_order = ? and   line_no = ? ";
 										pstmt = conn.prepareStatement(sql);
 										pstmt.setDouble(1,minday);
 										pstmt.setDouble(2,maxday);

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

@@ -2456,7 +2456,7 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde
 		double lastPurcRate = 0d;
 		String lastPurcPo = "";
 		long line_no = 0;
-		String value = "", task_code = "",amdno="",sitecodeadv="";
+		String value = "",value1="", task_code = "",amdno="",sitecodeadv="";
 		double relamt= 0,relafter= 0,adjustmentperc= 0 ;
 		String adjmet= "",acctcode="",cctrcode="",relagnst="",amttype="";
 		String type="",refcode="",fchgtype="";
@@ -4087,11 +4087,17 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde
 		        {
 				    lineNoOrd = checkNull(genericUtility.getColumnValue("line_no__ord", dom));
 					purcOrder = genericUtility.getColumnValue("purc_order",dom1);
+					//value1 = genericUtility.getColumnValue("rel_agnst", dom);
+					//System.out.println("LIne Noooooooooo111111111111111 order release against@@@@@@");
                      System.out.println("line order@@@@@@@@@@@@@@@@@@@@@@@@@@22"+lineNoOrd);
 					
 					//type,relase_amt,release_after,adj_method,acct_code,cctr_code,tax_class,tax_chap,tax_env,rentention_perc,site_code_adv,adjustment_perc,task_code
 					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);
@@ -4124,9 +4130,9 @@ 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 (value.equalsIgnoreCase("05")|| value.equalsIgnoreCase("06")) 
+					if (relagnst.equalsIgnoreCase("05")|| relagnst.equalsIgnoreCase("06")) 
 					{
-						System.out.println("Release against@@@@@@");
+						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 
@@ -4134,6 +4140,8 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde
 					
 						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>");