SO amendment confirmation - while inserting taxtran the form_no also should be inserted for SO

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

webitm-dis/ibase/webitm/ejb/dis/adv/SOrderAmdConf.java

@@ -1425,10 +1425,16 @@ public class SOrderAmdConf extends ActionHandlerEJB implements SOrderAmdConfLoca
 				
 				if(liCnt > 0)
 				{
-					sql = "SELECT TRAN_CODE , TRAN_ID , LINE_NO , LINE_NO__TAX , TAX_CODE , TAX_CLASS , TAX_CHAP , TAX_BASE , TAX_ENV , TAXABLE_AMT , " +
+					/*sql = "SELECT 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  " +
 							"FROM TAXTRAN " +
+							"WHERE TRAN_CODE = 'S-ORD' AND TRAN_ID = ?  AND LINE_NO = ? ";*/
+					
+					sql = "SELECT 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 , FORM_NO  " +         //form_no added by manish mhatre on 26/6/2019
+							"FROM TAXTRAN " +
 							"WHERE TRAN_CODE = 'S-ORD' AND TRAN_ID = ?  AND LINE_NO = ? ";
 					
 					
@@ -1466,13 +1472,19 @@ public class SOrderAmdConf extends ActionHandlerEJB implements SOrderAmdConfLoca
 						posted = rs.getString("POSTED");
 						taxFormDate = rs.getTimestamp("TAX_FORM_DATE");
 						payTax = rs.getString("PAY_TAX");
+						formNo=rs.getString("FORM_NO");     //added by manish mhatre on 26/6/2019
 						
-						sqlln = "INSERT INTO TAXTRAN (TRAN_CODE , TRAN_ID , LINE_NO , LINE_NO__TAX , TAX_CODE , TAX_CLASS , TAX_CHAP , TAX_BASE , " +
+						/*sqlln = "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 ( ?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) ";
+								"VALUES ( ?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) ";*/
 						
+						sqlln = "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 , FORM_NO  )  " +            //FORM_NO added by manish mhatre on 26/6/2019
+								"VALUES ( ?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) ";
 						
 						pstmtln = conn.prepareStatement(sqlln);
 						pstmtln.setString(1, "S-ORO");
@@ -1506,12 +1518,16 @@ public class SOrderAmdConf extends ActionHandlerEJB implements SOrderAmdConfLoca
 						pstmtln.setString(29, posted);
 						pstmtln.setTimestamp(30, taxFormDate);
 						pstmtln.setString(31, payTax);
+						pstmtln.setString(32, formNo);      //added by manish mhatre on 26/6/2019
 						
 						cnt = pstmtln.executeUpdate();
 						pstmtln.close();
 						pstmtln = null;
 					
 					}
+					
+					System.out.println("tax____Amt:"+taxAmt);
+					System.out.println("form____no:"+formNo);
 					System.out.println("insert cnt:::["+cnt+"]");
 					rs.close();
 					rs = null;