column form_no is added in insert query of taxtran

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

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

@@ -795,8 +795,8 @@ insert into obj_itemchange(obj_name,form_no,field_name)values('porderamd
 								sql = " select line_no__tax,tax_code,"
 										 + " tax_class,tax_chap,tax_base,tax_env,taxable_amt,tax_perc,tax_amt,chg_stat,tax_set,effect,"
 												+ " acct_code__reco,cctr_code__reco,reco_perc,reco_amount,acct_code,cctr_code,rate_type,round,round_to,"
-										 + " tax_form,chg_date,chg_user,chg_term,posted,tax_form_date,pay_tax "
-												+ " from taxtran where tran_code = ?  and   tran_id = ? and   line_no = ? ";
+										 + " tax_form,chg_date,chg_user,chg_term,posted,tax_form_date,pay_tax,form_no "
+												+ " from taxtran where tran_code = ?  and   tran_id = ? and   line_no = ? ";//form_no field added by priyanka as per manoj sharma instruction
 										pstmt = conn.prepareStatement(sql);
 										pstmt.setString(1, "P-ORD");
 										pstmt.setString(2, purcOrder);
@@ -833,14 +833,16 @@ insert into obj_itemchange(obj_name,form_no,field_name)values('porderamd
 											posted = rs.getString("posted");
 											taxFormDate = rs.getTimestamp("tax_form_date");
 											payTax = rs.getString("pay_tax");
+											formNo = rs.getString("form_no");
 
+											System.out.println("Getting Form====="+formNo);
 											/** Insert taxtran rows */
 											sql4 = " insert into taxtran (tran_code,tran_id,line_no,line_no__tax,tax_code,tax_class,"
 											+ " tax_chap,tax_base,tax_env,taxable_amt,tax_perc,tax_amt,chg_stat,tax_set	,	"
 													+ " effect,acct_code__reco,	cctr_code__reco,reco_perc,reco_amount,acct_code,"
 											+ "	cctr_code,rate_type,round,round_to,tax_form,chg_date,chg_user,chg_term,"
-													+ "	posted,tax_form_date,pay_tax) "
-											+ " values ( ?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,? ) ";
+													+ "	posted,tax_form_date,pay_tax,form_no) "
+											+ " values ( ?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) ";
 											pstmt4 = conn.prepareStatement(sql4);
 											pstmt4.setString(1, "P-ORO");
 											pstmt4.setString(2, purcOrder);
@@ -873,6 +875,7 @@ insert into obj_itemchange(obj_name,form_no,field_name)values('porderamd
 											pstmt4.setString(29, posted);
 											pstmt4.setTimestamp(30, taxFormDate);
 											pstmt4.setString(31, payTax);
+											pstmt4.setString(32, formNo);//form_no field added by priyanka as per manoj sharma instruction
 
 											cnt = pstmt4.executeUpdate();
 											pstmt4.close();
@@ -950,8 +953,8 @@ insert into obj_itemchange(obj_name,form_no,field_name)values('porderamd
 									sql = " select line_no__tax,tax_code,"
 									 + " tax_class,tax_chap,tax_base,tax_env,taxable_amt,tax_perc,tax_amt,chg_stat,tax_set,effect,"
 											+ " acct_code__reco,cctr_code__reco,reco_perc,reco_amount,acct_code,cctr_code,rate_type,round,round_to,"
-									 + " tax_form,chg_date,chg_user,chg_term,posted,tax_form_date,pay_tax "
-											+ " from taxtran where tran_code = ?  and   tran_id = ? and   line_no = ? ";
+									 + " tax_form,chg_date,chg_user,chg_term,posted,tax_form_date,pay_tax,form_no "
+											+ " from taxtran where tran_code = ?  and   tran_id = ? and   line_no = ? ";//added by priyanka 
 									pstmt = conn.prepareStatement(sql);
 									pstmt.setString(1, "P-AMD");
 									pstmt.setString(2, amdNo);
@@ -989,14 +992,15 @@ insert into obj_itemchange(obj_name,form_no,field_name)values('porderamd
 										posted = rs.getString("posted");
 										taxFormDate = rs.getTimestamp("tax_form_date");
 										payTax = rs.getString("pay_tax");
+										formNo = rs.getString("form_no");//form_no field added by priyanka as per manoj sharma instruction
 
 										/** Insert taxtran rows */
 										sql4 = " insert into taxtran (tran_code,tran_id,line_no,line_no__tax,tax_code,tax_class,"
 										+ " tax_chap,tax_base,tax_env,taxable_amt,tax_perc,tax_amt,chg_stat,tax_set	,	"
 												+ " effect,acct_code__reco,	cctr_code__reco,reco_perc,reco_amount,acct_code,"
 										+ "	cctr_code,rate_type,round,round_to,tax_form,chg_date,chg_user,chg_term,"
-												+ "	posted,tax_form_date,pay_tax) "
-										+ " values ( ?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,? ) ";
+												+ "	posted,tax_form_date,pay_tax,form_no) "
+										+ " values ( ?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) ";//form_no field added by priyanka as per manoj sharma instruction
 										pstmt4 = conn.prepareStatement(sql4);
 										pstmt4.setString(1, "P-ORD");
 										pstmt4.setString(2, purcOrder);
@@ -1034,7 +1038,7 @@ insert into obj_itemchange(obj_name,form_no,field_name)values('porderamd
 										pstmt4.setString(29, posted);
 										pstmt4.setTimestamp(30, taxFormDate);
 										pstmt4.setString(31, payTax);
-
+										pstmt4.setString(32, formNo);//added by priyanka
 										cnt = pstmt4.executeUpdate();
 										pstmt4.close();
 										pstmt4 = null;
@@ -1224,8 +1228,8 @@ insert into obj_itemchange(obj_name,form_no,field_name)values('porderamd
 								sql = " select line_no__tax,tax_code,"
 							+ " tax_class,tax_chap,tax_base,tax_env,taxable_amt,tax_perc,tax_amt,chg_stat,tax_set,effect,"
 										+ " acct_code__reco,cctr_code__reco,reco_perc,reco_amount,acct_code,cctr_code,rate_type,round,round_to," 
-							+ " tax_form,chg_date,chg_user,chg_term,posted,tax_form_date,pay_tax "
-										+ " from taxtran where tran_code = 'P-AMD' and   tran_id = ? and   line_no = ? ";
+							+ " tax_form,chg_date,chg_user,chg_term,posted,tax_form_date,pay_tax,form_no "
+										+ " from taxtran where tran_code = 'P-AMD' and   tran_id = ? and   line_no = ? ";//form_no field added by priyanka as per manoj sharma instruction
 								pstmt = conn.prepareStatement(sql);
 								pstmt.setString(1, amdNo);
 								pstmt.setString(2, lineNo);
@@ -1262,14 +1266,15 @@ insert into obj_itemchange(obj_name,form_no,field_name)values('porderamd
 									posted = rs.getString("posted");
 									taxFormDate = rs.getTimestamp("tax_form_date");
 									payTax = rs.getString("pay_tax");
+									formNo = rs.getString("form_no");//form_no field added by priyanka as per manoj sharma instruction
 
 									/** Insert taxtran rows */
 									sql4 = " insert into taxtran (tran_code,tran_id,line_no,line_no__tax,tax_code,tax_class," 
 									+ " tax_chap,tax_base,tax_env,taxable_amt,tax_perc,tax_amt,chg_stat,tax_set	,	"
 											+ " effect,acct_code__reco,	cctr_code__reco,reco_perc,reco_amount,acct_code,"
 									+ "	cctr_code,rate_type,round,round_to,tax_form,chg_date,chg_user,chg_term,"
-											+ "	posted,tax_form_date,pay_tax) "
-									+ " values ( ?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,? ) ";
+											+ "	posted,tax_form_date,pay_tax,form_no) "
+									+ " values ( ?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) ";//form_no field added by priyanka as per manoj sharma instruction
 									pstmt4 = conn.prepareStatement(sql4);
 									pstmt4.setString(1, "P-ORD");
 									pstmt4.setString(2, purcOrder);
@@ -1305,6 +1310,7 @@ insert into obj_itemchange(obj_name,form_no,field_name)values('porderamd
 									pstmt4.setString(29, posted);
 									pstmt4.setTimestamp(30, taxFormDate);
 									pstmt4.setString(31, payTax);
+									pstmt4.setString(32, formNo);//form_no field added by priyanka as per manoj sharma instruction
 
 									cnt = pstmt4.executeUpdate();
 									pstmt4.close();
@@ -1516,7 +1522,7 @@ insert into obj_itemchange(obj_name,form_no,field_name)values('porderamd
 							sql = " select line_no__tax,tax_code,"
 							 + " tax_class,tax_chap,tax_base,tax_env,taxable_amt,tax_perc,tax_amt,chg_stat,tax_set,effect,"
 									+ " acct_code__reco,cctr_code__reco,reco_perc,reco_amount,acct_code,cctr_code,rate_type,round,round_to,"
-							 + " tax_form,chg_date,chg_user,chg_term,posted,tax_form_date,pay_tax "
+							 + " tax_form,chg_date,chg_user,chg_term,posted,tax_form_date,pay_tax,form_no"
 									+ " from taxtran where tran_code = ?  and   tran_id = ? and   line_no = ? ";
 							pstmt = conn.prepareStatement(sql);
 							pstmt.setString(1, "P-AMD");
@@ -1554,18 +1560,19 @@ insert into obj_itemchange(obj_name,form_no,field_name)values('porderamd
 								posted = rs.getString("posted");
 								taxFormDate = rs.getTimestamp("tax_form_date");
 								payTax = rs.getString("pay_tax");
+								formNo = rs.getString("form_no");
 								
 								/** Insert tax tran row */
 								sql4 = " insert into taxtran (tran_code,tran_id,line_no,line_no__tax,tax_code,tax_class,"
 										+ " tax_chap,tax_base,tax_env,taxable_amt,tax_perc,tax_amt,chg_stat,tax_set	,	"
 												+ " effect,acct_code__reco,	cctr_code__reco,reco_perc,reco_amount,acct_code," 
 										+ "	cctr_code,rate_type,round,round_to,tax_form,chg_date,chg_user,chg_term,"
-												+ "	posted,tax_form_date,pay_tax) "
+												+ "	posted,tax_form_date,pay_tax,form_no) "
 										+ " values ("
 												+ " ?,?,?,?,?,?,?,?,?,?," 
 										+ " ?,?,?,?,?,?,?,?,?,?," 
 												+ " ?,?,?,?,?,?,?,?,?,?," 
-										+ " ? ) ";
+										+ " ?,? ) ";//form_no field added by priyanka as per manoj sharma instruction
 										pstmt4 = conn.prepareStatement(sql4);
 										pstmt4.setString(1, "P-ORD");
 										pstmt4.setString(2, purcOrder);
@@ -1599,6 +1606,7 @@ insert into obj_itemchange(obj_name,form_no,field_name)values('porderamd
 										pstmt4.setString(29, posted);
 										pstmt4.setTimestamp(30, taxFormDate);
 										pstmt4.setString(31, payTax);
+										pstmt4.setString(32, formNo);//form_no field added by priyanka as per manoj sharma instruction
 
 										cnt = pstmt4.executeUpdate();
 										pstmt4.close();