Commit db670c49 authored by steurwadkar's avatar steurwadkar

Changed by Manish on 05/07/16 for get connection.


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@102326 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 7bae7ac1
...@@ -146,8 +146,11 @@ etc ...@@ -146,8 +146,11 @@ etc
String applDateFmt = genericUtility.getApplDateFormat(); String applDateFmt = genericUtility.getApplDateFormat();
String dbDateFmt = genericUtility.getDBDateFormat(); String dbDateFmt = genericUtility.getDBDateFormat();
ConnDriver connDriver = new ConnDriver(); //Changed and Commented By Santosh on 14-06-2016 :[START]
conn = connDriver.getConnectDB("DriverITM"); /*ConnDriver connDriver = new ConnDriver();
conn = connDriver.getConnectDB("DriverITM");*/
conn = getConnection();
//Changed and Commented By Santosh on 14-06-2016 :[END]
siteCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode"); siteCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode");
System.out.println("site code ->["+siteCode+"]"); System.out.println("site code ->["+siteCode+"]");
...@@ -167,7 +170,9 @@ etc ...@@ -167,7 +170,9 @@ etc
if ( currentColumn.trim().equalsIgnoreCase( "itm_default" )) if ( currentColumn.trim().equalsIgnoreCase( "itm_default" ))
{ {
System.out.println("--------------item default --------------"); System.out.println("--------------item default --------------");
valueXmlString.append( "<Detail1>\r\n" ); //Changed by samadhan W15JKAT001 on 06/01/2016 for item change on browser wizard
//valueXmlString.append( "<Detail1>\r\n" );
valueXmlString.append( "<Detail1 domID='1' >\r\n" );
valueXmlString.append( "<site_code><![CDATA[" ).append( siteCode ).append( "]]></site_code>\r\n" ); valueXmlString.append( "<site_code><![CDATA[" ).append( siteCode ).append( "]]></site_code>\r\n" );
valueXmlString.append( "<item_ser__from><![CDATA[" ).append( "00" ).append( "]]></item_ser__from>\r\n" ); valueXmlString.append( "<item_ser__from><![CDATA[" ).append( "00" ).append( "]]></item_ser__from>\r\n" );
valueXmlString.append( "<item_ser__to><![CDATA[" ).append( "ZZ" ).append( "]]></item_ser__to>\r\n" ); valueXmlString.append( "<item_ser__to><![CDATA[" ).append( "ZZ" ).append( "]]></item_ser__to>\r\n" );
...@@ -213,7 +218,9 @@ etc ...@@ -213,7 +218,9 @@ etc
columnValue = genericUtility.getColumnValue("batch_id",currDom); columnValue = genericUtility.getColumnValue("batch_id",currDom);
System.out.println("Batch Id Is ----" + columnValue); System.out.println("Batch Id Is ----" + columnValue);
valueXmlString.append( "<Detail1>\r\n" ); //Changed by samadhan on 06/01/2016 for item change on browser wizard
//valueXmlString.append( "<Detail1>\r\n" );
valueXmlString.append( "<Detail1 domID='1' >\r\n" );
if(columnValue != null && !columnValue.equalsIgnoreCase("00")) if(columnValue != null && !columnValue.equalsIgnoreCase("00"))
{ {
// set all the default values for batch id // set all the default values for batch id
...@@ -290,7 +297,9 @@ etc ...@@ -290,7 +297,9 @@ etc
saleOrderTo = checkNull(genericUtility.getColumnValue("sale_order__to",currDom)); saleOrderTo = checkNull(genericUtility.getColumnValue("sale_order__to",currDom));
System.out.println("sale order from ["+columnValue+"] "); System.out.println("sale order from ["+columnValue+"] ");
System.out.println("Hello sale_order__from"); System.out.println("Hello sale_order__from");
valueXmlString.append( "<Detail1>\r\n" ); //Changed by samadhan on 06/01/2016 for item change on browser wizard
//valueXmlString.append( "<Detail1>\r\n" );
valueXmlString.append( "<Detail1 domID='1' >\r\n" );
if(columnValue != null && !columnValue.equalsIgnoreCase("00")) if(columnValue != null && !columnValue.equalsIgnoreCase("00"))
{ {
...@@ -446,7 +455,9 @@ etc ...@@ -446,7 +455,9 @@ etc
columnValue = genericUtility.getColumnValue("sale_order__to",currDom); columnValue = genericUtility.getColumnValue("sale_order__to",currDom);
saleOrderFrom = checkNull(genericUtility.getColumnValue("sale_order__from",currDom)); saleOrderFrom = checkNull(genericUtility.getColumnValue("sale_order__from",currDom));
custCodeFrom = checkNull(genericUtility.getColumnValue("cust_code__from",currDom)); custCodeFrom = checkNull(genericUtility.getColumnValue("cust_code__from",currDom));
valueXmlString.append( "<Detail1>\r\n" ); //Changed by samadhan W15JKAT001 on 06/01/2016 for item change on browser wizard
//valueXmlString.append( "<Detail1>\r\n" );
valueXmlString.append( "<Detail1 domID='1' >\r\n" );
//System.out.println("columnValue1="+columnValue); //System.out.println("columnValue1="+columnValue);
//System.out.println("Hello sale_order__from"); //System.out.println("Hello sale_order__from");
//changed by sankara on 22/JUN/13 for setting min max due date[Start..] //changed by sankara on 22/JUN/13 for setting min max due date[Start..]
...@@ -630,57 +641,12 @@ etc ...@@ -630,57 +641,12 @@ etc
} }
//Changed sumit on 24/11/12 item_changed for print label start. //Changed sumit on 24/11/12 item_changed for print label start.
//Changed by Sneha on 16-05-2016 for carrier code fliter [Start]
else if(currentColumn.trim().equalsIgnoreCase("carrier_code"))
{
columnValue = checkNull(genericUtility.getColumnValue("carrier_code",currDom));
if( columnValue != null && columnValue.trim().length() > 0 )
{
sSQL = " SELECT TRAN_NAME FROM TRANSPORTER WHERE TRAN_CODE = ? ";
pstmt = conn.prepareStatement(sSQL);
pstmt.setString(1, columnValue);
rs = pstmt.executeQuery();
if(rs.next())
{
carrierName = checkNull(rs.getString(1));
//System.out.println("carrierName:::::::"+carrierName);
}
rs.close();rs = null;
pstmt.close();pstmt = null;
}
valueXmlString.append( "<Detail1>\r\n" );
/* valueXmlString.append( "<item_ser__from><![CDATA[" ).append("00").append( "]]></item_ser__from>\r\n" );
valueXmlString.append( "<item_ser__to><![CDATA[" ).append("ZZ").append( "]]></item_ser__to>\r\n" );
valueXmlString.append( "<item_code__from><![CDATA[" ).append("00").append( "]]></item_code__from>\r\n" );
valueXmlString.append( "<item_code__to><![CDATA[" ).append("ZZ").append( "]]></item_code__to>\r\n" );
valueXmlString.append( "<sale_order__from><![CDATA[" ).append("00").append( "]]></sale_order__from>\r\n" );
valueXmlString.append( "<sale_order__to><![CDATA[" ).append("ZZ").append( "]]></sale_order__to>\r\n" );
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" );
valueXmlString.append("<cust_code__dlv__from><![CDATA[").append("00").append("]]></cust_code__dlv__from>\r\n");
valueXmlString.append("<cust_code__dlv__to><![CDATA[").append("ZZ").append("]]></cust_code__dlv__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" );*/
valueXmlString.append( "<carrier_name><![CDATA[" ).append( carrierName ).append( "]]></carrier_name>\r\n" );
valueXmlString.append( "<single_lot protect ='1' ><![CDATA[" ).append( "" ).append( "]]></single_lot>\r\n" );
valueXmlString.append( "<master_pack_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></master_pack_allow>\r\n" );
valueXmlString.append( "<active_pick_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></active_pick_allow>\r\n" );
valueXmlString.append( "<stock_to_dock_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></stock_to_dock_allow>\r\n" );
valueXmlString.append( "<parcelpack_allow protect ='1' ><![CDATA[").append("").append("]]></parcelpack_allow>\r\n");
valueXmlString.append( "</Detail1>\r\n" );
}
//Changed by Sneha on 16-05-2016 for carrier code fliter [End]
else if ( currentColumn.trim().equalsIgnoreCase( "print_label")) else if ( currentColumn.trim().equalsIgnoreCase( "print_label"))
{ {
//Changed by sumit on 24/11/12 getting print label value //Changed by sumit on 24/11/12 getting print label value
valueXmlString.append( "<Detail1>\r\n" ); //Changed by samadhan W15JKAT001 on 06/01/2016 for item change on browser wizard
//valueXmlString.append( "<Detail1>\r\n" );
valueXmlString.append( "<Detail1 domID='1' >\r\n" );
printLabel = genericUtility.getColumnValue("print_label",currDom); printLabel = genericUtility.getColumnValue("print_label",currDom);
System.out.println(" printLabel "+printLabel); System.out.println(" printLabel "+printLabel);
if("Y".equalsIgnoreCase(printLabel)) if("Y".equalsIgnoreCase(printLabel))
...@@ -699,7 +665,9 @@ etc ...@@ -699,7 +665,9 @@ etc
//Changed sumit on 06/12/12 item_changed for wave_mode start. //Changed sumit on 06/12/12 item_changed for wave_mode start.
else if ( currentColumn.trim().equalsIgnoreCase( "wave_mode")) else if ( currentColumn.trim().equalsIgnoreCase( "wave_mode"))
{ {
valueXmlString.append( "<Detail1>\r\n" ); //Changed by samadhan W15JKAT001 on 06/01/2016 for item change on browser wizard
//valueXmlString.append( "<Detail1>\r\n" );
valueXmlString.append( "<Detail1 domID='1' >\r\n" );
waveMode = genericUtility.getColumnValue("wave_mode",currDom); waveMode = genericUtility.getColumnValue("wave_mode",currDom);
System.out.println(" waveMode "+waveMode); System.out.println(" waveMode "+waveMode);
if("P".equalsIgnoreCase(waveMode)) if("P".equalsIgnoreCase(waveMode))
...@@ -735,14 +703,18 @@ etc ...@@ -735,14 +703,18 @@ etc
rs.close();rs = null; rs.close();rs = null;
pstmt.close();pstmt = null; pstmt.close();pstmt = null;
valueXmlString.append( "<Detail1>\r\n" ); //Changed by samadhan W15JKAT001 on 06/01/2016 for item change on browser wizard
//valueXmlString.append( "<Detail1>\r\n" );
valueXmlString.append( "<Detail1 domID='1' >\r\n" );
valueXmlString.append( "<tran_name><![CDATA[" ).append( transporterName ).append( "]]></tran_name>\r\n" ); valueXmlString.append( "<tran_name><![CDATA[" ).append( transporterName ).append( "]]></tran_name>\r\n" );
valueXmlString.append( "</Detail1>\r\n" ); valueXmlString.append( "</Detail1>\r\n" );
} }
else else
{ {
System.out.println("columnValue::::::"+columnValue); System.out.println("columnValue::::::"+columnValue);
valueXmlString.append( "<Detail1>\r\n" ); //Changed by samadhan W15JKAT001 on 06/01/2016 for item change on browser wizard
//valueXmlString.append( "<Detail1>\r\n" );
valueXmlString.append( "<Detail1 domID='1' >\r\n" );
valueXmlString.append( "<tran_name><![CDATA[" ).append("").append( "]]></tran_name>\r\n" ); valueXmlString.append( "<tran_name><![CDATA[" ).append("").append( "]]></tran_name>\r\n" );
valueXmlString.append( "</Detail1>\r\n" ); valueXmlString.append( "</Detail1>\r\n" );
} }
...@@ -1094,9 +1066,12 @@ etc ...@@ -1094,9 +1066,12 @@ etc
try try
{ {
int currentFormNo = 0; int currentFormNo = 0;
ConnDriver connDriver = new ConnDriver(); //Changed and Commented By Santosh on 14-06-2016 :[START]
/*ConnDriver connDriver = new ConnDriver();
conn = connDriver.getConnectDB( "DriverITM" ); conn = connDriver.getConnectDB( "DriverITM" );
connDriver = null; connDriver = null;*/
conn = getConnection();
//Changed and Commented By Santosh on 14-06-2016 :[END]
String userId = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginCode" ); String userId = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginCode" );
......
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