Commit 29df9181 authored by pjain's avatar pjain

SET DEFAULT DATE(CURRENT DATE ) FOR DC_DATE AND INVOICE_DATE.


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@96745 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 3da049f6
...@@ -761,8 +761,16 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc ...@@ -761,8 +761,16 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc
System.out.println("dcDate "+dcDate); System.out.println("dcDate "+dcDate);
String addEditD = checkNull(genericUtility.getColumnValue( "add", currDom )); String addEditD = checkNull(genericUtility.getColumnValue( "add", currDom ));
System.out.println("addEditD======================> "+addEditD); System.out.println("addEditD======================> "+addEditD);
java.util.Date upto_date_temp = (java.util.Date)sdf1.parse(dcDate.trim()); java.util.Date upto_date_temp=null;
java.sql.Date sqlDateFormat=new java.sql.Date(upto_date_temp.getTime()); java.sql.Date sqlDateFormat=null;
if("".equals(dcDate) || "null".equalsIgnoreCase(dcDate)){
System.out.println("invoiceDate================> Empty-=======");
}else{
upto_date_temp = (java.util.Date)sdf1.parse(dcDate.trim());
System.out.println("dcDate================> upto_date_temp-======="+upto_date_temp);
sqlDateFormat=new java.sql.Date(upto_date_temp.getTime());
System.out.println("dcDate================> upto_date_temp-======="+sqlDateFormat);
}
System.out.println("IN DC_NO validation"); System.out.println("IN DC_NO validation");
String dcNo = checkNull(genericUtility.getColumnValue( "dc_no", currDom ));//challan no String dcNo = checkNull(genericUtility.getColumnValue( "dc_no", currDom ));//challan no
...@@ -783,16 +791,26 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc ...@@ -783,16 +791,26 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc
{ {
dcCounter = rs.getInt(1); dcCounter = rs.getInt(1);
}*/ }*/
sql=" select count(*) as cnt from porcp "+
" where supp_code = ? "+
" and dc_no = ? " +
" and dc_date = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, suppCodeD);
pstmt.setString(2, dcNo);
pstmt.setDate(3, sqlDateFormat);
if("".equals(dcDate) || "null".equalsIgnoreCase(dcDate)){
sql=" select count(*) as cnt from porcp "+
" where supp_code = ? "+
" and dc_no = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, suppCodeD);
pstmt.setString(2, dcNo);
}else{
sql=" select count(*) as cnt from porcp "+
" where supp_code = ? "+
" and dc_no = ? and dc_date = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, suppCodeD);
pstmt.setString(2, dcNo);
pstmt.setDate(3, sqlDateFormat);
}
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if (rs.next()) if (rs.next())
{ {
dcCounter = rs.getInt(1); dcCounter = rs.getInt(1);
...@@ -802,17 +820,29 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc ...@@ -802,17 +820,29 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc
} }
else if(addEditD.equals("E")) else if(addEditD.equals("E"))
{ {
if("".equals(dcDate) || "null".equalsIgnoreCase(dcDate)){
sql=" select count(*) as cnt from porcp "+ sql=" select count(*) as cnt from porcp "+
" where supp_code = ? "+ " where supp_code = ? "+
" and dc_no = ? " + " and dc_no = ? " +
" and dc_date = ? " +
"and purc_order <> ? "; "and purc_order <> ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, suppCodeD); pstmt.setString(1, suppCodeD);
pstmt.setString(2, dcNo); pstmt.setString(2, dcNo);
pstmt.setDate(3, sqlDateFormat);
pstmt.setString(4, purcOrder); pstmt.setString(4, purcOrder);
}else{
sql=" select count(*) as cnt from porcp "+
" where supp_code = ? "+
" and dc_no = ? " +
" and dc_date = ? " +
"and purc_order <> ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, suppCodeD);
pstmt.setString(2, dcNo);
pstmt.setDate(3, sqlDateFormat);
pstmt.setString(4, purcOrder);
}
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if (rs.next()) if (rs.next())
{ {
...@@ -840,11 +870,19 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc ...@@ -840,11 +870,19 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc
String suppCodeD= checkNull(genericUtility.getColumnValue( "supp_code", currDom )); String suppCodeD= checkNull(genericUtility.getColumnValue( "supp_code", currDom ));
System.out.println("suppCodeD "+suppCodeD); System.out.println("suppCodeD "+suppCodeD);
String invoiceDate= checkNull(genericUtility.getColumnValue( "invoice_date", currDom )); String invoiceDate= checkNull(genericUtility.getColumnValue( "invoice_date", currDom ));
System.out.println("dcDate "+invoiceDate); System.out.println("invoiceDate================> "+invoiceDate);
String addEditD = checkNull(genericUtility.getColumnValue( "add", currDom )); String addEditD = checkNull(genericUtility.getColumnValue( "add", currDom ));
System.out.println("addEditD======================> "+addEditD); System.out.println("addEditD======================> "+addEditD);
java.util.Date upto_date_temp = (java.util.Date)sdf1.parse(invoiceDate.trim()); java.util.Date upto_date_temp=null;
java.sql.Date sqlDateFormat=new java.sql.Date(upto_date_temp.getTime()); java.sql.Date sqlDateFormat=null;
if("".equals(invoiceDate) || "null".equalsIgnoreCase(invoiceDate)){
System.out.println("invoiceDate================> Empty-=======");
}else{
upto_date_temp = (java.util.Date)sdf1.parse(invoiceDate.trim());
System.out.println("invoiceDate================> upto_date_temp-======="+upto_date_temp);
sqlDateFormat=new java.sql.Date(upto_date_temp.getTime());
System.out.println("invoiceDate================> sqlDateFormat-======="+sqlDateFormat);
}
int dcCounter=0; int dcCounter=0;
if( invoiceNo.trim().length() == 0 ) if( invoiceNo.trim().length() == 0 )
...@@ -867,15 +905,24 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc ...@@ -867,15 +905,24 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc
} }
rs.close(); rs = null; rs.close(); rs = null;
pstmt.close(); pstmt = null;*/ pstmt.close(); pstmt = null;*/
if("".equals(invoiceDate) || "null".equalsIgnoreCase(invoiceDate)){
sql=" select count(*) as cnt from porcp "+ sql=" select count(*) as cnt from porcp "+
" where supp_code = ? "+ " where supp_code = ? "+
" and invoice_no = ? " + " and invoice_no = ? " ;
" and invoice_date = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, suppCodeD); pstmt.setString(1, suppCodeD);
pstmt.setString(2, invoiceNo); pstmt.setString(2, invoiceNo);
pstmt.setDate(3, sqlDateFormat); }else{
sql=" select count(*) as cnt from porcp "+
" where supp_code = ? "+
" and invoice_no = ? " +
" and invoice_date = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, suppCodeD);
pstmt.setString(2, invoiceNo);
pstmt.setDate(3, sqlDateFormat);
}
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if (rs.next()) if (rs.next())
{ {
...@@ -887,16 +934,27 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc ...@@ -887,16 +934,27 @@ public class PoRcpRmPmIC extends ValidatorEJB implements PoRcpRmPmICRemote, PoRc
} }
else if(addEditD.equals("E")) else if(addEditD.equals("E"))
{ {
sql=" select count(*) as cnt from porcp "+ if("".equals(invoiceDate) || "null".equalsIgnoreCase(invoiceDate)){
" where supp_code = ? "+ sql=" select count(*) as cnt from porcp "+
" and invoice_no = ? " + " where supp_code = ? "+
" and invoice_date = ? " + " and invoice_no = ? " +
" and purc_order <> ? "; " and purc_order <> ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, suppCodeD); pstmt.setString(1, suppCodeD);
pstmt.setString(2, invoiceNo); pstmt.setString(2, invoiceNo);
pstmt.setDate(3, sqlDateFormat); pstmt.setString(4, purcOrder);
pstmt.setString(4, purcOrder); }else{
sql=" select count(*) as cnt from porcp "+
" where supp_code = ? "+
" and invoice_no = ? " +
" and invoice_date = ? " +
" and purc_order <> ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, suppCodeD);
pstmt.setString(2, invoiceNo);
pstmt.setDate(3, sqlDateFormat);
pstmt.setString(4, purcOrder);
}
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if (rs.next()) if (rs.next())
{ {
...@@ -3003,8 +3061,8 @@ private String disParmValue( Connection conn , String disparmVar ) throws ITMExc ...@@ -3003,8 +3061,8 @@ private String disParmValue( Connection conn , String disparmVar ) throws ITMExc
}else{ }else{
valueXmlString.append("<dc_no><![CDATA[").append(checkNull("")).append("]]></dc_no>"); valueXmlString.append("<dc_no><![CDATA[").append(checkNull("")).append("]]></dc_no>");
valueXmlString.append("<invoice_no><![CDATA[").append(checkNull("")).append("]]></invoice_no>"); valueXmlString.append("<invoice_no><![CDATA[").append(checkNull("")).append("]]></invoice_no>");
valueXmlString.append("<invoice_date><![CDATA[").append("").append("]]></invoice_date>"); valueXmlString.append("<invoice_date><![CDATA[").append(currDateStr).append("]]></invoice_date>");
valueXmlString.append("<dc_date><![CDATA[").append("").append("]]></dc_date>"); valueXmlString.append("<dc_date><![CDATA[").append(currDateStr).append("]]></dc_date>");
valueXmlString.append("<tran_code><![CDATA[").append(checkNull(tranCode)).append("]]></tran_code>"); valueXmlString.append("<tran_code><![CDATA[").append(checkNull(tranCode)).append("]]></tran_code>");
} }
//changed by sankara on 30/09/13 for set Invoice Date end. //changed by sankara on 30/09/13 for set Invoice Date end.
......
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