Skip to content

B
business-java
Commit 33932919 authored by ssalve's avatar ssalve
Browse files
Options

remove validation for Ecomm gstin no and added condition for ref_date_inv on 28JUL2017 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@106411 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 30f56577
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 9 deletions
webitm-gst/ibase/webitm/ejb/gst/GstrIC.java
View file @ 33932919
...@@ -475,7 +475,8 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -475,7 +475,8 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
// ************************* Validation for Amount [end] ********************************************* // ************************* Validation for Amount [end] *********************************************
// ******************* Validation for Ecommerce GTIN Number [start] *************************** // ******************* Validation for Ecommerce GTIN Number [start] ***************************
if("I".equalsIgnoreCase(gst_type)) // Commented by sarita on 28JUL2017
/* if("I".equalsIgnoreCase(gst_type))
{ {
if("DE".equalsIgnoreCase(doc_type) || "Z".equalsIgnoreCase(doc_type)) if("DE".equalsIgnoreCase(doc_type) || "Z".equalsIgnoreCase(doc_type))
{ {
...@@ -486,7 +487,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -486,7 +487,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
errFields.add("ecom_reg_no"); errFields.add("ecom_reg_no");
} }
} }
} }*/
// ******************* Validation for Ecommerce GTIN Number [end] *************************** // ******************* Validation for Ecommerce GTIN Number [end] ***************************
// ************************* Validation for ref_id__inv [start] ************************************** // ************************* Validation for ref_id__inv [start] **************************************
...@@ -762,7 +763,8 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -762,7 +763,8 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
String dt = "01/07/2017"; String dt = "01/07/2017";
invDate = Timestamp.valueOf(genericUtility.getValidDateString(dt, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0"); invDate = Timestamp.valueOf(genericUtility.getValidDateString(dt, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
//System.out.println("Return Value"+"ref_id__inv is ["+refIdInv+"]"+"ref_date__inv["+ref_date__inv+"]"+"refInvDateDate["+refInvDateDate+"]"+"Date1/7/17["+dt+"]"+"invDate["+invDate+"]"); //System.out.println("Return Value"+"ref_id__inv is ["+refIdInv+"]"+"ref_date__inv["+ref_date__inv+"]"+"refInvDateDate["+refInvDateDate+"]"+"Date1/7/17["+dt+"]"+"invDate["+invDate+"]");
if(refInvDateDate.after(invDate)) //changes by sarita on 28JUL2017
if(refInvDateDate.equals(invDate) || refInvDateDate.after(invDate))
{ {
if(gst_rate == null || gst_rate.trim().length() == 0) if(gst_rate == null || gst_rate.trim().length() == 0)
{ {
...@@ -825,7 +827,8 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -825,7 +827,8 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
String dt = "01/07/2017"; String dt = "01/07/2017";
invDate = Timestamp.valueOf(genericUtility.getValidDateString(dt, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0"); invDate = Timestamp.valueOf(genericUtility.getValidDateString(dt, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
//System.out.println("Return Value"+"ref_id__inv is ["+refIdInv+"]"+"ref_date__inv["+ref_date__inv+"]"+"refInvDateDate["+refInvDateDate+"]"+"Date1/7/17["+dt+"]"+"invDate["+invDate+"]"); //System.out.println("Return Value"+"ref_id__inv is ["+refIdInv+"]"+"ref_date__inv["+ref_date__inv+"]"+"refInvDateDate["+refInvDateDate+"]"+"Date1/7/17["+dt+"]"+"invDate["+invDate+"]");
if(refInvDateDate.after(invDate)) //changes by sarita on 28JUL2017
if(refInvDateDate.equals(invDate) || refInvDateDate.after(invDate))
{ {
sql = "select gst_code from gst_data_hdr where doc_no=?"; sql = "select gst_code from gst_data_hdr where doc_no=?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -914,7 +917,8 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -914,7 +917,8 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
String dt = "01/07/2017"; String dt = "01/07/2017";
invDate = Timestamp.valueOf(genericUtility.getValidDateString(dt, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0"); invDate = Timestamp.valueOf(genericUtility.getValidDateString(dt, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
//System.out.println("Return Value"+"ref_id__inv is ["+refIdInv+"]"+"ref_date__inv["+ref_date__inv+"]"+"refInvDateDate["+refInvDateDate+"]"+"Date1/7/17["+dt+"]"+"invDate["+invDate+"]"); //System.out.println("Return Value"+"ref_id__inv is ["+refIdInv+"]"+"ref_date__inv["+ref_date__inv+"]"+"refInvDateDate["+refInvDateDate+"]"+"Date1/7/17["+dt+"]"+"invDate["+invDate+"]");
if(refInvDateDate.after(invDate)) //changes by sarita on 28JUL2017
if(refInvDateDate.equals(invDate) || refInvDateDate.after(invDate))
{ {
sql = "select gst_code from gst_data_hdr where doc_no=?"; sql = "select gst_code from gst_data_hdr where doc_no=?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -1002,7 +1006,8 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -1002,7 +1006,8 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
String dt = "01/07/2017"; String dt = "01/07/2017";
invDate = Timestamp.valueOf(genericUtility.getValidDateString(dt, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0"); invDate = Timestamp.valueOf(genericUtility.getValidDateString(dt, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
//System.out.println("Return Value"+"ref_id__inv is ["+refIdInv+"]"+"ref_date__inv["+ref_date__inv+"]"+"refInvDateDate["+refInvDateDate+"]"+"Date1/7/17["+dt+"]"+"invDate["+invDate+"]"); //System.out.println("Return Value"+"ref_id__inv is ["+refIdInv+"]"+"ref_date__inv["+ref_date__inv+"]"+"refInvDateDate["+refInvDateDate+"]"+"Date1/7/17["+dt+"]"+"invDate["+invDate+"]");
if(refInvDateDate.after(invDate)) //changes by sarita on 28JUL2017
if(refInvDateDate.equals(invDate) || refInvDateDate.after(invDate))
{ {
sql = "select gst_code from gst_data_hdr where doc_no=?"; sql = "select gst_code from gst_data_hdr where doc_no=?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -1285,7 +1290,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -1285,7 +1290,7 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
rs = null; rs = null;
} }
}//end of if block for obj_name='gstr_purc' }//end of if block for obj_name='gstr_purc'
//added by sarita on 27JUL2017 //added by sarita on 27JUL2017s
gst_type = checkNull(genericUtility.getColumnValue("gst_type", dom)); gst_type = checkNull(genericUtility.getColumnValue("gst_type", dom));
if("L".equalsIgnoreCase(gst_type)) if("L".equalsIgnoreCase(gst_type))
{ {
...@@ -2272,7 +2277,8 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -2272,7 +2277,8 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
String dt = "01/07/2017"; String dt = "01/07/2017";
invDate = Timestamp.valueOf(genericUtility.getValidDateString(dt, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0"); invDate = Timestamp.valueOf(genericUtility.getValidDateString(dt, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
System.out.println("ref_id__inv is ["+refIdInv+"]"+"ref_date__inv["+ref_date__inv+"]"+"refInvDateDate["+refInvDateDate+"]"+"Date1/7/17["+dt+"]"+"invDate["+invDate+"]"); System.out.println("ref_id__inv is ["+refIdInv+"]"+"ref_date__inv["+ref_date__inv+"]"+"refInvDateDate["+refInvDateDate+"]"+"Date1/7/17["+dt+"]"+"invDate["+invDate+"]");
if(refInvDateDate.after(invDate)) //changes by sarita on 28JUL2017
if(refInvDateDate.equals(invDate) || refInvDateDate.after(invDate))
{ {
sql = "select gst_code from gst_data_hdr where doc_no=?"; sql = "select gst_code from gst_data_hdr where doc_no=?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -2366,7 +2372,8 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal ...@@ -2366,7 +2372,8 @@ public class GstrIC extends ValidatorEJB implements GstrICRemote, GstrICLocal
String dt = "01/07/2017"; String dt = "01/07/2017";
invDate = Timestamp.valueOf(genericUtility.getValidDateString(dt, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0"); invDate = Timestamp.valueOf(genericUtility.getValidDateString(dt, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
System.out.println("ref_id__inv is ["+refIdInv+"]"+"ref_date__inv["+ref_date__inv+"]"+"refInvDateDate["+refInvDateDate+"]"+"Date1/7/17["+dt+"]"+"invDate["+invDate+"]"); System.out.println("ref_id__inv is ["+refIdInv+"]"+"ref_date__inv["+ref_date__inv+"]"+"refInvDateDate["+refInvDateDate+"]"+"Date1/7/17["+dt+"]"+"invDate["+invDate+"]");
if(refInvDateDate.after(invDate)) //changes by sarita on 28JUL2017
if(refInvDateDate.equals(invDate) || refInvDateDate.after(invDate))
{ {
sql = "select gst_code from gst_data_hdr where doc_no=?"; sql = "select gst_code from gst_data_hdr where doc_no=?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment