print_opt set in pord_term

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

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

@@ -161,7 +161,7 @@ POrderAmdConfLocal, POrderAmdConfRemote
 
 						if (errString == null || errString.trim().length() == 0) 
 						{
-							errString = gbf_retrieve_pordamd(amdNo, xtraParams,conn);
+							errString = RetrievePordAmd(amdNo, xtraParams,conn);
 						}
 					}
 				}
@@ -207,7 +207,7 @@ POrderAmdConfLocal, POrderAmdConfRemote
 		return errString;
 	}
 
-	private String gbf_retrieve_pordamd(String amdNo, String xtraParams,
+	private String RetrievePordAmd(String amdNo, String xtraParams,
 			Connection conn) throws RemoteException, ITMException
 			{
 
@@ -222,7 +222,7 @@ POrderAmdConfLocal, POrderAmdConfRemote
 		ITMDBAccessEJB itmDBAccessLocal = new ITMDBAccessEJB();
 		try {
 			System.out
-			.println("@@@@@@@@@@@@@@@ gbf_retrieve_pordamd confirm called..............");
+			.println("@@@@@@@@@@@@@@@ RetrievePordAmd confirm called..............");
 
 			loginEmpCode =  genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginEmpCode");
 			Calendar currentDate = Calendar.getInstance();
@@ -294,7 +294,7 @@ POrderAmdConfLocal, POrderAmdConfRemote
 				}
 			}
 
-			errCode = gbf_confirm_pordamd(amdNo, conn);
+			errCode = ConfirmPordAmd(amdNo, conn);
 
 			if (errCode != null && errCode.trim().length() > 0) 
 			{
@@ -393,7 +393,7 @@ POrderAmdConfLocal, POrderAmdConfRemote
 		return errCode;
 		}
 
-	private String gbf_confirm_pordamd(String amdNo, Connection conn)
+	private String ConfirmPordAmd(String amdNo, Connection conn)
 			throws RemoteException, ITMException
 
 	{
@@ -433,9 +433,10 @@ POrderAmdConfLocal, POrderAmdConfRemote
 		double frtRate = 0, frtAmtQty = 0, frtAmtFixed = 0;
 		GenericUtility genericUtility = GenericUtility.getInstance();
 		ITMDBAccessEJB itmDBAccessLocal = new ITMDBAccessEJB();
+		String termCode = "", descr = "", printOpt = "";
 		try 
 		{
-			System.out.println("@@@@@@@@@@@@@@@ gbf_confirm_pordamd method called next..............");
+			System.out.println("@@@@@@@@@@@@@@@ ConfirmPordAmd method called next..............");
 			Calendar currentDate = Calendar.getInstance();
 			SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
 			String sysDateStr = sdf.format(currentDate.getTime());
@@ -1324,8 +1325,9 @@ POrderAmdConfLocal, POrderAmdConfRemote
 						//for (int i = 1; i < Integer.parseInt(lastTermLine); i++) 
 						for (int i = 1; i <= cntTerm; i++)
 						{
-							String termCode = "", descr = "";
-							sql = " select purc_order,line_no_ord,term_code,descr from poamd_term where amd_no = ? and line_no = ? ";
+							
+							// 31/10/13 manoharan print_opt added
+							sql = " select purc_order,line_no_ord,term_code,descr, print_opt from poamd_term where amd_no = ? and line_no = ? ";
 							pstmt = conn.prepareStatement(sql);
 							pstmt.setString(1, amdNo);
 							pstmt.setString(2, lineNo);
@@ -1335,6 +1337,7 @@ POrderAmdConfLocal, POrderAmdConfRemote
 								lineNoPO = rs.getString("line_no_ord");
 								termCode = rs.getString("term_code");
 								descr = rs.getString("descr");
+								printOpt = rs.getString("print_opt");
 							}
 							rs.close();
 							rs = null;
@@ -1350,12 +1353,14 @@ POrderAmdConfLocal, POrderAmdConfRemote
 							
 								lineNoPO = lastTermLine;
 
-								sql = " insert into pord_term ( purc_order, line_no, term_code, descr ) values (?,?,?,?) ";
+								sql = " insert into pord_term ( purc_order, line_no, term_code, descr , print_opt) values (?,?,?,?, ?) ";
 								pstmt = conn.prepareStatement(sql);
 								pstmt.setString(1, purcOrder);
 								pstmt.setString(2, lineNoPO);
 								pstmt.setString(3, termCode);
 								pstmt.setString(4, descr);
+								pstmt.setString(5, printOpt);
+								
 								cnt = pstmt.executeUpdate();
 								pstmt.close();
 								pstmt = null;
@@ -1364,12 +1369,13 @@ POrderAmdConfLocal, POrderAmdConfRemote
 							else
 							{
 								System.out.println("@@@@@@@@@trem update executed.... lineNoPO:["+lineNoPO+"]");
-								sql = "	update pord_term set term_code = ?, descr = ? where purc_order = ? and   line_no = ? ";
+								sql = "	update pord_term set term_code = ?, descr = ?, print_opt = ?  where purc_order = ? and   line_no = ? ";
 								pstmt = conn.prepareStatement(sql);
 								pstmt.setString(1, termCode);
 								pstmt.setString(2, descr);
-								pstmt.setString(3, purcOrder);
-								pstmt.setString(4, lineNoPO);
+								pstmt.setString(3, printOpt);
+								pstmt.setString(4, purcOrder);
+								pstmt.setString(5, lineNoPO);
 								updCnt = pstmt.executeUpdate();
 								pstmt.close();
 								pstmt = null;
@@ -1447,14 +1453,14 @@ POrderAmdConfLocal, POrderAmdConfRemote
 					rs = null;
 					pstmt.close();
 					pstmt = null;
-
+					// 31/10/13 manoharan emp_code__aprv should not be changed to amendment approver
 					if (cnt > 0)
 					{
 						sql = " update porder set amd_no = ?, amd_date=?, site_code__dlv=?, site_code__ord=?,site_code__bill=?,dept_code=?,"
 								+ "supp_code=?,emp_code=?,item_ser=?,tax_opt=?,cr_term=?,ord_amt=?,tax_amt=?,tot_amt=?,curr_code=?,exch_rate=?,"
 								+ "tax_chap=?,tax_class=?,tax_env=?,remarks=?,tax_date=?,proj_code=?,sales_pers=?,comm_perc=?,comm_perc__on=?,"
 								+ "curr_code__comm=?,quot_no=?,tran_code=?,frt_amt=?,curr_code__frt=?,frt_term=?,dlv_term=?,insurance_amt	=?,"
-								+ "curr_code__ins	=?,emp_code__aprv=?,ref_date=?,advance=?, "
+								+ "curr_code__ins	=?,ref_date=?,advance=?, "
 								+ "frt_type = ?, frt_rate=?, frt_amt__qty=? , frt_amt__fixed = ? "
 								+ " where purc_order = ? ";
 						pstmt = conn.prepareStatement(sql);
@@ -1492,14 +1498,14 @@ POrderAmdConfLocal, POrderAmdConfRemote
 						pstmt.setString(32, dlvTerm);
 						pstmt.setDouble(33, insuranceAmt);
 						pstmt.setString(34, currCodeIns);
-						pstmt.setString(35, empCodeAprv);
-						pstmt.setTimestamp(36, refDate);
-						pstmt.setString(37, advance);
-						pstmt.setString(38, frtType);
-						pstmt.setDouble(39, frtRate);
-						pstmt.setDouble(40, frtAmtQty);
-						pstmt.setDouble(41, frtAmtFixed);
-						pstmt.setString(42, purcOrder);
+						//pstmt.setString(35, empCodeAprv);
+						pstmt.setTimestamp(35, refDate);
+						pstmt.setString(36, advance);
+						pstmt.setString(37, frtType);
+						pstmt.setDouble(38, frtRate);
+						pstmt.setDouble(39, frtAmtQty);
+						pstmt.setDouble(40, frtAmtFixed);
+						pstmt.setString(41, purcOrder);
 						updCnt = pstmt.executeUpdate();
 						pstmt.close();
 						pstmt = null;