Skip to content

B
business-java
Commit 3460be82 authored by rbhogale's avatar rbhogale
Browse files
Options

Changed by Rohan on 27-06-13 for sankara due dated changes 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@93267 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 42741ba9
Show whitespace changes
Inline Side-by-side
Showing with 121 additions and 9 deletions
webitm-wms/ibase/webitm/ejb/wms/WaveGenerationIC.java
View file @ 3460be82
......@@ -129,6 +129,12 @@ etc
String waveMode = ""; //Added by sumit 06/12/12
String parcelPackAllow = "";//Added by sumit 29/12/12
String custCodeDlv = "";//added by sumit on 13/05/13
//changed by sankara on 22/06/13 Start...
java.sql.Date dateTo = null;
HashMap hm = new HashMap();
String tranDate ="";
String tranDateTo ="";
//changed by sankara on 22/06/13 End...
try
{
String applDateFmt = genericUtility.getApplDateFormat();
......@@ -225,7 +231,8 @@ etc
if(rs.next())
{
dateFrom = rs.getDate(1);
// changed by sankara on 22/06/2013 Due date From set as min due date in below
//dateFrom = rs.getDate(1);
custCodeFrom = rs.getString("CUST_CODE").trim();
singleLotSl = rs.getString("SINGLE_LOT");
masterPackAllow = rs.getString("MASTER_PACK_ALLOW");
......@@ -238,7 +245,9 @@ etc
if(dateFrom != null)
{
String tranDate = genericUtility.getValidDateString( dateFrom.toString() , dbDateFmt, applDateFmt );
//changed by sankara on 22-06-2013 trandate is already defined as varible in method
// String tranDate = genericUtility.getValidDateString( dateFrom.toString() , dbDateFmt, applDateFmt );
tranDate = genericUtility.getValidDateString( dateFrom.toString() , dbDateFmt, applDateFmt );
//String dateFromInString=dtFormat.format(dateFrom);
System.out.println("currDateStr=+++++++++++++"+tranDate);
System.out.println("Hello sale_order__from3");
......@@ -332,9 +341,28 @@ etc
columnValue = genericUtility.getColumnValue("sale_order__to",currDom);
saleOrderFrom = checkNull(genericUtility.getColumnValue("sale_order__from",currDom));
custCodeFrom = checkNull(genericUtility.getColumnValue("cust_code__from",currDom));
valueXmlString.append( "<Detail1>\r\n" );
//System.out.println("columnValue1="+columnValue);
//System.out.println("Hello sale_order__from");
valueXmlString.append( "<Detail1>\r\n" );
//changed by sankara on 22/JUN/13 for setting min max due date[Start..]
hm = getDueDate( saleOrderFrom,columnValue,conn);
dateFrom =(java.sql.Date)hm.get("MIN_DATE");
dateTo =(java.sql.Date)hm.get("MAX_DATE");
System.out.println("DATEFROM"+dateFrom);
if(dateFrom == null )
{
System.out.println("INSIDEFORLOOP");
valueXmlString.append( "<due_date__from><![CDATA[" ).append("" ).append( "]]></due_date__from>\r\n" );
}
if(dateTo == null )
{
System.out.println("INSIDEFORLOOPTO");
valueXmlString.append( "<due_date__to><![CDATA[" ).append("" ).append( "]]></due_date__to>\r\n" );
}
//changed by sankara on 22/JUN/13 for setting min max due date[end]
if(columnValue != null && !columnValue.equalsIgnoreCase("ZZ"))
{
......@@ -364,7 +392,8 @@ etc
if(rs.next())
{
dateFrom = rs.getDate(1);
// changed by sankara on 22/06/2013 Due date To set as max due date in below
// dateFrom = rs.getDate(1);
custCodeTo = rs.getString("CUST_CODE").trim();
singleLotSl = rs.getString("SINGLE_LOT");
masterPackAllow = rs.getString("MASTER_PACK_ALLOW");
......@@ -376,11 +405,15 @@ etc
}
if(dateFrom != null)
{
String tranDate = genericUtility.getValidDateString( dateFrom.toString() , dbDateFmt, applDateFmt );
//changed by sankara on 22/06/13 for setting min max due date [start]
//String tranDate = genericUtility.getValidDateString( dateFrom.toString() , dbDateFmt, applDateFmt );
tranDate = genericUtility.getValidDateString( dateFrom.toString() , dbDateFmt, applDateFmt );
tranDateTo = genericUtility.getValidDateString( dateTo.toString() , dbDateFmt, applDateFmt );
//System.out.println("currDateStr=+++++++++++++"+tranDate);
//System.out.println("Hello sale_order__from3");
valueXmlString.append( "<due_date__to><![CDATA[" ).append( tranDate ).append( "]]></due_date__to>\r\n" );
//Changed by sumit on 20/09/12 setting value of cust_code__to.
valueXmlString.append( "<due_date__from><![CDATA[" ).append( tranDate ).append( "]]></due_date__from>\r\n" );
valueXmlString.append( "<due_date__to><![CDATA[" ).append( tranDateTo ).append( "]]></due_date__to>\r\n" );
//changed by sankara on 22/06/13 for setting min max due date [end]
valueXmlString.append( "<cust_code__to><![CDATA[" ).append( custCodeTo ).append( "]]></cust_code__to>\r\n" );
if( columnValue.trim().equalsIgnoreCase(saleOrderFrom.trim()))
{
......@@ -420,7 +453,11 @@ etc
}
else
{
//changed by sankara on 19/jun13 steeing due date from to blank satrt..
//valueXmlString.append( "<due_date__to><![CDATA[" ).append("").append( "]]></due_date__to>\r\n" );
valueXmlString.append( "<due_date__from><![CDATA[" ).append("").append( "]]></due_date__from>\r\n" );
valueXmlString.append( "<due_date__to><![CDATA[" ).append("").append( "]]></due_date__to>\r\n" );
//changed by sankara on 19/jun13 steeing due date from to blank end..
//Changed by sumit on 20/09/12 setting value of cust_code__to in case of no data.
valueXmlString.append( "<cust_code__from><![CDATA[" ).append( "00" ).append( "]]></cust_code__from>\r\n" );
valueXmlString.append( "<cust_code__to><![CDATA[" ).append( "ZZ" ).append( "]]></cust_code__to>\r\n" );
......@@ -455,7 +492,15 @@ etc
}
else
{
valueXmlString.append( "<due_date__to><![CDATA[" ).append("").append( "]]></due_date__to>\r\n" );
// changed by sankara on 22/06/2013 for setting min max due date start...
//valueXmlString.append( "<due_date__to><![CDATA[" ).append("").append( "]]></due_date__to>\r\n" );
tranDate = genericUtility.getValidDateString( dateFrom.toString() , dbDateFmt, applDateFmt );
tranDateTo = genericUtility.getValidDateString( dateTo.toString() , dbDateFmt, applDateFmt );
//valueXmlString.append( "<due_date__to><![CDATA[" ).append("").append( "]]></due_date__to>\r\n" );
valueXmlString.append( "<due_date__from><![CDATA[" ).append( tranDate ).append( "]]></due_date__from>\r\n" );
valueXmlString.append( "<due_date__to><![CDATA[" ).append( tranDateTo ).append( "]]></due_date__to>\r\n" );
// changed by sankara on 22/06/2013 for setting min max due date end...
//Changed by sumit on 20/09/12 setting value of cust_code__to in case of no data.
valueXmlString.append( "<cust_code__from><![CDATA[" ).append( "00" ).append( "]]></cust_code__from>\r\n" );
valueXmlString.append( "<cust_code__to><![CDATA[" ).append( "ZZ" ).append( "]]></cust_code__to>\r\n" );
......@@ -634,7 +679,74 @@ etc
//Changed by sumit on 13/05/13 closing connection end.
return valueXmlString.toString();
}
// changed by sankara on 18/JUN/13 for setting due_date__from and due_date__to[Start..]
public HashMap getDueDate( String saleOrderFrom, String saleOrderTo,Connection conn )throws RemoteException, ITMException
{
String sql = "";
PreparedStatement pstmt = null;
ResultSet rs = null;
java.sql.Date minDueDate = null;
java.sql.Date maxDueDate = null;
HashMap hm = new HashMap();
GenericUtility genericUtility = GenericUtility.getInstance();
try
{
sql = " SELECT MIN(DUE_DATE),MAX(DUE_DATE) FROM SORDER WHERE SALE_ORDER BETWEEN ? AND ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, saleOrderFrom);
pstmt.setString(2, saleOrderTo);
rs = pstmt.executeQuery();
if(rs.next())
{
minDueDate = rs.getDate(1);
maxDueDate = rs.getDate(2);
hm.put("MIN_DATE",minDueDate);
hm.put("MAX_DATE",maxDueDate);
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(rs != null)
{
rs.close();
rs = null;
}
}
catch(Exception ex)
{
ex.printStackTrace();
throw new ITMException(ex);
}
finally
{
try
{
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
if ( rs != null )
{
rs.close();
rs = null;
}
}
catch ( Exception e )
{
e.printStackTrace();
throw new ITMException(e);
}
}
return hm;
}
// changed by sankara on 18/JUN/13 for setting due_date__from and due_date__to[End..]
private String checkNull( String inputVal )
{
if ( inputVal == null )
......
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