changed by sankara on 08/04/14 shipmentprc for wms live

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@94524 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-wms/ibase/webitm/ejb/wms/ShipmentPrc.java

@@ -275,7 +275,8 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
 							     //changed by sankara on 04/02/2014 for getting used tracking_no only 
 							     " AND C.STATUS <> 'R' " +
 							     " 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, "+
+							     //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, "+
 							     " SHIPMENT S, TRANSPORTER T, CARTON_MASTER C " +
 							     " WHERE D.SHIPMENT_ID <> S.SHIPMENT_ID " + 
 							     " AND S.SHIPMENT_ID = P.SHIPMENT_ID " +
@@ -287,8 +288,21 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
 							     " 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 " +
+							     " AND D.PTCN IS NULL " +*/
+							     " SELECT DISTINCT '' AS PTCN, S.SHIPMENT_ID, T.TRAN_NAME FROM  SHIPMENT_CONTENT P, "+
+							     " SHIPMENT S, TRANSPORTER T, CARTON_MASTER C " +
+							     " WHERE S.SHIPMENT_ID NOT IN (SELECT DISTINCT SHIPMENT_ID FROM SHIP_DOCS)" + 
+							     " 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 " + 
      						     // 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.
 							     " AND P.CARTON_NO = C.CARTON_NO " +
 							     " UNION " +                              //MANUAL SHIPMENT  REF SER = "" AND INVENTORY 
 							     " SELECT DISTINCT D.PTCN, S.SHIPMENT_ID, T.TRAN_NAME FROM SHIP_DOCS D, SHIPMENT_CONTENT P, "+