Changed by Rohan on 29-06-13 for shankara getting shipment type

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

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

@@ -434,6 +434,7 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
 			ADSIShippingSoap  soap = null;
 			String PTCN = "";
 			String carrierFriendlyName = "";
+			String shipperName = "";
 			java.util.Date date = new Date();
 			Calendar calendar = Calendar.getInstance();
 			calendar.setTime(date);
@@ -468,31 +469,44 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
 				shipmentId = (String)it.next();
 				if(shipmentId != null && shipmentId.trim().length() > 0 )
 				{
-				// 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 = ?) AND SF_IDENTITY IS NULL ORDER BY CARRIER_FRIENDLYNAME  "; 
+					// changed by sankara on 29-06-13 added sql for getting shipment type
+				
+				
+
+					// 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 = ?) 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" +
+							  " IS NOT NULL ORDER BY C.CARRIER_FRIENDLYNAME ";
 					pstmt = conn.prepareStatement(sql);
 					pstmt.setString(1,shipmentId);
 					rs = pstmt.executeQuery();  
 					if( rs.next())
 					{
-						carrierFriendlyName = rs.getString("CARRIER_FRIENDLYNAME");	   				
-						if(!carrMap.containsKey(carrierFriendlyName))
+						carrierFriendlyName = rs.getString("CARRIER_FRIENDLYNAME");	   	
+						shipperName = rs.getString("SHIPMENT_TYPE");
+						
+						if(!carrMap.containsKey(carrierFriendlyName + ":" + shipperName))
 						{
 							shipList = new ArrayList();
 							shipList.add(shipmentId);					
 						}
 						else
 						{
-							shipList = (ArrayList)carrMap.get(carrierFriendlyName);
+							shipList = (ArrayList)carrMap.get(carrierFriendlyName + ":" + shipperName);
 						}
 						
-						carrMap.put(carrierFriendlyName, shipList);
+						carrMap.put(carrierFriendlyName + ":" + shipperName, shipList);
 					
 
 					}
 				}
+			
+				
 			}
+		
+			
 		// 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 = ?) AND SF_IDENTITY IS NULL";
@@ -505,20 +519,26 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
 				
 				Iterator itCarrFnd = keySet.iterator();
 				String carrFndName = "";
+				String closeShipperName = "";
 				ArrayList tempList = null;
 				String shipmentIDs = "";
+				String key = "";
 				int tmpListLen = 0;
 				String  sfIdentity = "";
 				
 				while(itCarrFnd.hasNext())
 				{
-					carrFndName = (String)itCarrFnd.next();
-					tempList = (ArrayList)carrMap.get(carrFndName);
+					key = (String)itCarrFnd.next();
+					tempList = (ArrayList)carrMap.get(key);
 					tmpListLen = tempList.size();
 					
-					System.out.println("Getting Sfidentity For Carriers services with ----["+carrFndName+"]----");
+					carrFndName = key.substring(0, key.indexOf(":"));
+					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+"]");
 				
-					StringDictionaryReturn testStr = soap.closeOutEOD("Taro Commercial", carrFndName,strSmple, true, "Shipments");
+					//StringDictionaryReturn testStr = soap.closeOutEOD("Taro Commercial", carrFndName,strSmple, true, "Shipments");
+					StringDictionaryReturn testStr = soap.closeOutEOD(closeShipperName, carrFndName,strSmple, true, "Shipments");
 					
 					System.out.println("isSuccess["+testStr.isSuccess()+"]");  
 					System.out.println("Any Message["+testStr.getMessage()+"]");