changed by sankara on 03/04/14 updated shipmentprc source for close out

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

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

@@ -594,7 +594,9 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
 							" 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 " +
-							" 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 " +
+							//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.	
@@ -847,7 +849,9 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
 						}
 						if( ptcns != null && refser.trim().equalsIgnoreCase("S-DSP") )
 						{
-							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 04/03/14 considered active also for close out
+							//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','A') AND SF_IDENTITY IS NULL " ;			
 						}
 						if((ptcns == null || ptcns.trim().length() == 0) && !refser.trim().equalsIgnoreCase("S-DSP") )
 						{