Changed by Rohan on 29-06-13 for sankara added sf_identity in getdata and process

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

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

@@ -247,9 +247,9 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
 			tDate =  oracleFormatDate(toDate);
 			System.out.println("TDATE="+tDate);
 
-			getDataSql = " SELECT D.PTCN, S.SHIPMENT_ID, T.TRAN_NAME FROM SHIP_DOCS D, SHIPMENT S,TRANSPORTER T WHERE  D.SHIPMENT_ID = S.SHIPMENT_ID " +
+			getDataSql = " SELECT 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 T.SHIPMENT_TYPE = ? AND D.PTCN = C.PTCN AND C.SF_IDENTITY IS NULL ";
 
 			System.out.println("**************getDataSql="+getDataSql);
 			pstmt = conn.prepareStatement(getDataSql);
@@ -468,9 +468,10 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
 				shipmentId = (String)it.next();
 				if(shipmentId != null && shipmentId.trim().length() > 0 )
 				{
-					sql = " SELECT CARRIER_FRIENDLYNAME FROM CARTON_MASTER WHERE PTCN IN (SELECT PTCN FROM SHIP_DOCS WHERE SHIPMENT_ID = ?) ORDER BY CARRIER_FRIENDLYNAME  "; 
+				// 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  "; 
 					pstmt = conn.prepareStatement(sql);
-					System.out.println("shipmentSet[i]"+shipmentId);
 					pstmt.setString(1,shipmentId);
 					rs = pstmt.executeQuery();  
 					if( rs.next())
@@ -479,23 +480,22 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
 						if(!carrMap.containsKey(carrierFriendlyName))
 						{
 							shipList = new ArrayList();
-							shipList.add(shipmentId);
-							System.out.println("ALINSIDEIF"+shipList);						
+							shipList.add(shipmentId);					
 						}
 						else
 						{
 							shipList = (ArrayList)carrMap.get(carrierFriendlyName);
 						}
 						
-						System.out.println("ARRAYLIST="+shipList);
 						carrMap.put(carrierFriendlyName, shipList);
 					
 
 					}
 				}
 			}
-			
-			updateSql= " UPDATE CARTON_MASTER SET SF_IDENTITY = ? WHERE PTCN IN (SELECT PTCN FROM SHIP_DOCS WHERE SHIPMENT_ID = ?)";
+		// 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";
 			pstmt = conn.prepareStatement(updateSql);
 			
 			if(carrMap != null && carrMap.size() > 0)