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@201858 ce508802-f39f-4f6c-b175-0d175dae99d5

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

@@ -1380,7 +1380,8 @@ public class SOrderAmdConf extends ActionHandlerEJB implements SOrderAmdConfLoca
 		String cctrCodeReco = "", recoPerc = "", acctCode = "", cctrCode = "", rateType = "", round = "", roundTo = "", taxForm = "",excedAmt1="";
 		String acctCodeApAdv = "", cctrCodeApAdv = "";
 		String taxChap = "", taxEnv = "", taxClass = "", packCode = "", packInstr = "", acctCodeDr = "", cctrCodeDr = "";		
-		String loginEmpCode = "", ediOption = "", dataStr = "" , chgUser = "", chgTerm = "", posted = "" , payTax = "";
+		String loginEmpCode = "", ediOption = "", dataStr = "" , chgUser = "", chgTerm = "", posted = "" , payTax = ""; 
+		String formNo="";  //formNo variable declared by manish mhatre on 10/6/2019
 		double taxableAmt = 0, taxAmt = 0, recoAmont = 0, poHdrTot = 0;
 		Timestamp sysDate = null ,chgDate = null, taxFormDate = null;
 
@@ -1569,12 +1570,16 @@ public class SOrderAmdConf extends ActionHandlerEJB implements SOrderAmdConfLoca
 					
 				}
 				
-				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 " +
+						"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-AMD' AND TRAN_ID = ?  AND LINE_NO = ? ";
-				
+						"WHERE TRAN_CODE = 'S-AMD' AND TRAN_ID = ?  AND LINE_NO = ? ";*/  //commented by manish mhatre on 11/6/2019
+				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 11/6/2019
+						" FROM TAXTRAN " +
+						" WHERE TRAN_CODE = 'S-AMD' AND TRAN_ID = ?  AND LINE_NO = ? ";
 				
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1, amdNo);
@@ -1610,13 +1615,24 @@ 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 11/6/2019
 					
-					sqlln = "INSERT INTO TAXTRAN (TRAN_CODE , TRAN_ID , LINE_NO , LINE_NO__TAX , TAX_CODE , TAX_CLASS , TAX_CHAP , TAX_BASE , " +
+					
+					System.out.println("Form no:"+formNo);
+					
+					
+					/*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 ( ?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) ";
+							"CHG_USER , CHG_TERM , POSTED , TAX_FORM_DATE , PAY_TAX )  " +                  
+							"VALUES ( ?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) ";  */  //commented by manish mhatre on 11/6/2019
+					
 					
+					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 11/6/2019
+							"VALUES ( ?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) ";  
 					
 					pstmtln = conn.prepareStatement(sqlln);
 					pstmtln.setString(1, "S-ORD");
@@ -1650,6 +1666,7 @@ 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 11/6/2019
 
 					cnt = pstmtln.executeUpdate();
 					pstmtln.close();