Updated changes for date input for sales trend dashboard

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

webitm-dashboard/ibase/dashboard/fin/ejb/DWHCompleteEJB.java

@@ -65,7 +65,7 @@ public class DWHCompleteEJB extends ValidatorEJB
 						String refId =transDataObj.optString("ref_id");
 						String refSer =transDataObj.optString("ref_ser");
 						String refDate =transDataObj.optString("ref_date");
-						refDate=genericUtility.getValidDateString(refDate, sourceDateFormat, targetDateFormat);
+						//refDate=genericUtility.getValidDateString(refDate, sourceDateFormat, targetDateFormat);
 						System.out.println("DWHCompleteEJB ==== Insert query for transaction of records in DWH_SALES_SUM [" +refId+"] refSer ["+refSer+"] refDate ["+refDate+"]");
 						sql.append("INSERT INTO DWH_SALES_SUM ( ")
 						.append("CGST_AMT,  CGST_RATE,  SGST_RATE,  SGST_AMT,  DISC_AMT, IGST_RATE,IGST_AMT, MRP,  PTR,  PTS,TRAN_ID,SITE_CODE, CUST_CODE, ") 
@@ -199,7 +199,7 @@ public class DWHCompleteEJB extends ValidatorEJB
 						.append("  INNER JOIN PACKING ON ITEM.PACK_CODE=PACKING.PACK_CODE "  )  
 						.append("  WHERE INVOICE.CONFIRMED = 'Y' "  )  
 						.append("  AND ITEM.ITEM_SER       = ORG_STRUCTURE_CUST.TABLE_NO "  ) 
-						.append("  AND INVOICE.TRAN_DATE ='"+refDate+"' "  ) 
+						.append("  AND INVOICE.TRAN_DATE = TO_DATE('"+refDate+"','"+sourceDateFormat+"')")
 						.append("  AND INVOICE.INVOICE_ID ='"+refId+"' "  ) 
 						.append("  UNION ALL "   )  
 						.append("  SELECT NVL(FN_RGET_TAX_NEW('S-RET',INVOICE_TRACE.INVOICE_ID,CAST(INVOICE_TRACE.line_no AS CHAR(3)),'CGST_TAX',' ',' ','T'),0) AS CGST_AMT, "  )  
@@ -402,7 +402,7 @@ public class DWHCompleteEJB extends ValidatorEJB
 						.append("  INNER JOIN PACKING ON ITEM.PACK_CODE=PACKING.PACK_CODE " ) 
 						.append("  WHERE SRETURN.CONFIRMED     = 'Y' " ) 
 						.append("  AND ITEM.ITEM_SER           = ORG_STRUCTURE_CUST.TABLE_NO " ) 
-						.append("  AND SRETURN.TRAN_DATE ='"+refDate+"' "  ) 
+						.append("  AND SRETURN.TRAN_DATE = TO_DATE('"+refDate+"','"+sourceDateFormat+"')"  ) 
 						.append("  AND SRETURN.TRAN_ID ='"+refId+"' "  ) 
 						.append("  ) A ") 
 						.append(" LEFT OUTER JOIN CUSTOMER DC " ) 
@@ -429,7 +429,7 @@ public class DWHCompleteEJB extends ValidatorEJB
 						rs = null;
 
 						updateSql.append("UPDATE DWH_TRAN_LOAD SET UPDATE_STAT='C'")
-						.append("WHERE REF_ID='"+refId+"' AND REF_SER='"+refSer+"' AND REF_DATE='"+refDate+"'");
+						.append("WHERE REF_ID='"+refId+"' AND REF_SER='"+refSer+"' AND REF_DATE = TO_DATE('"+refDate+"','"+sourceDateFormat+"')");
 						 System.out.println("sql in dwh complete updateSql:::::: >>"+updateSql);
 						pstmt = userDbConn.prepareStatement(updateSql.toString());
 						rs    = pstmt.executeQuery();
@@ -628,9 +628,9 @@ public class DWHCompleteEJB extends ValidatorEJB
 				String refId =transDataObj.optString("ref_id");
 				String refSer =transDataObj.optString("ref_ser");
 				String refDate =transDataObj.optString("ref_date");
-				refDate=genericUtility.getValidDateString(refDate, sourceDateFormat, targetDateFormat);
+				//refDate=genericUtility.getValidDateString(refDate, sourceDateFormat, targetDateFormat);
 				System.out.println("DWHCompleteEJB ==== Delete query for transaction of records in DWH_SALES_SUM [" +refId+"] refSer ["+refSer+"] refDate ["+refDate+"]");
-				deleteSql.append("DELETE FROM DWH_SALES_SUM WHERE TRAN_ID = '"+refId+"' AND DOC_DATE ='"+refDate+"' AND  REF_SER ='"+refSer+"'");
+				deleteSql.append("DELETE FROM DWH_SALES_SUM WHERE TRAN_ID = '"+refId+"' AND DOC_DATE = TO_DATE('"+refDate+"','"+sourceDateFormat+"') AND  REF_SER ='"+refSer+"'");
 				System.out.println("delete sql ::::: "+deleteSql);
 				pstmt = conn.prepareStatement(deleteSql.toString());
 				rs    = pstmt.executeQuery();