Skip to content

B
business-java
Commit 361412aa authored by msingh's avatar msingh
Browse files
Options

Changed by Manish on 23/03/16 for DDUK . 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@100998 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 033463ae
Hide whitespace changes
Inline Side-by-side
Showing with 382 additions and 215 deletions
webitm-wms/ibase/webitm/ejb/wms/ShipmentPrc.java
View file @ 361412aa
...@@ -67,12 +67,12 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment ...@@ -67,12 +67,12 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
public String getData(Document headerDom, Document detailDom, String windowName, String xtraParams) throws RemoteException,ITMException public String getData(Document headerDom, Document detailDom, String windowName, String xtraParams) throws RemoteException,ITMException
{ {
String frdate = ""; //String frdate = "";
String fromDate = ""; String fromDate = "";
String tDate = ""; java.sql.Timestamp frdate = null;
java.sql.Timestamp tDate = null;
//String tDate = "";
String toDate=""; String toDate="";
String dateFrom = "";
String dateTo = "";
String transporterFrom = ""; String transporterFrom = "";
String transporterTo = ""; String transporterTo = "";
String shipmentType = ""; String shipmentType = "";
...@@ -87,11 +87,14 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment ...@@ -87,11 +87,14 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
ResultSet rs=null; ResultSet rs=null;
boolean rsflag=false; boolean rsflag=false;
StringBuffer test=new StringBuffer(); StringBuffer test=new StringBuffer();
// Added by Manish on 22/03/16 for DDUK
String projectName = "";
DistCommon distCommon = new DistCommon();
ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB(); ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB();
try try
{ {
test = new StringBuffer( "<?xml version='1.0' encoding='UTF-8'?>\r\n<DocumentRoot>\r\n<description>Datawindow Root</description>\r\n<group0>\r\n" + test = new StringBuffer( "<?xml version='1.0' encoding='UTF-8'?>\r\n<DocumentRoot>\r\n<description>Datawindow Root</description>\r\n<group0>\r\n" +
"<description>Group0 description</description>\r\n<Header0>\r\n<description>Header0 members</description>\r\n"); "<description>Group0 description</description>\r\n<Header0>\r\n<description>Header0 members</description>\r\n");
int count = 0; int count = 0;
NodeList parentList = null; NodeList parentList = null;
NodeList childList = null; NodeList childList = null;
...@@ -119,7 +122,8 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment ...@@ -119,7 +122,8 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
System.out.println("detailDom:"+detailDom); System.out.println("detailDom:"+detailDom);
System.out.println("windowName:"+windowName); System.out.println("windowName:"+windowName);
System.out.println("xtraParams:"+xtraParams); System.out.println("xtraParams:"+xtraParams);
// Added by Manish on 22/03/16 for DDUK
projectName = distCommon.getDisparams("999999","PROJECT",conn);
if ( fromDate == null || fromDate.trim().length() == 0 ) //from_date if ( fromDate == null || fromDate.trim().length() == 0 ) //from_date
{ {
System.out.println("*************DEF="+fromDate); System.out.println("*************DEF="+fromDate);
...@@ -134,7 +138,7 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment ...@@ -134,7 +138,7 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
errString = itmDBAccessEJB.getErrorString("","BLKTODT",userId); errString = itmDBAccessEJB.getErrorString("","BLKTODT",userId);
return errString; return errString;
} //to_date } //to_date
if ( transporterFrom == null || transporterFrom.trim().length() == 0 ) //tran_code_from if ( transporterFrom == null || transporterFrom.trim().length() == 0 ) //tran_code_from
{ {
System.out.println("TRANSPORTERFROM="+transporterFrom); System.out.println("TRANSPORTERFROM="+transporterFrom);
...@@ -144,7 +148,7 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment ...@@ -144,7 +148,7 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
} }
else if(transporterFrom != null || transporterFrom.trim().length() != 0) else if(transporterFrom != null || transporterFrom.trim().length() != 0)
{ {
if(!"00".equalsIgnoreCase(transporterFrom)) if(!"00".equalsIgnoreCase(transporterFrom))
{ {
sql = " SELECT COUNT(*) FROM TRANSPORTER WHERE TRAN_CODE = ? "; sql = " SELECT COUNT(*) FROM TRANSPORTER WHERE TRAN_CODE = ? ";
...@@ -167,8 +171,8 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment ...@@ -167,8 +171,8 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
pstmt = null; pstmt = null;
} }
} //end of tran_code_from } //end of tran_code_from
if ( transporterTo == null || transporterTo.trim().length() == 0 ) //tran_code_to if ( transporterTo == null || transporterTo.trim().length() == 0 ) //tran_code_to
{ {
System.out.println("TRANSPORTERTO="+transporterTo); System.out.println("TRANSPORTERTO="+transporterTo);
...@@ -200,7 +204,7 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment ...@@ -200,7 +204,7 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
pstmt = null; pstmt = null;
} }
} //end of supp_code_from } //end of supp_code_from
if ( shipmentType == null || shipmentType.trim().length() == 0 ) if ( shipmentType == null || shipmentType.trim().length() == 0 )
{ {
System.out.println("SHIPMENTTYPE="+shipmentType); System.out.println("SHIPMENTTYPE="+shipmentType);
...@@ -245,12 +249,19 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment ...@@ -245,12 +249,19 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
return errString; return errString;
} }
frdate = oracleFormatDate(fromDate); //frdate = oracleFormatDate(fromDate);
System.out.println("FRDATE="+frdate); fromDate = genericUtility.getValidDateString(fromDate, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat());
tDate = oracleFormatDate(toDate); frdate = java.sql.Timestamp.valueOf(fromDate + " 00:00:00");
System.out.println("TDATE="+tDate);
toDate = genericUtility.getValidDateString(toDate, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat());
tDate = java.sql.Timestamp.valueOf(toDate + " 00:00:00");
// Changed by sankara on 16/08/13 for allow shipment despatch and all manual shipment Start.. System.out.println("dateFr="+frdate);
//tDate = oracleFormatDate(toDate);
System.out.println("dateTo="+tDate);
// Changed by sankara on 16/08/13 for allow shipment despatch and all manual shipment Start..
/* getDataSql = " SELECT DISTINCT D.PTCN, S.SHIPMENT_ID, T.TRAN_NAME FROM SHIP_DOCS D, SHIPMENT S,TRANSPORTER T,CARTON_MASTER C WHERE D.SHIPMENT_ID = S.SHIPMENT_ID " + /* getDataSql = " SELECT DISTINCT D.PTCN, S.SHIPMENT_ID, T.TRAN_NAME FROM SHIP_DOCS D, SHIPMENT S,TRANSPORTER T,CARTON_MASTER C WHERE D.SHIPMENT_ID = S.SHIPMENT_ID " +
" AND S.TRAN_CODE = T.TRAN_CODE AND D.REF_SER = 'S-DSP' AND S.CONFIRMED = 'Y' AND S.CONF_DATE BETWEEN ? AND ? AND S.TRAN_CODE BETWEEN ? AND ? " + " AND S.TRAN_CODE = T.TRAN_CODE AND D.REF_SER = 'S-DSP' AND S.CONFIRMED = 'Y' AND S.CONF_DATE BETWEEN ? AND ? AND S.TRAN_CODE BETWEEN ? AND ? " +
" AND T.SHIPMENT_TYPE = ? AND D.PTCN = C.PTCN AND C.SF_IDENTITY IS NULL "; " AND T.SHIPMENT_TYPE = ? AND D.PTCN = C.PTCN AND C.SF_IDENTITY IS NULL ";
...@@ -261,33 +272,87 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment ...@@ -261,33 +272,87 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
pstmt.setString(3,transporterFrom); pstmt.setString(3,transporterFrom);
pstmt.setString(4,transporterTo); pstmt.setString(4,transporterTo);
pstmt.setString(5,shipmentType); */ pstmt.setString(5,shipmentType); */
//Changed by wasim on 16/12/14 start S.SHIPMENT_DATE & S.CONF_DATE are added in query
// changed by sankara on 01/10/14 for site transporter
// getDataSql = " SELECT DISTINCT D.PTCN, S.SHIPMENT_ID, T.TRAN_NAME FROM SHIP_DOCS D, SHIPMENT S, TRANSPORTER T, CARTON_MASTER C " +
//getDataSql = " SELECT DISTINCT D.PTCN, S.SHIPMENT_ID, T.TRAN_NAME FROM SHIP_DOCS D, SHIPMENT S, TRANSPORTER T, CARTON_MASTER C, SITE_TRANSPORTER ST " +
//Changed by wasim on 16/12/14 start S.SHIPMENT_DATE & S.CONF_DATE are added in query // Changed by Manish on 22/03/16 for DDUK
// changed by sankara on 01/10/14 for site transporter if("DDUK".equalsIgnoreCase(projectName) )
// getDataSql = " SELECT DISTINCT D.PTCN, S.SHIPMENT_ID, T.TRAN_NAME FROM SHIP_DOCS D, SHIPMENT S, TRANSPORTER T, CARTON_MASTER C " + {
//getDataSql = " SELECT DISTINCT D.PTCN, S.SHIPMENT_ID, T.TRAN_NAME FROM SHIP_DOCS D, SHIPMENT S, TRANSPORTER T, CARTON_MASTER C, SITE_TRANSPORTER ST " + getDataSql = " SELECT DISTINCT D.PTCN, D.DESP_ID, T.TRAN_NAME,D.DESP_DATE,D.CONF_DATE FROM DESPATCH D, TRANSPORTER T, CARTON_MASTER C,WAVE_TASK_DET W " +
" WHERE D.PTCN = W.PTCN AND D.PTCN = C.PTCN AND D.TRAN_CODE = T.TRAN_CODE AND D.CONFIRMED = 'Y' AND W.REF_SER = 'S-DSP ' " +
" AND D.CONF_DATE BETWEEN ? AND ? " +
" AND D.TRAN_CODE BETWEEN ? AND ? AND C.SF_IDENTITY IS NULL AND T.SERVICE_CODE IS NOT NULL " +
" AND C.TRACKING_NO IS NOT NULL AND C.STATUS <> 'R' AND C.CLOSEOUT_DATE IS NULL" ;
//" UNION " ;
pstmt = conn.prepareStatement(getDataSql);
pstmt.setTimestamp(1,frdate);
pstmt.setTimestamp(2,tDate);
pstmt.setString(3,transporterFrom);
pstmt.setString(4,transporterTo);
rs = pstmt.executeQuery();
rsflag=false;
while(rs.next())
{
rsflag=true;
test.append( "<Detail2>\r\n" );
ptcn = checkNull(rs.getString(1));
test.append( "<ptcn><![CDATA[" ).append(ptcn).append( "]]></ptcn>\r\n" );
test.append( "<shipment_id><![CDATA[" ).append(checkNull(rs.getString("DESP_ID"))).append( "]]></shipment_id>\r\n" );
//Changed by wasim on 16/12/14 start append columns conf_date and ship_date.start
//test.append( "<ship_date><![CDATA[" ).append(rs.getDate("SHIPMENT_DATE")).append("]]></ship_date>\r\n");
test.append( "<ship_date><![CDATA[" ).append(genericUtility.getValidDateString(String.valueOf(rs.getDate("DESP_DATE")),genericUtility.getDBDateFormat(), genericUtility.getApplDateFormat())).append("]]></ship_date>\r\n");
//test.append( "<conf_date><![CDATA[" ).append(rs.getDate("CONF_DATE")).append("]]></conf_date>\r\n");
test.append( "<conf_date><![CDATA[" ).append(genericUtility.getValidDateString(String.valueOf(rs.getDate("CONF_DATE")),genericUtility.getDBDateFormat(), genericUtility.getApplDateFormat())).append("]]></conf_date>\r\n");
//Changed by wasim on 16/12/14 start append columns conf_date and ship_date.end
test.append( "<tran_name><![CDATA[" ).append(checkNull(rs.getString("TRAN_NAME"))).append( "]]></tran_name>\r\n" );
test.append("\n");
test.append( "</Detail2>\r\n" );
}
test.append( "</Header0>\r\n</group0>\r\n</DocumentRoot>\r\n" );
resultString=test.toString();
if(rsflag == false)
{
errCode = "INVLDATA";
errString = itmDBAccessEJB.getErrorString("","INVLDATA",userId);
return errString;
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
}
// Changed by Manish on 22/03/16 for DDUK
else
{
getDataSql = " SELECT DISTINCT D.PTCN, S.SHIPMENT_ID, T.TRAN_NAME, S.SHIPMENT_DATE, S.CONF_DATE FROM SHIP_DOCS D, SHIPMENT S, TRANSPORTER T, CARTON_MASTER C, SITE_TRANSPORTER ST " + getDataSql = " SELECT DISTINCT D.PTCN, S.SHIPMENT_ID, T.TRAN_NAME, S.SHIPMENT_DATE, S.CONF_DATE FROM SHIP_DOCS D, SHIPMENT S, TRANSPORTER T, CARTON_MASTER C, SITE_TRANSPORTER ST " +
" WHERE D.SHIPMENT_ID = S.SHIPMENT_ID " + " WHERE D.SHIPMENT_ID = S.SHIPMENT_ID " +
" AND S.TRAN_CODE = T.TRAN_CODE " + " AND S.TRAN_CODE = T.TRAN_CODE " +
" AND D.REF_SER = 'S-DSP' " + " AND D.REF_SER = 'S-DSP' " +
" AND S.CONFIRMED = 'Y' " + " AND S.CONFIRMED = 'Y' " +
" AND S.CONF_DATE BETWEEN ? AND ? " + " AND S.CONF_DATE BETWEEN ? AND ? " +
" AND S.TRAN_CODE BETWEEN ? AND ? " + " AND S.TRAN_CODE BETWEEN ? AND ? " +
// changed by sankara on 01/10/14 for site transporter start. // changed by sankara on 01/10/14 for site transporter start.
// " AND T.SHIPMENT_TYPE = ? " + // " AND T.SHIPMENT_TYPE = ? " +
" AND CASE WHEN ST.SHIPMENT_TYPE IS NULL THEN T.SHIPMENT_TYPE ELSE ST.SHIPMENT_TYPE END = ? "+ " AND CASE WHEN ST.SHIPMENT_TYPE IS NULL THEN T.SHIPMENT_TYPE ELSE ST.SHIPMENT_TYPE END = ? "+
" AND ST.SITE_CODE(+) = S.SITE_CODE "+ " AND ST.SITE_CODE(+) = S.SITE_CODE "+
" AND ST.TRAN_CODE(+) = S.TRAN_CODE "+ " AND ST.TRAN_CODE(+) = S.TRAN_CODE "+
// changed by sankara on 01/10/14 for site transporter end. // changed by sankara on 01/10/14 for site transporter end.
" AND D.PTCN = C.PTCN " + " AND D.PTCN = C.PTCN " +
" AND C.SF_IDENTITY IS NULL " + " AND C.SF_IDENTITY IS NULL " +
" AND T.SERVICE_CODE IS NOT NULL " + " AND T.SERVICE_CODE IS NOT NULL " +
" AND C.TRACKING_NO IS NOT NULL " + " AND C.TRACKING_NO IS NOT NULL " +
//changed by sankara on 04/02/2014 for getting used tracking_no only //changed by sankara on 04/02/2014 for getting used tracking_no only
" AND C.STATUS <> 'R' " + " AND C.STATUS <> 'R' " +
" UNION " + // MANUAL SHIPMENT REF SER = "" AND NON INVENTORY " UNION " + // MANUAL SHIPMENT REF SER = "" AND NON INVENTORY
//changed by sankara on 04/02/2014 for wms live satrt. //changed by sankara on 04/02/2014 for wms live satrt.
/* " SELECT DISTINCT D.PTCN, S.SHIPMENT_ID, T.TRAN_NAME FROM SHIP_DOCS D, SHIPMENT_CONTENT P, "+ /* " SELECT DISTINCT D.PTCN, S.SHIPMENT_ID, T.TRAN_NAME FROM SHIP_DOCS D, SHIPMENT_CONTENT P, "+
" SHIPMENT S, TRANSPORTER T, CARTON_MASTER C " + " SHIPMENT S, TRANSPORTER T, CARTON_MASTER C " +
" WHERE D.SHIPMENT_ID <> S.SHIPMENT_ID " + " WHERE D.SHIPMENT_ID <> S.SHIPMENT_ID " +
" AND S.SHIPMENT_ID = P.SHIPMENT_ID " + " AND S.SHIPMENT_ID = P.SHIPMENT_ID " +
...@@ -300,110 +365,110 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment ...@@ -300,110 +365,110 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
" AND T.SERVICE_CODE IS NOT NULL " + " AND T.SERVICE_CODE IS NOT NULL " +
" AND C.TRACKING_NO IS NOT NULL " + " AND C.TRACKING_NO IS NOT NULL " +
" AND D.PTCN IS NULL " +*/ " AND D.PTCN IS NULL " +*/
//Changed by wasim on 16/12/14 start S.SHIPMENT_DATE & S.CONF_DATE are added in query //Changed by wasim on 16/12/14 start S.SHIPMENT_DATE & S.CONF_DATE are added in query
// " SELECT DISTINCT '' AS PTCN, S.SHIPMENT_ID, T.TRAN_NAME FROM SHIPMENT_CONTENT P, "+ // " SELECT DISTINCT '' AS PTCN, S.SHIPMENT_ID, T.TRAN_NAME FROM SHIPMENT_CONTENT P, "+
" SELECT DISTINCT '' AS PTCN, S.SHIPMENT_ID, T.TRAN_NAME, S.SHIPMENT_DATE, S.CONF_DATE FROM SHIPMENT_CONTENT P, "+ " SELECT DISTINCT '' AS PTCN, S.SHIPMENT_ID, T.TRAN_NAME, S.SHIPMENT_DATE, S.CONF_DATE FROM SHIPMENT_CONTENT P, "+
// changed by sankara on 01/10/14 for site transporter start. // changed by sankara on 01/10/14 for site transporter start.
// " SHIPMENT S, TRANSPORTER T, CARTON_MASTER C " + // " SHIPMENT S, TRANSPORTER T, CARTON_MASTER C " +
" SHIPMENT S, TRANSPORTER T, CARTON_MASTER C, SITE_TRANSPORTER ST " + " SHIPMENT S, TRANSPORTER T, CARTON_MASTER C, SITE_TRANSPORTER ST " +
" WHERE S.SHIPMENT_ID NOT IN (SELECT DISTINCT SHIPMENT_ID FROM SHIP_DOCS)" + " WHERE S.SHIPMENT_ID NOT IN (SELECT DISTINCT SHIPMENT_ID FROM SHIP_DOCS)" +
" AND S.SHIPMENT_ID = P.SHIPMENT_ID " + " AND S.SHIPMENT_ID = P.SHIPMENT_ID " +
" AND S.TRAN_CODE = T.TRAN_CODE " + " AND S.TRAN_CODE = T.TRAN_CODE " +
" AND S.CONFIRMED = 'Y' " + " AND S.CONFIRMED = 'Y' " +
" AND S.CONF_DATE BETWEEN ? AND ? " + " AND S.CONF_DATE BETWEEN ? AND ? " +
" AND S.TRAN_CODE BETWEEN ? AND ? " + " AND S.TRAN_CODE BETWEEN ? AND ? " +
// changed by sankara on 01/10/14 for site transporter start. // changed by sankara on 01/10/14 for site transporter start.
// " AND T.SHIPMENT_TYPE = ? " + // " AND T.SHIPMENT_TYPE = ? " +
" AND CASE WHEN ST.SHIPMENT_TYPE IS NULL THEN T.SHIPMENT_TYPE ELSE ST.SHIPMENT_TYPE END = ? "+ " AND CASE WHEN ST.SHIPMENT_TYPE IS NULL THEN T.SHIPMENT_TYPE ELSE ST.SHIPMENT_TYPE END = ? "+
" AND ST.SITE_CODE(+) = S.SITE_CODE "+ " AND ST.SITE_CODE(+) = S.SITE_CODE "+
" AND ST.TRAN_CODE(+) = S.TRAN_CODE "+ " AND ST.TRAN_CODE(+) = S.TRAN_CODE "+
// changed by sankara on 01/10/14 for site transporter end. // changed by sankara on 01/10/14 for site transporter end.
" AND C.SF_IDENTITY IS NULL " + " AND C.SF_IDENTITY IS NULL " +
" AND T.SERVICE_CODE IS NOT NULL " + " AND T.SERVICE_CODE IS NOT NULL " +
" AND C.TRACKING_NO IS NOT NULL " + " AND C.TRACKING_NO IS NOT NULL " +
// changed by sankara on 17/08/13 added join form carton_master for manual ship get data. // changed by sankara on 17/08/13 added join form carton_master for manual ship get data.
//changed by sankara on 04/02/2014 for wms live end. //changed by sankara on 04/02/2014 for wms live end.
" AND P.CARTON_NO = C.CARTON_NO " + " AND P.CARTON_NO = C.CARTON_NO " +
" UNION " + //MANUAL SHIPMENT REF SER = "" AND INVENTORY " UNION " + //MANUAL SHIPMENT REF SER = "" AND INVENTORY
//Changed by wasim on 16/12/14 start S.SHIPMENT_DATE & S.CONF_DATE are added in query //Changed by wasim on 16/12/14 start S.SHIPMENT_DATE & S.CONF_DATE are added in query
//" SELECT DISTINCT D.PTCN, S.SHIPMENT_ID, T.TRAN_NAME FROM SHIP_DOCS D, SHIPMENT_CONTENT P, "+ //" SELECT DISTINCT D.PTCN, S.SHIPMENT_ID, T.TRAN_NAME FROM SHIP_DOCS D, SHIPMENT_CONTENT P, "+
" SELECT DISTINCT D.PTCN, S.SHIPMENT_ID, T.TRAN_NAME, S.SHIPMENT_DATE, S.CONF_DATE FROM SHIP_DOCS D, SHIPMENT_CONTENT P, "+ " SELECT DISTINCT D.PTCN, S.SHIPMENT_ID, T.TRAN_NAME, S.SHIPMENT_DATE, S.CONF_DATE FROM SHIP_DOCS D, SHIPMENT_CONTENT P, "+
//changed by sankara on 01/10/14 for site transporter //changed by sankara on 01/10/14 for site transporter
//" SHIPMENT S, TRANSPORTER T, CARTON_MASTER C " + //" SHIPMENT S, TRANSPORTER T, CARTON_MASTER C " +
" SHIPMENT S, TRANSPORTER T, CARTON_MASTER C, SITE_TRANSPORTER ST " + " SHIPMENT S, TRANSPORTER T, CARTON_MASTER C, SITE_TRANSPORTER ST " +
" WHERE D.SHIPMENT_ID = S.SHIPMENT_ID " + " WHERE D.SHIPMENT_ID = S.SHIPMENT_ID " +
" AND S.SHIPMENT_ID = P.SHIPMENT_ID " + " AND S.SHIPMENT_ID = P.SHIPMENT_ID " +
" AND D.SHIPMENT_ID = P.SHIPMENT_ID " + " AND D.SHIPMENT_ID = P.SHIPMENT_ID " +
" AND S.TRAN_CODE = T.TRAN_CODE " + " AND S.TRAN_CODE = T.TRAN_CODE " +
" AND S.CONFIRMED = 'Y' " + " AND S.CONFIRMED = 'Y' " +
" AND S.CONF_DATE BETWEEN ? AND ? " + " AND S.CONF_DATE BETWEEN ? AND ? " +
" AND S.TRAN_CODE BETWEEN ? AND ? " + " AND S.TRAN_CODE BETWEEN ? AND ? " +
" AND D.PTCN IS NULL " + " AND D.PTCN IS NULL " +
// changed by sankara on 01/10/14 for site transporter start. // changed by sankara on 01/10/14 for site transporter start.
// " AND T.SHIPMENT_TYPE = ? " + // " AND T.SHIPMENT_TYPE = ? " +
" AND CASE WHEN ST.SHIPMENT_TYPE IS NULL THEN T.SHIPMENT_TYPE ELSE ST.SHIPMENT_TYPE END = ? "+ " AND CASE WHEN ST.SHIPMENT_TYPE IS NULL THEN T.SHIPMENT_TYPE ELSE ST.SHIPMENT_TYPE END = ? "+
" AND ST.SITE_CODE(+) = S.SITE_CODE "+ " AND ST.SITE_CODE(+) = S.SITE_CODE "+
" AND ST.TRAN_CODE(+) = S.TRAN_CODE "+ " AND ST.TRAN_CODE(+) = S.TRAN_CODE "+
// changed by sankara on 01/10/14 for site transporter end. // changed by sankara on 01/10/14 for site transporter end.
" AND C.SF_IDENTITY IS NULL " + " AND C.SF_IDENTITY IS NULL " +
" AND T.SERVICE_CODE IS NOT NULL " + " AND T.SERVICE_CODE IS NOT NULL " +
// changed by sankara on 17/08/13 added join form carton_master for manual ship get data. // changed by sankara on 17/08/13 added join form carton_master for manual ship get data.
" AND P.CARTON_NO = C.CARTON_NO " + " AND P.CARTON_NO = C.CARTON_NO " +
" AND C.TRACKING_NO IS NOT NULL " ; " AND C.TRACKING_NO IS NOT NULL " ;
System.out.println("**************getDataSql="+getDataSql); System.out.println("**************getDataSql="+getDataSql);
pstmt = conn.prepareStatement(getDataSql); pstmt = conn.prepareStatement(getDataSql);
pstmt.setString(1,frdate); pstmt.setTimestamp(1,frdate);
pstmt.setString(2,tDate); pstmt.setTimestamp(2,tDate);
pstmt.setString(3,transporterFrom); pstmt.setString(3,transporterFrom);
pstmt.setString(4,transporterTo); pstmt.setString(4,transporterTo);
pstmt.setString(5,shipmentType); pstmt.setString(5,shipmentType);
pstmt.setString(6,frdate); pstmt.setTimestamp(6,frdate);
pstmt.setString(7,tDate); pstmt.setTimestamp(7,tDate);
pstmt.setString(8,transporterFrom); pstmt.setString(8,transporterFrom);
pstmt.setString(9,transporterTo); pstmt.setString(9,transporterTo);
pstmt.setString(10,shipmentType); pstmt.setString(10,shipmentType);
pstmt.setString(11,frdate); pstmt.setTimestamp(11,frdate);
pstmt.setString(12,tDate); pstmt.setTimestamp(12,tDate);
pstmt.setString(13,transporterFrom); pstmt.setString(13,transporterFrom);
pstmt.setString(14,transporterTo); pstmt.setString(14,transporterTo);
pstmt.setString(15,shipmentType); pstmt.setString(15,shipmentType);
// Changed by sankara on 16/08/13 for allow shipment despatch and all manual shipment.end // Changed by sankara on 16/08/13 for allow shipment despatch and all manual shipment.end
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
rsflag=false; rsflag=false;
while(rs.next()) while(rs.next())
{ {
rsflag=true; rsflag=true;
test.append( "<Detail2>\r\n" ); test.append( "<Detail2>\r\n" );
ptcn = checkNull(rs.getString(1)); ptcn = checkNull(rs.getString(1));
test.append( "<ptcn><![CDATA[" ).append(ptcn).append( "]]></ptcn>\r\n" ); test.append( "<ptcn><![CDATA[" ).append(ptcn).append( "]]></ptcn>\r\n" );
test.append( "<shipment_id><![CDATA[" ).append(checkNull(rs.getString("SHIPMENT_ID"))).append( "]]></shipment_id>\r\n" ); test.append( "<shipment_id><![CDATA[" ).append(checkNull(rs.getString("SHIPMENT_ID"))).append( "]]></shipment_id>\r\n" );
//Changed by wasim on 16/12/14 start append columns conf_date and ship_date.start //Changed by wasim on 16/12/14 start append columns conf_date and ship_date.start
//test.append( "<ship_date><![CDATA[" ).append(rs.getDate("SHIPMENT_DATE")).append("]]></ship_date>\r\n"); //test.append( "<ship_date><![CDATA[" ).append(rs.getDate("SHIPMENT_DATE")).append("]]></ship_date>\r\n");
test.append( "<ship_date><![CDATA[" ).append(genericUtility.getValidDateString(String.valueOf(rs.getDate("SHIPMENT_DATE")),genericUtility.getDBDateFormat(), genericUtility.getApplDateFormat())).append("]]></ship_date>\r\n"); test.append( "<ship_date><![CDATA[" ).append(genericUtility.getValidDateString(String.valueOf(rs.getDate("SHIPMENT_DATE")),genericUtility.getDBDateFormat(), genericUtility.getApplDateFormat())).append("]]></ship_date>\r\n");
//test.append( "<conf_date><![CDATA[" ).append(rs.getDate("CONF_DATE")).append("]]></conf_date>\r\n"); //test.append( "<conf_date><![CDATA[" ).append(rs.getDate("CONF_DATE")).append("]]></conf_date>\r\n");
test.append( "<conf_date><![CDATA[" ).append(genericUtility.getValidDateString(String.valueOf(rs.getDate("CONF_DATE")),genericUtility.getDBDateFormat(), genericUtility.getApplDateFormat())).append("]]></conf_date>\r\n"); test.append( "<conf_date><![CDATA[" ).append(genericUtility.getValidDateString(String.valueOf(rs.getDate("CONF_DATE")),genericUtility.getDBDateFormat(), genericUtility.getApplDateFormat())).append("]]></conf_date>\r\n");
//Changed by wasim on 16/12/14 start append columns conf_date and ship_date.end //Changed by wasim on 16/12/14 start append columns conf_date and ship_date.end
test.append( "<tran_name><![CDATA[" ).append(checkNull(rs.getString("TRAN_NAME"))).append( "]]></tran_name>\r\n" ); test.append( "<tran_name><![CDATA[" ).append(checkNull(rs.getString("TRAN_NAME"))).append( "]]></tran_name>\r\n" );
test.append("\n"); test.append("\n");
test.append( "</Detail2>\r\n" ); test.append( "</Detail2>\r\n" );
} }
test.append( "</Header0>\r\n</group0>\r\n</DocumentRoot>\r\n" ); test.append( "</Header0>\r\n</group0>\r\n</DocumentRoot>\r\n" );
resultString=test.toString(); resultString=test.toString();
if(rsflag == false)
{
errCode = "INVLDATA";
errString = itmDBAccessEJB.getErrorString("","INVLDATA",userId);
return errString;
}
rs.close(); if(rsflag == false)
rs = null; {
pstmt.close(); errCode = "INVLDATA";
pstmt = null; errString = itmDBAccessEJB.getErrorString("","INVLDATA",userId);
} return errString;
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
}
}
catch(Exception e) catch(Exception e)
{ {
System.out.println("Exception occured while getData()"); System.out.println("Exception occured while getData()");
...@@ -508,6 +573,9 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment ...@@ -508,6 +573,9 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
StringBuffer trackingNum = new StringBuffer(); StringBuffer trackingNum = new StringBuffer();
//changed by sankara on 22/09/14 for site transporter //changed by sankara on 22/09/14 for site transporter
boolean istransporterexist = false; boolean istransporterexist = false;
// Added by Manish on 22/03/16 for DDUK
String projectName = "";
DistCommon distCommon = new DistCommon();
try try
{ {
String userId = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginCode" ); String userId = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginCode" );
...@@ -521,7 +589,7 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment ...@@ -521,7 +589,7 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
System.out.println("xtraParams:"+xtraParams); System.out.println("xtraParams:"+xtraParams);
//changed by sankara on 30/08/14 for insert close out date in carton_master //changed by sankara on 30/08/14 for insert close out date in carton_master
Timestamp currDate = new Timestamp(System.currentTimeMillis()); Timestamp currDate = new Timestamp(System.currentTimeMillis());
parentNodeList = detailDom.getElementsByTagName("Detail2"); parentNodeList = detailDom.getElementsByTagName("Detail2");
parentNodeListLength = parentNodeList.getLength(); parentNodeListLength = parentNodeList.getLength();
for (int selectedRow = 0; selectedRow < parentNodeListLength; selectedRow++) for (int selectedRow = 0; selectedRow < parentNodeListLength; selectedRow++)
...@@ -536,7 +604,7 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment ...@@ -536,7 +604,7 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
childNode = childNodeList.item(childRow); childNode = childNodeList.item(childRow);
childNodeName = childNode.getNodeName(); childNodeName = childNode.getNodeName();
System.out.println("childNodeName---->>> "+ childNodeName); System.out.println("childNodeName---->>> "+ childNodeName);
if("ptcn".equalsIgnoreCase(childNodeName)) if("ptcn".equalsIgnoreCase(childNodeName))
{ {
if ( childNode != null && childNode.getFirstChild() != null ) if ( childNode != null && childNode.getFirstChild() != null )
...@@ -567,7 +635,7 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment ...@@ -567,7 +635,7 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
//changed by sankara on 07/03/14 for parcel pick update through adsi start. //changed by sankara on 07/03/14 for parcel pick update through adsi start.
//shipmentSet.add(shipmentId); //shipmentSet.add(shipmentId);
} }
} }
System.out.println("INSIDE IF"); System.out.println("INSIDE IF");
...@@ -589,23 +657,32 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment ...@@ -589,23 +657,32 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
long timeBefore = System.currentTimeMillis(); long timeBefore = System.currentTimeMillis();
locator = new ADSIShippingLocator(); locator = new ADSIShippingLocator();
System.out.println(" Connecting ADSI server ................"); System.out.println(" Connecting ADSI server ................");
if(shipmentSet != null && shipmentSet.size() >0) // Added by Manish on 22/03/16 for DDUK
projectName = distCommon.getDisparams("999999","PROJECT",conn);
/*if("DDUK".equalsIgnoreCase(projectName) )
{ {
System.out.println("Shipment Ids ................["+shipmentSet.toString()+"]"); System.out.println("Shipment Ids ................["+shipmentSet.toString()+"]");
soap = locator.getADSIShippingSoap(new URL(adsiShippingURL)); soap = locator.getADSIShippingSoap(new URL(adsiShippingURL));
} }
else
{*/
if(shipmentSet != null && shipmentSet.size() >0)
{
System.out.println("Shipment Ids ................["+shipmentSet.toString()+"]");
soap = locator.getADSIShippingSoap(new URL(adsiShippingURL));
}
long timeAfter = System.currentTimeMillis(); long timeAfter = System.currentTimeMillis();
if(soap == null || !soap.testADSIServer()) if(soap == null || !soap.testADSIServer())
{ {
errString = itmDBAccessEJB.getErrorString("","ADSISRVERR","","",conn); errString = itmDBAccessEJB.getErrorString("","ADSISRVERR","","",conn);
return errString; return errString;
} }
System.out.println(" is server active ["+soap.testADSIServer()+"]"); System.out.println(" is server active ["+soap.testADSIServer()+"]");
Iterator it = shipmentSet.iterator(); Iterator it = shipmentSet.iterator();
ArrayList shipList = new ArrayList(); ArrayList shipList = new ArrayList();
...@@ -615,12 +692,24 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment ...@@ -615,12 +692,24 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
if(shipmentId != null && shipmentId.trim().length() > 0 ) if(shipmentId != null && shipmentId.trim().length() > 0 )
{ {
// changed by sankara on 29-06-13 added sql for getting shipment type // changed by sankara on 29-06-13 added sql for getting shipment type
//changed by sankara on 22/09/14 for site transporter start. //changed by sankara on 22/09/14 for site transporter start.
String siteCodeShip = ""; String siteCodeShip = "";
istransporterexist = false; istransporterexist = false;
sql = " SELECT DISTINCT S.SITE_CODE__SHIP FROM SORDER S, SHIPMENT D, SHIP_DOCS SD, WAVE_TASK W, WAVE_TASK_DET WT " +
" WHERE D.SHIPMENT_ID = SD.SHIPMENT_ID AND SD.PTCN = WT.PTCN AND S.SALE_ORDER = WT.SALE_ORDER AND D.SHIPMENT_ID = ? "; // Changed by Manish on 22/03/16 for DDUK
if("DDUK".equalsIgnoreCase(projectName) )
{
sql = " SELECT DISTINCT S.SITE_CODE__SHIP FROM SORDER S, DESPATCH D, WAVE_TASK W, WAVE_TASK_DET WT" +
" WHERE D.PTCN = WT.PTCN AND S.SALE_ORDER = WT.SALE_ORDER AND D.DESP_ID = ? " ;
}
// Changed by Manish on 22/03/16 for DDUK
else
{
sql = " SELECT DISTINCT S.SITE_CODE__SHIP FROM SORDER S, SHIPMENT D, SHIP_DOCS SD, WAVE_TASK W, WAVE_TASK_DET WT " +
" WHERE D.SHIPMENT_ID = SD.SHIPMENT_ID AND SD.PTCN = WT.PTCN AND S.SALE_ORDER = WT.SALE_ORDER AND D.SHIPMENT_ID = ? ";
}
pstmt = conn.prepareStatement( sql ); pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, shipmentId ); pstmt.setString( 1, shipmentId );
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
...@@ -634,7 +723,16 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment ...@@ -634,7 +723,16 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
if(siteCodeShip == null || siteCodeShip.trim().length() == 0 ) if(siteCodeShip == null || siteCodeShip.trim().length() == 0 )
{ {
sql = " SELECT SITE_CODE FROM SHIPMENT WHERE SHIPMENT_ID = ? " ; // Changed by Manish on 22/03/16 for DDUK
if("DDUK".equalsIgnoreCase(projectName) )
{
sql = " SELECT SITE_CODE FROM DESPATCH WHERE DESP_ID = ? " ;
}
// Changed by Manish on 22/03/16 for DDUK
else
{
sql = " SELECT SITE_CODE FROM SHIPMENT WHERE SHIPMENT_ID = ? " ;
}
pstmt = conn.prepareStatement( sql ); pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, shipmentId ); pstmt.setString( 1, shipmentId );
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
...@@ -646,7 +744,7 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment ...@@ -646,7 +744,7 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
rs.close();rs = null; rs.close();rs = null;
pstmt.close();pstmt = null; pstmt.close();pstmt = null;
} }
// changed by sankara on 29-06-13 add join and sf_idenity // changed by sankara on 29-06-13 add join and sf_idenity
//sql = " SELECT CARRIER_FRIENDLYNAME FROM CARTON_MASTER WHERE PTCN IN (SELECT PTCN FROM SHIP_DOCS WHERE SHIPMENT_ID = ?) ORDER BY CARRIER_FRIENDLYNAME "; //sql = " SELECT CARRIER_FRIENDLYNAME FROM CARTON_MASTER WHERE PTCN IN (SELECT PTCN FROM SHIP_DOCS WHERE SHIPMENT_ID = ?) ORDER BY CARRIER_FRIENDLYNAME ";
//sql = " SELECT CARRIER_FRIENDLYNAME FROM CARTON_MASTER WHERE PTCN IN (SELECT PTCN FROM SHIP_DOCS WHERE SHIPMENT_ID = ?) AND SF_IDENTITY IS NULL ORDER BY CARRIER_FRIENDLYNAME "; //sql = " SELECT CARRIER_FRIENDLYNAME FROM CARTON_MASTER WHERE PTCN IN (SELECT PTCN FROM SHIP_DOCS WHERE SHIPMENT_ID = ?) AND SF_IDENTITY IS NULL ORDER BY CARRIER_FRIENDLYNAME ";
...@@ -661,28 +759,44 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment ...@@ -661,28 +759,44 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
" UNION " + " UNION " +
" SELECT DISTINCT C.CARRIER_FRIENDLYNAME, T.SHIPMENT_TYPE FROM CARTON_MASTER C, SHIP_DOCS S, SHIPMENT P, TRANSPORTER T WHERE S.PTCN = C.PTCN " + " SELECT DISTINCT C.CARRIER_FRIENDLYNAME, T.SHIPMENT_TYPE FROM CARTON_MASTER C, SHIP_DOCS S, SHIPMENT P, TRANSPORTER T WHERE S.PTCN = C.PTCN " +
" AND S.SHIPMENT_ID = ? AND S.SHIPMENT_ID = P.SHIPMENT_ID AND S.REF_SER = 'S-DSP' AND P.TRAN_CODE = T.TRAN_CODE AND C.CARRIER_FRIENDLYNAME IS NOT NULL " ;*/ " AND S.SHIPMENT_ID = ? AND S.SHIPMENT_ID = P.SHIPMENT_ID AND S.REF_SER = 'S-DSP' AND P.TRAN_CODE = T.TRAN_CODE AND C.CARRIER_FRIENDLYNAME IS NOT NULL " ;*/
//changed by sankara on 07/03/14 for parcel pick update start. //changed by sankara on 07/03/14 for parcel pick update start.
/* sql = " SELECT DISTINCT C.CARRIER_FRIENDLYNAME, T.SHIPMENT_TYPE, C.TRACKING_NO FROM CARTON_MASTER C, SHIPMENT_CONTENT N, SHIPMENT P, TRANSPORTER T " + /* sql = " SELECT DISTINCT C.CARRIER_FRIENDLYNAME, T.SHIPMENT_TYPE, C.TRACKING_NO FROM CARTON_MASTER C, SHIPMENT_CONTENT N, SHIPMENT P, TRANSPORTER T " +
" WHERE P.SHIPMENT_ID = ? AND P.SHIPMENT_ID = N.SHIPMENT_ID AND P.TRAN_CODE = T.TRAN_CODE AND N.CARTON_NO = C.CARTON_NO AND C.CARRIER_FRIENDLYNAME IS NOT NULL " + " WHERE P.SHIPMENT_ID = ? AND P.SHIPMENT_ID = N.SHIPMENT_ID AND P.TRAN_CODE = T.TRAN_CODE AND N.CARTON_NO = C.CARTON_NO AND C.CARRIER_FRIENDLYNAME IS NOT NULL " +
" UNION " + " UNION " +
" SELECT DISTINCT C.CARRIER_FRIENDLYNAME, T.SHIPMENT_TYPE, C.TRACKING_NO FROM CARTON_MASTER C, SHIP_DOCS S, SHIPMENT P, TRANSPORTER T,PACK_HDR PH WHERE S.PTCN = C.PTCN " + " SELECT DISTINCT C.CARRIER_FRIENDLYNAME, T.SHIPMENT_TYPE, C.TRACKING_NO FROM CARTON_MASTER C, SHIP_DOCS S, SHIPMENT P, TRANSPORTER T,PACK_HDR PH WHERE S.PTCN = C.PTCN " +
" AND S.SHIPMENT_ID = ? AND S.SHIPMENT_ID = P.SHIPMENT_ID AND S.REF_SER = 'S-DSP' AND P.TRAN_CODE = T.TRAN_CODE AND PH.OUTER_CARTON_NO = C.MASTER_CARTON AND PH.CONFIRMED = 'Y' AND C.CARRIER_FRIENDLYNAME IS NOT NULL " + " AND S.SHIPMENT_ID = ? AND S.SHIPMENT_ID = P.SHIPMENT_ID AND S.REF_SER = 'S-DSP' AND P.TRAN_CODE = T.TRAN_CODE AND PH.OUTER_CARTON_NO = C.MASTER_CARTON AND PH.CONFIRMED = 'Y' AND C.CARRIER_FRIENDLYNAME IS NOT NULL " +
" AND C.STATUS <> 'R' "; */ " AND C.STATUS <> 'R' "; */
// Changed by Manish on 22/03/16 for DDUK
sql = " SELECT DISTINCT C.CARRIER_FRIENDLYNAME, ST.SHIPMENT_TYPE, C.TRACKING_NO FROM CARTON_MASTER C, SHIPMENT_CONTENT N, SHIPMENT P, SITE_TRANSPORTER ST " + if("DDUK".equalsIgnoreCase(projectName) )
" WHERE P.SHIPMENT_ID = ? AND ST.SITE_CODE = ? AND P.SHIPMENT_ID = N.SHIPMENT_ID AND P.TRAN_CODE = ST.TRAN_CODE AND N.CARTON_NO = C.CARTON_NO AND C.CARRIER_FRIENDLYNAME IS NOT NULL " + {
" UNION " + sql = " SELECT DISTINCT C.CARRIER_FRIENDLYNAME, T.SHIPMENT_TYPE, C.TRACKING_NO FROM CARTON_MASTER C, DESPATCH D, TRANSPORTER T WHERE D.DESP_ID = ? " +
" SELECT DISTINCT C.CARRIER_FRIENDLYNAME, ST.SHIPMENT_TYPE, C.TRACKING_NO FROM CARTON_MASTER C, SHIP_DOCS S, SHIPMENT P, SITE_TRANSPORTER ST,PACK_HDR PH WHERE S.PTCN = C.PTCN " + "AND D.SITE_CODE = ? AND D.TRAN_CODE = T.TRAN_CODE AND D.PTCN = C.PTCN AND C.CARRIER_FRIENDLYNAME IS NOT NULL " +
" AND S.SHIPMENT_ID = ? AND ST.SITE_CODE = ? AND S.SHIPMENT_ID = P.SHIPMENT_ID AND S.REF_SER = 'S-DSP' AND P.TRAN_CODE = ST.TRAN_CODE AND C.CARTON_TYPE = 'M' AND PH.OUTER_CARTON_NO = C.MASTER_CARTON AND PH.CONFIRMED = 'Y' AND C.CARRIER_FRIENDLYNAME IS NOT NULL " + " UNION " +
" AND C.STATUS <> 'R' "+ " SELECT DISTINCT C.CARRIER_FRIENDLYNAME, T.SHIPMENT_TYPE, C.TRACKING_NO FROM CARTON_MASTER C, DESPATCH D, TRANSPORTER T, WAVE_TASK_DET WT " +
" UNION " + "WHERE D.PTCN = C.PTCN AND D.PTCN = WT.PTCN AND D.DESP_ID = ? AND D.SITE_CODE = ? AND WT.REF_SER = 'S-DSP' AND D.TRAN_CODE = T.TRAN_CODE " +
" SELECT DISTINCT C.CARRIER_FRIENDLYNAME, ST.SHIPMENT_TYPE, C.TRACKING_NO FROM CARTON_MASTER C, SHIP_DOCS S, SHIPMENT P, SITE_TRANSPORTER ST WHERE S.PTCN = C.PTCN " + "AND C.CARTON_TYPE = 'M' AND C.CARRIER_FRIENDLYNAME IS NOT NULL AND C.STATUS <> 'R' " +
//changed by sankara on 03/04/14 cosidered active also for close out "UNION " +
//" AND S.SHIPMENT_ID = ? AND S.SHIPMENT_ID = P.SHIPMENT_ID AND S.REF_SER = 'S-DSP' AND P.TRAN_CODE = T.TRAN_CODE AND C.CARTON_TYPE = 'P' AND C.CARRIER_FRIENDLYNAME IS NOT NULL " + " SELECT DISTINCT C.CARRIER_FRIENDLYNAME, T.SHIPMENT_TYPE, C.TRACKING_NO FROM CARTON_MASTER C, DESPATCH D, TRANSPORTER T ,WAVE_TASK_DET WT " +
" AND S.SHIPMENT_ID = ? AND ST.SITE_CODE = ? AND S.SHIPMENT_ID = P.SHIPMENT_ID AND S.REF_SER = 'S-DSP' AND P.TRAN_CODE = ST.TRAN_CODE AND C.CARTON_TYPE IN ('P','A') AND C.CARRIER_FRIENDLYNAME IS NOT NULL " + "WHERE D.PTCN = C.PTCN AND D.PTCN = WT.PTCN AND D.DESP_ID = ? AND D.SITE_CODE = ? AND WT.REF_SER = 'S-DSP' AND D.TRAN_CODE = T.TRAN_CODE " +
" AND C.STATUS <> 'R' " "AND C.CARTON_TYPE IN ('P','A') AND C.CARRIER_FRIENDLYNAME IS NOT NULL AND C.STATUS <> 'R' ";
; }
// Changed by Manish on 22/03/16 for DDUK
else
{
sql = " SELECT DISTINCT C.CARRIER_FRIENDLYNAME, ST.SHIPMENT_TYPE, C.TRACKING_NO FROM CARTON_MASTER C, SHIPMENT_CONTENT N, SHIPMENT P, SITE_TRANSPORTER ST " +
" WHERE P.SHIPMENT_ID = ? AND ST.SITE_CODE = ? AND P.SHIPMENT_ID = N.SHIPMENT_ID AND P.TRAN_CODE = ST.TRAN_CODE AND N.CARTON_NO = C.CARTON_NO AND C.CARRIER_FRIENDLYNAME IS NOT NULL " +
" UNION " +
" SELECT DISTINCT C.CARRIER_FRIENDLYNAME, ST.SHIPMENT_TYPE, C.TRACKING_NO FROM CARTON_MASTER C, SHIP_DOCS S, SHIPMENT P, SITE_TRANSPORTER ST,PACK_HDR PH WHERE S.PTCN = C.PTCN " +
" AND S.SHIPMENT_ID = ? AND ST.SITE_CODE = ? AND S.SHIPMENT_ID = P.SHIPMENT_ID AND S.REF_SER = 'S-DSP' AND P.TRAN_CODE = ST.TRAN_CODE AND C.CARTON_TYPE = 'M' AND PH.OUTER_CARTON_NO = C.MASTER_CARTON AND PH.CONFIRMED = 'Y' AND C.CARRIER_FRIENDLYNAME IS NOT NULL " +
" AND C.STATUS <> 'R' "+
" UNION " +
" SELECT DISTINCT C.CARRIER_FRIENDLYNAME, ST.SHIPMENT_TYPE, C.TRACKING_NO FROM CARTON_MASTER C, SHIP_DOCS S, SHIPMENT P, SITE_TRANSPORTER ST WHERE S.PTCN = C.PTCN " +
//changed by sankara on 03/04/14 cosidered active also for close out
//" AND S.SHIPMENT_ID = ? AND S.SHIPMENT_ID = P.SHIPMENT_ID AND S.REF_SER = 'S-DSP' AND P.TRAN_CODE = T.TRAN_CODE AND C.CARTON_TYPE = 'P' AND C.CARRIER_FRIENDLYNAME IS NOT NULL " +
" AND S.SHIPMENT_ID = ? AND ST.SITE_CODE = ? AND S.SHIPMENT_ID = P.SHIPMENT_ID AND S.REF_SER = 'S-DSP' AND P.TRAN_CODE = ST.TRAN_CODE AND C.CARTON_TYPE IN ('P','A') AND C.CARRIER_FRIENDLYNAME IS NOT NULL " +
" AND C.STATUS <> 'R' " ;
}
//changed by sankara on 07/03/14 for parcel pick update end. //changed by sankara on 07/03/14 for parcel pick update end.
//changed by sankara on 04-02-14 for close out changes based on tracking numbers end. //changed by sankara on 04-02-14 for close out changes based on tracking numbers end.
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -704,11 +818,11 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment ...@@ -704,11 +818,11 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
shipperName = rs.getString("SHIPMENT_TYPE"); shipperName = rs.getString("SHIPMENT_TYPE");
//changed by sankara on 04-02-14 for close out changes based on tracking numbers //changed by sankara on 04-02-14 for close out changes based on tracking numbers
trackingNumber = rs.getString("TRACKING_NO"); trackingNumber = rs.getString("TRACKING_NO");
if(!carrMap.containsKey(carrierFriendlyName + ":" + shipperName)) if(!carrMap.containsKey(carrierFriendlyName + ":" + shipperName))
{ {
shipList = new ArrayList(); shipList = new ArrayList();
} }
else else
{ {
...@@ -721,23 +835,42 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment ...@@ -721,23 +835,42 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
//System.out.println("tracknumList::::::"+tracknumList); //System.out.println("tracknumList::::::"+tracknumList);
trackingNum.append(trackingNumber+","); trackingNum.append(trackingNumber+",");
} }
rs.close();rs = null;
pstmt.close();pstmt = null;
//changed by sankara on 22/09/14 for site transporter end. //changed by sankara on 22/09/14 for site transporter end.
//changed by sankara added if condition on 22/09/14 for site transporter //changed by sankara added if condition on 22/09/14 for site transporter
if(!istransporterexist) if(!istransporterexist)
{ {
sql = " SELECT DISTINCT C.CARRIER_FRIENDLYNAME, T.SHIPMENT_TYPE, C.TRACKING_NO FROM CARTON_MASTER C, SHIPMENT_CONTENT N, SHIPMENT P, TRANSPORTER T " + // Changed by Manish on 22/03/16 for DDUK
" WHERE P.SHIPMENT_ID = ? AND P.SHIPMENT_ID = N.SHIPMENT_ID AND P.TRAN_CODE = T.TRAN_CODE AND N.CARTON_NO = C.CARTON_NO AND C.CARRIER_FRIENDLYNAME IS NOT NULL " + if("DDUK".equalsIgnoreCase(projectName) )
" UNION " + {
" SELECT DISTINCT C.CARRIER_FRIENDLYNAME, T.SHIPMENT_TYPE, C.TRACKING_NO FROM CARTON_MASTER C, SHIP_DOCS S, SHIPMENT P, TRANSPORTER T,PACK_HDR PH WHERE S.PTCN = C.PTCN " + sql = " SELECT DISTINCT C.CARRIER_FRIENDLYNAME, T.SHIPMENT_TYPE, C.TRACKING_NO FROM CARTON_MASTER C, DESPATCH D, TRANSPORTER T WHERE D.DESP_ID = ? " +
" AND S.SHIPMENT_ID = ? AND S.SHIPMENT_ID = P.SHIPMENT_ID AND S.REF_SER = 'S-DSP' AND P.TRAN_CODE = T.TRAN_CODE AND C.CARTON_TYPE = 'M' AND PH.OUTER_CARTON_NO = C.MASTER_CARTON AND PH.CONFIRMED = 'Y' AND C.CARRIER_FRIENDLYNAME IS NOT NULL " + " AND D.PTCN = C.PTCN AND D.TRAN_CODE = T.TRAN_CODE AND C.CARRIER_FRIENDLYNAME IS NOT NULL " +
" AND C.STATUS <> 'R' "+ " UNION " +
" UNION " + " SELECT DISTINCT C.CARRIER_FRIENDLYNAME, T.SHIPMENT_TYPE, C.TRACKING_NO FROM CARTON_MASTER C, DESPATCH D, TRANSPORTER T, WAVE_TASK_DET WT" +
" SELECT DISTINCT C.CARRIER_FRIENDLYNAME, T.SHIPMENT_TYPE, C.TRACKING_NO FROM CARTON_MASTER C, SHIP_DOCS S, SHIPMENT P, TRANSPORTER T WHERE S.PTCN = C.PTCN " + " WHERE D.PTCN = C.PTCN AND D.PTCN = WT.PTCN AND D.DESP_ID = ? AND WT.REF_SER = 'S-DSP' AND D.TRAN_CODE = T.TRAN_CODE AND C.CARTON_TYPE = 'M' " +
//changed by sankara on 03/04/14 cosidered active also for close out "AND C.CARRIER_FRIENDLYNAME IS NOT NULL AND C.STATUS <> 'R' " +
//" AND S.SHIPMENT_ID = ? AND S.SHIPMENT_ID = P.SHIPMENT_ID AND S.REF_SER = 'S-DSP' AND P.TRAN_CODE = T.TRAN_CODE AND C.CARTON_TYPE = 'P' AND C.CARRIER_FRIENDLYNAME IS NOT NULL " + "UNION " +
" AND S.SHIPMENT_ID = ? AND S.SHIPMENT_ID = P.SHIPMENT_ID AND S.REF_SER = 'S-DSP' AND P.TRAN_CODE = T.TRAN_CODE AND C.CARTON_TYPE IN ('P','A') AND C.CARRIER_FRIENDLYNAME IS NOT NULL " + " SELECT DISTINCT C.CARRIER_FRIENDLYNAME, T.SHIPMENT_TYPE, C.TRACKING_NO " +
" AND C.STATUS <> 'R' " " FROM CARTON_MASTER C, DESPATCH D, TRANSPORTER T, WAVE_TASK_DET WT WHERE D.PTCN = C.PTCN AND D.PTCN = WT.PTCN AND D.DESP_ID = ? " +
; " AND WT.REF_SER = 'S-DSP' AND D.TRAN_CODE = T.TRAN_CODE AND C.CARTON_TYPE IN ('P','A') AND C.CARRIER_FRIENDLYNAME IS NOT NULL AND C.STATUS <> 'R' ";
}
// Changed by Manish on 22/03/16 for DDUK
else
{
sql = " SELECT DISTINCT C.CARRIER_FRIENDLYNAME, T.SHIPMENT_TYPE, C.TRACKING_NO FROM CARTON_MASTER C, SHIPMENT_CONTENT N, SHIPMENT P, TRANSPORTER T " +
" WHERE P.SHIPMENT_ID = ? AND P.SHIPMENT_ID = N.SHIPMENT_ID AND P.TRAN_CODE = T.TRAN_CODE AND N.CARTON_NO = C.CARTON_NO AND C.CARRIER_FRIENDLYNAME IS NOT NULL " +
" UNION " +
" SELECT DISTINCT C.CARRIER_FRIENDLYNAME, T.SHIPMENT_TYPE, C.TRACKING_NO FROM CARTON_MASTER C, SHIP_DOCS S, SHIPMENT P, TRANSPORTER T,PACK_HDR PH WHERE S.PTCN = C.PTCN " +
" AND S.SHIPMENT_ID = ? AND S.SHIPMENT_ID = P.SHIPMENT_ID AND S.REF_SER = 'S-DSP' AND P.TRAN_CODE = T.TRAN_CODE AND C.CARTON_TYPE = 'M' AND PH.OUTER_CARTON_NO = C.MASTER_CARTON AND PH.CONFIRMED = 'Y' AND C.CARRIER_FRIENDLYNAME IS NOT NULL " +
" AND C.STATUS <> 'R' "+
" UNION " +
" SELECT DISTINCT C.CARRIER_FRIENDLYNAME, T.SHIPMENT_TYPE, C.TRACKING_NO FROM CARTON_MASTER C, SHIP_DOCS S, SHIPMENT P, TRANSPORTER T WHERE S.PTCN = C.PTCN " +
//changed by sankara on 03/04/14 cosidered active also for close out
//" AND S.SHIPMENT_ID = ? AND S.SHIPMENT_ID = P.SHIPMENT_ID AND S.REF_SER = 'S-DSP' AND P.TRAN_CODE = T.TRAN_CODE AND C.CARTON_TYPE = 'P' AND C.CARRIER_FRIENDLYNAME IS NOT NULL " +
" AND S.SHIPMENT_ID = ? AND S.SHIPMENT_ID = P.SHIPMENT_ID AND S.REF_SER = 'S-DSP' AND P.TRAN_CODE = T.TRAN_CODE AND C.CARTON_TYPE IN ('P','A') AND C.CARRIER_FRIENDLYNAME IS NOT NULL " +
" AND C.STATUS <> 'R' ";
}
//changed by sankara on 07/03/14 for parcel pick update end. //changed by sankara on 07/03/14 for parcel pick update end.
//changed by sankara on 04-02-14 for close out changes based on tracking numbers end. //changed by sankara on 04-02-14 for close out changes based on tracking numbers end.
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -771,6 +904,8 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment ...@@ -771,6 +904,8 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
//System.out.println("tracknumList::::::"+tracknumList); //System.out.println("tracknumList::::::"+tracknumList);
trackingNum.append(trackingNumber+","); trackingNum.append(trackingNumber+",");
} }
rs.close();rs = null;
pstmt.close();pstmt = null;
} }
//changed by sankara on 04-02-14 for close out changes based on tracking numbers start //changed by sankara on 04-02-14 for close out changes based on tracking numbers start
System.out.println("trackingNum:::::"+trackingNum); System.out.println("trackingNum:::::"+trackingNum);
...@@ -782,11 +917,11 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment ...@@ -782,11 +917,11 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
} }
//changed by sankara on 04-02-14 for close out changes based on tracking numbers end //changed by sankara on 04-02-14 for close out changes based on tracking numbers end
} }
} }
// changed by sankara on 29-06-13 add join and sf_idenity // changed by sankara on 29-06-13 add join and sf_idenity
// updateSql= " UPDATE CARTON_MASTER SET SF_IDENTITY = ? WHERE PTCN IN (SELECT PTCN FROM SHIP_DOCS WHERE SHIPMENT_ID = ?)"; // updateSql= " UPDATE CARTON_MASTER SET SF_IDENTITY = ? WHERE PTCN IN (SELECT PTCN FROM SHIP_DOCS WHERE SHIPMENT_ID = ?)";
// changed by sankara on 17/08/13 for updation of sf_idenity in manual ship case start.. // changed by sankara on 17/08/13 for updation of sf_idenity in manual ship case start..
...@@ -832,12 +967,12 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment ...@@ -832,12 +967,12 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
}*/ }*/
//changed by sankara on 07/03/14 for shipment passed in below end. //changed by sankara on 07/03/14 for shipment passed in below end.
// changed by sankara on 17//08/13 for updation of sf_idenity in manual ship case end.. // changed by sankara on 17//08/13 for updation of sf_idenity in manual ship case end..
if(carrMap != null && carrMap.size() > 0) if(carrMap != null && carrMap.size() > 0)
{ {
Set keySet = carrMap.keySet(); Set keySet = carrMap.keySet();
Iterator itCarrFnd = keySet.iterator(); Iterator itCarrFnd = keySet.iterator();
String carrFndName = ""; String carrFndName = "";
String closeShipperName = ""; String closeShipperName = "";
...@@ -846,23 +981,23 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment ...@@ -846,23 +981,23 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
String key = ""; String key = "";
int tmpListLen = 0; int tmpListLen = 0;
String sfIdentity = ""; String sfIdentity = "";
while(itCarrFnd.hasNext()) while(itCarrFnd.hasNext())
{ {
key = (String)itCarrFnd.next(); key = (String)itCarrFnd.next();
tempList = (ArrayList)carrMap.get(key); tempList = (ArrayList)carrMap.get(key);
tmpListLen = tempList.size(); tmpListLen = tempList.size();
carrFndName = key.substring(0, key.indexOf(":")); carrFndName = key.substring(0, key.indexOf(":"));
closeShipperName = key.substring(key.indexOf(":") + 1,key.length()); closeShipperName = key.substring(key.indexOf(":") + 1,key.length());
System.out.println("Getting Sfidentity For Carriers services with ----["+carrFndName+"]--Shiiper Name-["+closeShipperName+"] Close Out Date["+strSmple+"]"); System.out.println("Getting Sfidentity For Carriers services with ----["+carrFndName+"]--Shiiper Name-["+closeShipperName+"] Close Out Date["+strSmple+"]");
//StringDictionaryReturn testStr = soap.closeOutEOD("Taro Commercial", carrFndName,strSmple, true, "Shipments"); //StringDictionaryReturn testStr = soap.closeOutEOD("Taro Commercial", carrFndName,strSmple, true, "Shipments");
//changed by sankara on 04-02-14 for close out changes based on tracking numbers start. //changed by sankara on 04-02-14 for close out changes based on tracking numbers start.
//StringDictionaryReturn testStr = soap.closeOutEOD(closeShipperName, carrFndName,strSmple, true, "Shipments"); //StringDictionaryReturn testStr = soap.closeOutEOD(closeShipperName, carrFndName,strSmple, true, "Shipments");
String shipdetails = "0000CloseOutEOD;shipperFriendlyName="+closeShipperName+";carrierFriendlyName="+carrFndName+";shipDate="+strSmple+";" + String shipdetails = "0000CloseOutEOD;shipperFriendlyName="+closeShipperName+";carrierFriendlyName="+carrFndName+";shipDate="+strSmple+";" +
"trackingNumbers="+trackingNumber+";"; "trackingNumbers="+trackingNumber+";";
System.out.println("shipdetails::::::::"+shipdetails); System.out.println("shipdetails::::::::"+shipdetails);
StringReturn testStr1 = soap.serverQuery(shipdetails); StringReturn testStr1 = soap.serverQuery(shipdetails);
System.out.println("isSuccess["+testStr1.isSuccess()+"]"); System.out.println("isSuccess["+testStr1.isSuccess()+"]");
...@@ -891,14 +1026,14 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment ...@@ -891,14 +1026,14 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
/*if(testStr.isSuccess()) /*if(testStr.isSuccess())
{ {
System.out.println("testStr.getResponseDictionary().get_any()"+testStr.getResponseDictionary().get_any()); System.out.println("testStr.getResponseDictionary().get_any()"+testStr.getResponseDictionary().get_any());
if(testStr.getResponseDictionary().get_any() != null) if(testStr.getResponseDictionary().get_any() != null)
{ {
int len1 = testStr.getResponseDictionary().get_any().length; int len1 = testStr.getResponseDictionary().get_any().length;
System.out.println("Len Response recived from ADSI"+len1); System.out.println("Len Response recived from ADSI"+len1);
for ( int cCTR =0 ; cCTR <len1; cCTR++ ) for ( int cCTR =0 ; cCTR <len1; cCTR++ )
{ {
...@@ -915,7 +1050,7 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment ...@@ -915,7 +1050,7 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
System.out.println("Value["+testStr.getResponseDictionary().get_any()[cCTR].getElementsByTagName("string").item(1).getFirstChild().getNodeValue()+"]"); System.out.println("Value["+testStr.getResponseDictionary().get_any()[cCTR].getElementsByTagName("string").item(1).getFirstChild().getNodeValue()+"]");
} }
if(testStr.getResponseDictionary().get_any()[cCTR].getElementsByTagName("string").item(0).getFirstChild()!= null && testStr.getResponseDictionary().get_any()[cCTR].getElementsByTagName("string").item(0).getFirstChild().getNodeValue().equalsIgnoreCase("SF_Identity")) if(testStr.getResponseDictionary().get_any()[cCTR].getElementsByTagName("string").item(0).getFirstChild()!= null && testStr.getResponseDictionary().get_any()[cCTR].getElementsByTagName("string").item(0).getFirstChild().getNodeValue().equalsIgnoreCase("SF_Identity"))
{ {
...@@ -923,7 +1058,7 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment ...@@ -923,7 +1058,7 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
{ {
sfIdentity = testStr.getResponseDictionary().get_any()[cCTR].getElementsByTagName("string").item(1).getFirstChild().getNodeValue(); sfIdentity = testStr.getResponseDictionary().get_any()[cCTR].getElementsByTagName("string").item(1).getFirstChild().getNodeValue();
} }
} }
} }
...@@ -942,11 +1077,21 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment ...@@ -942,11 +1077,21 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
errString =getError(testStr1.getResponse(),"ADSCLOSEOD", conn); errString =getError(testStr1.getResponse(),"ADSCLOSEOD", conn);
return errString; return errString;
} }
System.out.println("Carrier Name ----["+carrFndName+"]----sfIdentity["+sfIdentity+"]"); System.out.println("Carrier Name ----["+carrFndName+"]----sfIdentity["+sfIdentity+"]");
System.out.println("tmpListLen:::::"+tmpListLen); System.out.println("tmpListLen:::::"+tmpListLen);
//changed by sankara on 07/02/14 for getting refser //changed by sankara on 07/02/14 for getting refser
sql = " SELECT PTCN, REF_SER FROM SHIP_DOCS D, SHIPMENT S WHERE S.SHIPMENT_ID = D.SHIPMENT_ID AND D.SHIPMENT_ID = ? " ;
// Changed by Manish on 22/03/16 for DDUK
if("DDUK".equalsIgnoreCase(projectName) )
{
sql = " SELECT D.PTCN, WT.REF_SER FROM DESPATCH D, WAVE_TASK_DET WT WHERE D.PTCN = WT.PTCN AND D.DESP_ID = ? ";
}
// Changed by Manish on 22/03/16 for DDUK
else
{
sql = " SELECT PTCN, REF_SER FROM SHIP_DOCS D, SHIPMENT S WHERE S.SHIPMENT_ID = D.SHIPMENT_ID AND D.SHIPMENT_ID = ? " ;
}
pstmt1 = conn.prepareStatement(sql); pstmt1 = conn.prepareStatement(sql);
for(int tmpCtr = 0;tmpCtr < tmpListLen; tmpCtr++) for(int tmpCtr = 0;tmpCtr < tmpListLen; tmpCtr++)
{ {
...@@ -959,7 +1104,7 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment ...@@ -959,7 +1104,7 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
//changed by sankara on 04-02-14 for close out changes based on tracking numbers //changed by sankara on 04-02-14 for close out changes based on tracking numbers
//pstmt.setString(3,trackingNumber); //pstmt.setString(3,trackingNumber);
count = pstmt.executeUpdate(); count = pstmt.executeUpdate();
if(count > 0) if(count > 0)
{ {
System.out.println("Update count ["+count+"]"); System.out.println("Update count ["+count+"]");
...@@ -967,18 +1112,19 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment ...@@ -967,18 +1112,19 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
pstmt.clearParameters();*/ pstmt.clearParameters();*/
String ptcns = ""; String ptcns = "";
String refser = ""; String refser = "";
shipmentIDs = (String)tempList.get(tmpCtr); shipmentIDs = (String)tempList.get(tmpCtr);
System.out.println("Current Shipment ID :::"+shipmentIDs); System.out.println("Current Shipment ID :::"+shipmentIDs);
pstmt1.setString(1,shipmentIDs); pstmt1.setString(1,shipmentIDs);
rs1 = pstmt1.executeQuery(); rs1 = pstmt1.executeQuery();
if( rs1.next()) // if( rs1.next())
while( rs1.next())
{ {
ptcns = checkNull(rs1.getString("PTCN")); ptcns = checkNull(rs1.getString("PTCN"));
refser = checkNull(rs1.getString("REF_SER")); refser = checkNull(rs1.getString("REF_SER"));
System.out.println("ptcns:::"+ptcns); System.out.println("ptcns:::"+ptcns);
System.out.println("refser:::"+refser); System.out.println("refser:::"+refser);
System.out.println("Getting the values for Current Shipment ID :::"+shipmentIDs+"]["+refser); System.out.println("Getting the values for Current Shipment ID :::"+shipmentIDs+"]["+refser);
} }
pstmt1.clearParameters(); pstmt1.clearParameters();
if(rs1 != null) if(rs1 != null)
...@@ -993,15 +1139,36 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment ...@@ -993,15 +1139,36 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
//updateSql = " UPDATE CARTON_MASTER SET SF_IDENTITY = ? WHERE PTCN IN (SELECT PTCN FROM SHIP_DOCS WHERE SHIPMENT_ID = ? ) AND STATUS = 'U' AND CARTON_TYPE IN ('M','P') AND SF_IDENTITY IS NULL " ; //updateSql = " UPDATE CARTON_MASTER SET SF_IDENTITY = ? WHERE PTCN IN (SELECT PTCN FROM SHIP_DOCS WHERE SHIPMENT_ID = ? ) AND STATUS = 'U' AND CARTON_TYPE IN ('M','P') AND SF_IDENTITY IS NULL " ;
//changed by sankara on 30/08/14 update close out date //changed by sankara on 30/08/14 update close out date
//updateSql = " UPDATE CARTON_MASTER SET SF_IDENTITY = ? WHERE PTCN IN (SELECT PTCN FROM SHIP_DOCS WHERE SHIPMENT_ID = ? ) AND STATUS = 'U' AND CARTON_TYPE IN ('M','P','A') AND SF_IDENTITY IS NULL " ; //updateSql = " UPDATE CARTON_MASTER SET SF_IDENTITY = ? WHERE PTCN IN (SELECT PTCN FROM SHIP_DOCS WHERE SHIPMENT_ID = ? ) AND STATUS = 'U' AND CARTON_TYPE IN ('M','P','A') AND SF_IDENTITY IS NULL " ;
updateSql = " UPDATE CARTON_MASTER SET SF_IDENTITY = ?, CLOSEOUT_DATE = ? WHERE PTCN IN (SELECT PTCN FROM SHIP_DOCS WHERE SHIPMENT_ID = ? ) AND STATUS = 'U' AND CARTON_TYPE IN ('M','P','A') AND SF_IDENTITY IS NULL " ;
// Changed by Manish on 22/03/16 for DDUK
if("DDUK".equalsIgnoreCase(projectName) )
{
updateSql = " UPDATE CARTON_MASTER SET SF_IDENTITY = ?, CLOSEOUT_DATE = ? WHERE PTCN IN (SELECT PTCN FROM DESPATCH WHERE DESP_ID = ? ) AND STATUS = 'U' AND CARTON_TYPE IN ('M','P','A') AND SF_IDENTITY IS NULL " ;
}
// Changed by Manish on 22/03/16 for DDUK
else
{
updateSql = " UPDATE CARTON_MASTER SET SF_IDENTITY = ?, CLOSEOUT_DATE = ? WHERE PTCN IN (SELECT PTCN FROM SHIP_DOCS WHERE SHIPMENT_ID = ? ) AND STATUS = 'U' AND CARTON_TYPE IN ('M','P','A') AND SF_IDENTITY IS NULL " ;
}
} }
if((ptcns == null || ptcns.trim().length() == 0) && !refser.trim().equalsIgnoreCase("S-DSP") ) if((ptcns == null || ptcns.trim().length() == 0) && !refser.trim().equalsIgnoreCase("S-DSP") )
{ {
//changed by sankara on 30/08/14 update close out date //changed by sankara on 30/08/14 update close out date
//updateSql = " UPDATE CARTON_MASTER SET SF_IDENTITY = ? WHERE CARTON_NO IN ( SELECT CARTON_NO FROM SHIPMENT_CONTENT C, SHIP_DOCS D, SHIPMENT S " + //updateSql = " UPDATE CARTON_MASTER SET SF_IDENTITY = ? WHERE CARTON_NO IN ( SELECT CARTON_NO FROM SHIPMENT_CONTENT C, SHIP_DOCS D, SHIPMENT S " +
updateSql = " UPDATE CARTON_MASTER SET SF_IDENTITY = ?, CLOSEOUT_DATE = ? WHERE CARTON_NO IN ( SELECT CARTON_NO FROM SHIPMENT_CONTENT C, SHIP_DOCS D, SHIPMENT S " +
" WHERE S.SHIPMENT_ID = D.SHIPMENT_ID OR D.SHIPMENT_ID IS NULL AND S.SHIPMENT_ID = C.SHIPMENT_ID " + // Changed by Manish on 22/03/16 for DDUK
" AND S.SHIPMENT_ID = ? ) AND STATUS = 'U' AND SF_IDENTITY IS NULL " ; if("DDUK".equalsIgnoreCase(projectName) )
{
updateSql = " UPDATE CARTON_MASTER SET SF_IDENTITY = ?, CLOSEOUT_DATE = ? WHERE CARTON_NO IN ( SELECT W.CARTON_NO FROM DESPATCH D,WAVE_STATUS_ORG_DET W " +
"WHERE D.PTCN = W.PTCN AND D.DESP_ID = ? ) AND STATUS = 'U' AND SF_IDENTITY IS NULL " ;
}
// Changed by Manish on 22/03/16 for DDUK
else
{
updateSql = " UPDATE CARTON_MASTER SET SF_IDENTITY = ?, CLOSEOUT_DATE = ? WHERE CARTON_NO IN ( SELECT CARTON_NO FROM SHIPMENT_CONTENT C, SHIP_DOCS D, SHIPMENT S " +
" WHERE S.SHIPMENT_ID = D.SHIPMENT_ID OR D.SHIPMENT_ID IS NULL AND S.SHIPMENT_ID = C.SHIPMENT_ID " +
" AND S.SHIPMENT_ID = ? ) AND STATUS = 'U' AND SF_IDENTITY IS NULL " ;
}
} }
pstmt = conn.prepareStatement(updateSql); pstmt = conn.prepareStatement(updateSql);
pstmt.setString(1,sfIdentity); pstmt.setString(1,sfIdentity);
...@@ -1013,8 +1180,8 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment ...@@ -1013,8 +1180,8 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
if(count > 0) if(count > 0)
{ {
System.out.println("Update count ["+count+"]"); System.out.println("Update count ["+count+"]");
} }
if(pstmt!=null) if(pstmt!=null)
{ {
pstmt.close(); pstmt.close();
...@@ -1033,15 +1200,15 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment ...@@ -1033,15 +1200,15 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
} }
sfIdentity = ""; sfIdentity = "";
} }
} }
if(!isError) if(!isError)
{ {
errCode = "PRCESSFUL"; errCode = "PRCESSFUL";
errString = itmDBAccessEJB.getErrorString("","PRCESSFUL",userId); errString = itmDBAccessEJB.getErrorString("","PRCESSFUL",userId);
} }
} }
catch (Exception e) catch (Exception e)
......
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