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

webitm-gst-client/ibase/webitm/ejb/gstclient/GstDataPrc.java

@@ -24829,18 +24829,17 @@ dtlSql =         " select '' as  TRAN_ID, "
 	                        
 	                     }
 						 
-						//PriyankaC on 08MArch2019.[START]
-						//dtlSql = dtlSql 
-						//+" '' as REMARKS ,"
-						 if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))    
-						 {
-							 dtlSql = dtlSql  +"(SELECT count(1) from taxtran ti, tax tm where tm.tax_code = ti.tax_code and ti.tran_id = i.tran_id and cast(ti.line_no as integer) = it.line_no and tm.tax_group in ('ITC','RCM') ) as REMARKS, ";
-						 }
-						 else
-						 {
-							 dtlSql = dtlSql  +"(SELECT count(1) from  taxtran ti, tax tm where tm.tax_code = ti.tax_code and ti.tran_id = i.tran_id and to_number(trim(ti.line_no)) = it.line_no and tm.tax_group in ('ITC','RCM') ) as REMARKS, ";
-						 }
-						//PriyankaC on 08MArch2019.[END]
+						 dtlSql = dtlSql 
+						+" '' as REMARKS ,";
+						 /* if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))    
+									 {
+										 dtlSql = dtlSql  +"(SELECT count(1) from taxtran ti, tax tm where tm.tax_code = ti.tax_code and ti.tran_id = i.tran_id and cast(ti.line_no as integer) = it.line_no and tm.tax_group in ('ITC','RCM') ) as REMARKS, ";
+									 }
+									 else
+									 {
+										 dtlSql = dtlSql  +"(SELECT count(1) from  taxtran ti, tax tm where tm.tax_code = ti.tax_code and ti.tran_id = i.tran_id and to_number(trim(ti.line_no)) = it.line_no and tm.tax_group in ('ITC','RCM') ) as REMARKS, ";
+									 }*/
+						 //PriyankaC on 08MArch2019.[END]
 						 if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))    
 						 {
 							dtlSql = dtlSql  +" fn_get_gst_rate('MDRCRC',i.tran_id,CAST(it.line_no as char(3))) as gst_rate ";
@@ -24867,7 +24866,7 @@ dtlSql =         " select '' as  TRAN_ID, "
 						 dtlSql = dtlSql 
 								
 						 +" and i.tran_id = ? ";
-				
+						 System.out.println("SQL for ref HDR and DTL : "+hdrSql +"  " +dtlSql);
 				  retString = executeSqlAndPopulateData(hdrSql,dtlSql,"EXP_PAY(MISC-CRN-REG)");
 		    
 			}
@@ -38528,7 +38527,12 @@ dtlSql =         " select '' as  TRAN_ID, "
 							pstmtInsDet.setString(20,remarksDet);
 							pstmtInsDet.setDouble(21,gstRate);
 							pstmtInsDet.setString(22,itc_type);
-							if(remarksDet != null && remarksDet.trim().length() > 0 && Integer.parseInt(remarksDet) > 0)
+							//As per discussed with Gaurav Changed By PriyankaC to set all taxes in  GST_DATA_DET on 13MARCH2019 [START].
+							pstmtInsDet.setDouble(23,igstAmt);
+							pstmtInsDet.setDouble(24,cgstAmt);
+							pstmtInsDet.setDouble(25,sgstAmt);
+							pstmtInsDet.setDouble(26,cessAmt);
+							/*if(remarksDet != null && remarksDet.trim().length() > 0 && Integer.parseInt(remarksDet) > 0)
 							{
 								pstmtInsDet.setDouble(23,igstAmt);
 								pstmtInsDet.setDouble(24,cgstAmt);
@@ -38541,7 +38545,9 @@ dtlSql =         " select '' as  TRAN_ID, "
 								pstmtInsDet.setDouble(24,0);
 								pstmtInsDet.setDouble(25,0);
 								pstmtInsDet.setDouble(26,0);
-							}
+							}*/
+							//As per discussed with Gaurav Changed By PriyankaC to set all taxes in  GST_DATA_DET on 13MARCH2019[END].
+
 						//	updCnt = pstmtInsDet.executeUpdate();
 							
 							pstmtInsDet.addBatch();