Skip to content

B
business-java
Commit 07b46893 authored by rbhogale's avatar rbhogale
Browse files
Options

Changed by sankara on 16-08-13 for get data sql 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@93505 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 0af7d009
Hide whitespace changes
Inline Side-by-side
Showing with 74 additions and 12 deletions
webitm-wms/ibase/webitm/ejb/wms/ShipmentPrc.java
View file @ 07b46893
......@@ -247,17 +247,77 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
tDate = oracleFormatDate(toDate);
System.out.println("TDATE="+tDate);
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 T.SHIPMENT_TYPE = ? AND D.PTCN = C.PTCN AND C.SF_IDENTITY IS NULL ";
System.out.println("**************getDataSql="+getDataSql);
pstmt = conn.prepareStatement(getDataSql);
pstmt.setString(1,frdate);
pstmt.setString(2,tDate);
pstmt.setString(3,transporterFrom);
pstmt.setString(4,transporterTo);
pstmt.setString(5,shipmentType);
// 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 " +
" 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 ";
System.out.println("**************getDataSql="+getDataSql);
pstmt = conn.prepareStatement(getDataSql);
pstmt.setString(1,frdate);
pstmt.setString(2,tDate);
pstmt.setString(3,transporterFrom);
pstmt.setString(4,transporterTo);
pstmt.setString(5,shipmentType); */
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 T.SHIPMENT_TYPE = ? " +
" AND D.PTCN = C.PTCN " +
" AND C.SF_IDENTITY IS NULL " +
" AND T.SERVICE_CODE IS NOT NULL " +
" AND C.TRACKING_NO IS NOT NULL " +
" UNION " + // MANUAL SHIPMENT REF SER = "" AND NON INVENTORY
" SELECT DISTINCT D.PTCN, S.SHIPMENT_ID, T.TRAN_NAME FROM SHIP_DOCS D, SHIPMENT_CONTENT P, "+
" SHIPMENT S, TRANSPORTER T, CARTON_MASTER C " +
" WHERE D.SHIPMENT_ID <> S.SHIPMENT_ID " +
" AND S.SHIPMENT_ID = P.SHIPMENT_ID " +
" AND S.TRAN_CODE = T.TRAN_CODE " +
" AND S.CONFIRMED = 'Y' " +
" AND S.CONF_DATE BETWEEN ? AND ? " +
" AND S.TRAN_CODE BETWEEN ? AND ? " +
" AND T.SHIPMENT_TYPE = ? " +
" AND C.SF_IDENTITY IS NULL " +
" AND T.SERVICE_CODE IS NOT NULL " +
" AND C.TRACKING_NO IS NOT NULL " +
" AND D.PTCN IS NULL " +
" UNION " + //MANUAL SHIPMENT REF SER = "" AND INVENTORY
" SELECT DISTINCT D.PTCN, S.SHIPMENT_ID, T.TRAN_NAME FROM SHIP_DOCS D, SHIPMENT_CONTENT P, "+
" SHIPMENT S, TRANSPORTER T, CARTON_MASTER C " +
" WHERE D.SHIPMENT_ID = S.SHIPMENT_ID " +
" AND S.SHIPMENT_ID = P.SHIPMENT_ID " +
" AND D.SHIPMENT_ID = P.SHIPMENT_ID " +
" AND S.TRAN_CODE = T.TRAN_CODE " +
" AND S.CONFIRMED = 'Y' " +
" AND S.CONF_DATE BETWEEN ? AND ? " +
" AND S.TRAN_CODE BETWEEN ? AND ? " +
" AND D.PTCN IS NULL " +
" AND T.SHIPMENT_TYPE = ? " +
" AND C.SF_IDENTITY IS NULL " +
" AND T.SERVICE_CODE IS NOT NULL " +
" AND C.TRACKING_NO IS NOT NULL " ;
System.out.println("**************getDataSql="+getDataSql);
pstmt = conn.prepareStatement(getDataSql);
pstmt.setString(1,frdate);
pstmt.setString(2,tDate);
pstmt.setString(3,transporterFrom);
pstmt.setString(4,transporterTo);
pstmt.setString(5,shipmentType);
pstmt.setString(6,frdate);
pstmt.setString(7,tDate);
pstmt.setString(8,transporterFrom);
pstmt.setString(9,transporterTo);
pstmt.setString(10,shipmentType);
pstmt.setString(11,frdate);
pstmt.setString(12,tDate);
pstmt.setString(13,transporterFrom);
pstmt.setString(14,transporterTo);
pstmt.setString(15,shipmentType);
// Changed by sankara on 16/08/13 for allow shipment despatch and all manual shipment.end
rs = pstmt.executeQuery();
rsflag=false;
while(rs.next())
......@@ -477,7 +537,9 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
//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 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 P.TRAN_CODE = T.TRAN_CODE AND C.CARRIER_FRIENDLYNAME" +
// Changed by sankara on 16-08-13 ptcn is not available in manual shipment case...
// " S.PTCN =C.PTCN AND S.SHIPMENT_ID = ? AND S.SHIPMENT_ID = P.SHIPMENT_ID AND P.TRAN_CODE = T.TRAN_CODE AND C.CARRIER_FRIENDLYNAME" +
" S.SHIPMENT_ID = ? AND S.SHIPMENT_ID = P.SHIPMENT_ID AND P.TRAN_CODE = T.TRAN_CODE AND C.CARRIER_FRIENDLYNAME " +
" IS NOT NULL ORDER BY C.CARRIER_FRIENDLYNAME ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,shipmentId);
......
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