Changed by Manish on 23/03/16 for DDUK .

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

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

@@ -67,12 +67,12 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
 
 	public String getData(Document headerDom, Document detailDom, String windowName, String xtraParams) throws RemoteException,ITMException
 	{
-		String frdate = "";
+		//String frdate = "";
 		String fromDate = "";
-		String tDate = "";
+		java.sql.Timestamp frdate =  null;
+		java.sql.Timestamp tDate =  null;
+		//String tDate = "";
 		String toDate="";
-		String dateFrom = "";
-		String dateTo = "";
 		String transporterFrom = "";
 		String transporterTo = "";
 		String shipmentType = "";
@@ -87,6 +87,9 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
 		ResultSet rs=null;
 		boolean rsflag=false;
 		StringBuffer test=new StringBuffer();
+		// Added by Manish on 22/03/16 for DDUK 
+		String projectName = "";
+		DistCommon distCommon = new DistCommon();
 		ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB();		
 		try
 		{
@@ -119,7 +122,8 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
 			System.out.println("detailDom:"+detailDom);
 			System.out.println("windowName:"+windowName);
 			System.out.println("xtraParams:"+xtraParams);
-
+			// Added by Manish on 22/03/16 for DDUK
+			projectName = distCommon.getDisparams("999999","PROJECT",conn);
 			if ( fromDate == null || fromDate.trim().length() == 0 ) //from_date
 			{
 				System.out.println("*************DEF="+fromDate);
@@ -245,10 +249,17 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
 				return errString; 			
 			}
 
-			frdate =  oracleFormatDate(fromDate);
-			System.out.println("FRDATE="+frdate);
-			tDate =  oracleFormatDate(toDate);
-			System.out.println("TDATE="+tDate);
+			//frdate =  oracleFormatDate(fromDate);
+			fromDate = genericUtility.getValidDateString(fromDate, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat());
+			frdate = java.sql.Timestamp.valueOf(fromDate + " 00:00:00");
+
+			toDate = genericUtility.getValidDateString(toDate, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat());
+			tDate = java.sql.Timestamp.valueOf(toDate + " 00:00:00");
+
+
+			System.out.println("dateFr="+frdate);
+			//tDate =  oracleFormatDate(toDate);
+			System.out.println("dateTo="+tDate);
 
 			// 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 " +
@@ -266,6 +277,60 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
 			// changed by sankara on 01/10/14 for site transporter 		
 			//	getDataSql = " SELECT DISTINCT D.PTCN, S.SHIPMENT_ID, T.TRAN_NAME FROM SHIP_DOCS D, SHIPMENT S, TRANSPORTER T, CARTON_MASTER C " +
 			//getDataSql = " SELECT DISTINCT D.PTCN, S.SHIPMENT_ID, T.TRAN_NAME FROM SHIP_DOCS D, SHIPMENT S, TRANSPORTER T, CARTON_MASTER C, SITE_TRANSPORTER ST " +
+			
+			// Changed by Manish on 22/03/16 for DDUK 
+			if("DDUK".equalsIgnoreCase(projectName)  )
+			{
+				getDataSql = " SELECT DISTINCT D.PTCN, D.DESP_ID, T.TRAN_NAME,D.DESP_DATE,D.CONF_DATE FROM DESPATCH D, TRANSPORTER T, CARTON_MASTER C,WAVE_TASK_DET W  " +
+				" WHERE D.PTCN = W.PTCN AND D.PTCN = C.PTCN AND D.TRAN_CODE = T.TRAN_CODE AND D.CONFIRMED = 'Y' AND W.REF_SER = 'S-DSP ' " +
+				" AND D.CONF_DATE BETWEEN  ? AND  ?  " +
+				" AND D.TRAN_CODE BETWEEN  ? AND  ? AND C.SF_IDENTITY IS NULL AND T.SERVICE_CODE IS NOT NULL " +
+				" AND C.TRACKING_NO IS NOT NULL   AND C.STATUS <> 'R' AND C.CLOSEOUT_DATE IS NULL" ;
+				//" UNION " ;
+				pstmt = conn.prepareStatement(getDataSql);
+				pstmt.setTimestamp(1,frdate);
+				pstmt.setTimestamp(2,tDate);
+				pstmt.setString(3,transporterFrom);
+				pstmt.setString(4,transporterTo);
+				
+				rs = pstmt.executeQuery();
+				rsflag=false;
+				while(rs.next())
+				{
+					rsflag=true;
+					test.append( "<Detail2>\r\n" );  
+					ptcn = checkNull(rs.getString(1));
+					test.append( "<ptcn><![CDATA[" ).append(ptcn).append( "]]></ptcn>\r\n" );
+					test.append( "<shipment_id><![CDATA[" ).append(checkNull(rs.getString("DESP_ID"))).append( "]]></shipment_id>\r\n" );
+					//Changed by wasim on 16/12/14 start append columns conf_date and ship_date.start
+					//test.append( "<ship_date><![CDATA[" ).append(rs.getDate("SHIPMENT_DATE")).append("]]></ship_date>\r\n");
+					test.append( "<ship_date><![CDATA[" ).append(genericUtility.getValidDateString(String.valueOf(rs.getDate("DESP_DATE")),genericUtility.getDBDateFormat(), genericUtility.getApplDateFormat())).append("]]></ship_date>\r\n");
+					//test.append( "<conf_date><![CDATA[" ).append(rs.getDate("CONF_DATE")).append("]]></conf_date>\r\n");
+					test.append( "<conf_date><![CDATA[" ).append(genericUtility.getValidDateString(String.valueOf(rs.getDate("CONF_DATE")),genericUtility.getDBDateFormat(), genericUtility.getApplDateFormat())).append("]]></conf_date>\r\n");
+					//Changed by wasim on 16/12/14 start append columns conf_date and ship_date.end
+					test.append( "<tran_name><![CDATA[" ).append(checkNull(rs.getString("TRAN_NAME"))).append( "]]></tran_name>\r\n" );
+					test.append("\n");
+					test.append( "</Detail2>\r\n" );
+				}
+				test.append( "</Header0>\r\n</group0>\r\n</DocumentRoot>\r\n" );
+				resultString=test.toString();
+
+				if(rsflag == false)
+				{
+					errCode = "INVLDATA";
+					errString = itmDBAccessEJB.getErrorString("","INVLDATA",userId);
+					return errString;
+				}
+
+				rs.close();
+				rs = null;
+				pstmt.close();
+				pstmt = null;
+			}
+			// Changed by Manish on 22/03/16 for DDUK 
+			
+			else
+			{
 				getDataSql = " SELECT DISTINCT D.PTCN, S.SHIPMENT_ID, T.TRAN_NAME, S.SHIPMENT_DATE, S.CONF_DATE FROM SHIP_DOCS D, SHIPMENT S, TRANSPORTER T, CARTON_MASTER C, SITE_TRANSPORTER ST " +
 				" WHERE D.SHIPMENT_ID = S.SHIPMENT_ID " +
 				" AND S.TRAN_CODE = T.TRAN_CODE " +
@@ -353,18 +418,18 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
 
 				System.out.println("**************getDataSql="+getDataSql);
 				pstmt = conn.prepareStatement(getDataSql);
-				pstmt.setString(1,frdate);
-				pstmt.setString(2,tDate);
+				pstmt.setTimestamp(1,frdate);
+				pstmt.setTimestamp(2,tDate);
 				pstmt.setString(3,transporterFrom);
 				pstmt.setString(4,transporterTo);
 				pstmt.setString(5,shipmentType);
-				pstmt.setString(6,frdate);
-				pstmt.setString(7,tDate);
+				pstmt.setTimestamp(6,frdate);
+				pstmt.setTimestamp(7,tDate);
 				pstmt.setString(8,transporterFrom);
 				pstmt.setString(9,transporterTo);
 				pstmt.setString(10,shipmentType);
-				pstmt.setString(11,frdate);
-				pstmt.setString(12,tDate);
+				pstmt.setTimestamp(11,frdate);
+				pstmt.setTimestamp(12,tDate);
 				pstmt.setString(13,transporterFrom);
 				pstmt.setString(14,transporterTo);
 				pstmt.setString(15,shipmentType);
@@ -403,7 +468,7 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
 				pstmt.close();
 				pstmt = null;
 			}	
-
+		}
 		catch(Exception e)
 		{
 			System.out.println("Exception occured while getData()");
@@ -508,6 +573,9 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
 		StringBuffer trackingNum = new StringBuffer();  
 		//changed by sankara on 22/09/14 for site transporter
 		boolean istransporterexist = false;
+		// Added by Manish on 22/03/16 for DDUK 
+		String projectName = "";
+		DistCommon distCommon = new DistCommon();
 		try 
 		{
 			String userId = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginCode" );
@@ -590,6 +658,15 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
 			locator = new ADSIShippingLocator();
 			System.out.println(" Connecting ADSI server ................");		
 
+			// Added by Manish on 22/03/16 for DDUK
+			projectName = distCommon.getDisparams("999999","PROJECT",conn);
+			/*if("DDUK".equalsIgnoreCase(projectName)  )
+			{
+				System.out.println("Shipment Ids  ................["+shipmentSet.toString()+"]");
+				soap = locator.getADSIShippingSoap(new URL(adsiShippingURL));
+			}
+			else
+			{*/
 				if(shipmentSet != null && shipmentSet.size() >0)
 				{
 					System.out.println("Shipment Ids  ................["+shipmentSet.toString()+"]");		
@@ -619,8 +696,20 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
 					//changed by sankara on 22/09/14 for site transporter start.
 					String siteCodeShip = "";
 					istransporterexist = false;
+
+					// Changed by Manish on 22/03/16 for DDUK 
+					if("DDUK".equalsIgnoreCase(projectName)  )
+					{
+						sql = "  SELECT DISTINCT S.SITE_CODE__SHIP FROM SORDER S, DESPATCH D,  WAVE_TASK W, WAVE_TASK_DET WT" +
+						" WHERE D.PTCN = WT.PTCN AND S.SALE_ORDER = WT.SALE_ORDER AND D.DESP_ID = ? " ;
+
+					}
+					// Changed by Manish on 22/03/16 for DDUK 
+					else
+					{
 						sql = " SELECT DISTINCT S.SITE_CODE__SHIP FROM SORDER S, SHIPMENT D, SHIP_DOCS SD, WAVE_TASK W, WAVE_TASK_DET WT " +
 						" WHERE D.SHIPMENT_ID = SD.SHIPMENT_ID AND SD.PTCN  = WT.PTCN AND S.SALE_ORDER = WT.SALE_ORDER AND D.SHIPMENT_ID = ? ";
+					}
 					pstmt = conn.prepareStatement( sql );
 					pstmt.setString( 1, shipmentId );
 					rs = pstmt.executeQuery();
@@ -633,8 +722,17 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
 					pstmt.close();pstmt = null;		
 
 					if(siteCodeShip == null || siteCodeShip.trim().length() == 0 )
+					{
+						// Changed by Manish on 22/03/16 for DDUK 
+						if("DDUK".equalsIgnoreCase(projectName)  )
+						{
+							sql = " SELECT SITE_CODE FROM DESPATCH WHERE DESP_ID = ? " ;
+						}
+						// Changed by Manish on 22/03/16 for DDUK 
+						else
 						{
 							sql = " SELECT SITE_CODE FROM SHIPMENT WHERE SHIPMENT_ID = ? " ;
+						}
 						pstmt = conn.prepareStatement( sql );
 						pstmt.setString( 1, shipmentId );
 						rs = pstmt.executeQuery();
@@ -669,7 +767,23 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
 							" 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 PH.OUTER_CARTON_NO = C.MASTER_CARTON AND PH.CONFIRMED = 'Y' AND C.CARRIER_FRIENDLYNAME IS NOT NULL " +
 							" AND C.STATUS <> 'R' "; */
 			
-					
+					// Changed by Manish on 22/03/16 for DDUK 
+					if("DDUK".equalsIgnoreCase(projectName)  )
+					{
+						sql = "  SELECT DISTINCT C.CARRIER_FRIENDLYNAME, T.SHIPMENT_TYPE, C.TRACKING_NO FROM CARTON_MASTER C, DESPATCH D, TRANSPORTER T  WHERE D.DESP_ID = ? " +
+						"AND D.SITE_CODE = ?  AND D.TRAN_CODE = T.TRAN_CODE AND D.PTCN = C.PTCN AND C.CARRIER_FRIENDLYNAME IS NOT NULL " +
+						" UNION " +
+						" SELECT DISTINCT C.CARRIER_FRIENDLYNAME, T.SHIPMENT_TYPE, C.TRACKING_NO FROM CARTON_MASTER C, DESPATCH D, TRANSPORTER T, WAVE_TASK_DET WT " +
+						"WHERE D.PTCN = C.PTCN   AND D.PTCN = WT.PTCN AND D.DESP_ID = ? AND D.SITE_CODE = ? AND WT.REF_SER = 'S-DSP' AND D.TRAN_CODE = T.TRAN_CODE " +
+						"AND C.CARTON_TYPE = 'M' AND C.CARRIER_FRIENDLYNAME IS NOT NULL  AND C.STATUS <> 'R' " +
+						"UNION " +
+						" SELECT DISTINCT C.CARRIER_FRIENDLYNAME, T.SHIPMENT_TYPE, C.TRACKING_NO FROM CARTON_MASTER C, DESPATCH D, TRANSPORTER T ,WAVE_TASK_DET WT " +
+						"WHERE D.PTCN = C.PTCN  AND D.PTCN = WT.PTCN AND D.DESP_ID = ? AND D.SITE_CODE = ?  AND WT.REF_SER = 'S-DSP' AND D.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 Manish on 22/03/16 for DDUK 
+					else
+					{
 						sql =   " SELECT DISTINCT C.CARRIER_FRIENDLYNAME, ST.SHIPMENT_TYPE, C.TRACKING_NO FROM CARTON_MASTER C, SHIPMENT_CONTENT N, SHIPMENT P, SITE_TRANSPORTER ST " +
 						" WHERE P.SHIPMENT_ID = ? AND ST.SITE_CODE = ? AND P.SHIPMENT_ID = N.SHIPMENT_ID AND P.TRAN_CODE = ST.TRAN_CODE AND N.CARTON_NO = C.CARTON_NO AND C.CARRIER_FRIENDLYNAME IS NOT NULL " +
 						" UNION " +
@@ -681,8 +795,8 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
 						//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 ST.SITE_CODE = ? AND S.SHIPMENT_ID = P.SHIPMENT_ID AND S.REF_SER = 'S-DSP' AND P.TRAN_CODE = ST.TRAN_CODE AND  C.CARTON_TYPE IN ('P','A') AND C.CARRIER_FRIENDLYNAME IS NOT NULL " +
-							" AND C.STATUS <> 'R' "
-							;
+						" AND C.STATUS <> 'R' " ;
+					}
 					//changed by sankara on 07/03/14 for parcel pick update end.	
 					//changed by sankara on 04-02-14 for close out changes based on tracking numbers end.	
 					pstmt = conn.prepareStatement(sql);
@@ -721,9 +835,28 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
 						//System.out.println("tracknumList::::::"+tracknumList);
 						trackingNum.append(trackingNumber+",");
 					}
+					rs.close();rs = null;
+					pstmt.close();pstmt = null;	
 					//changed by sankara on 22/09/14 for site transporter end.
 					//changed by sankara added if condition on 22/09/14 for site transporter
 					if(!istransporterexist)
+					{
+						// Changed by Manish on 22/03/16 for DDUK 
+						if("DDUK".equalsIgnoreCase(projectName)  )
+						{
+							sql = " SELECT DISTINCT C.CARRIER_FRIENDLYNAME, T.SHIPMENT_TYPE, C.TRACKING_NO FROM CARTON_MASTER C, DESPATCH D, TRANSPORTER T WHERE D.DESP_ID = ? " +
+							" AND D.PTCN = C.PTCN AND D.TRAN_CODE = T.TRAN_CODE  AND C.CARRIER_FRIENDLYNAME IS NOT NULL   " +
+							" UNION " +
+							" SELECT DISTINCT C.CARRIER_FRIENDLYNAME, T.SHIPMENT_TYPE, C.TRACKING_NO FROM CARTON_MASTER C,  DESPATCH D, TRANSPORTER T, WAVE_TASK_DET WT" +
+							" WHERE D.PTCN = C.PTCN AND D.PTCN = WT.PTCN AND D.DESP_ID = ? AND WT.REF_SER = 'S-DSP' AND D.TRAN_CODE = T.TRAN_CODE AND C.CARTON_TYPE = 'M' " +
+							"AND C.CARRIER_FRIENDLYNAME IS NOT NULL AND C.STATUS <> 'R' " +
+							"UNION " +
+							" SELECT DISTINCT C.CARRIER_FRIENDLYNAME, T.SHIPMENT_TYPE, C.TRACKING_NO " +
+							" FROM CARTON_MASTER C, DESPATCH D, TRANSPORTER T, WAVE_TASK_DET WT WHERE D.PTCN = C.PTCN  AND D.PTCN = WT.PTCN AND D.DESP_ID = ? " +
+							" AND WT.REF_SER = 'S-DSP' AND D.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 Manish on 22/03/16 for DDUK 
+						else
 						{
 							sql =   " SELECT DISTINCT C.CARRIER_FRIENDLYNAME, T.SHIPMENT_TYPE, C.TRACKING_NO FROM CARTON_MASTER C, SHIPMENT_CONTENT N, SHIPMENT P, TRANSPORTER T " +
 							" WHERE P.SHIPMENT_ID = ? AND P.SHIPMENT_ID = N.SHIPMENT_ID AND P.TRAN_CODE = T.TRAN_CODE AND N.CARTON_NO = C.CARTON_NO AND C.CARRIER_FRIENDLYNAME IS NOT NULL " +
@@ -736,8 +869,8 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
 							//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' "
-								;
+							" AND C.STATUS <> 'R' ";
+						}
 						//changed by sankara on 07/03/14 for parcel pick update end.	
 						//changed by sankara on 04-02-14 for close out changes based on tracking numbers end.	
 						pstmt = conn.prepareStatement(sql);
@@ -771,6 +904,8 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
 							//System.out.println("tracknumList::::::"+tracknumList);
 							trackingNum.append(trackingNumber+",");
 						}
+						rs.close();rs = null;
+						pstmt.close();pstmt = null;	
 					}
 					//changed by sankara on 04-02-14 for close out changes based on tracking numbers start
 					System.out.println("trackingNum:::::"+trackingNum);
@@ -946,7 +1081,17 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
 					System.out.println("Carrier Name ----["+carrFndName+"]----sfIdentity["+sfIdentity+"]");
 					System.out.println("tmpListLen:::::"+tmpListLen);
 					//changed by sankara on 07/02/14 for getting refser
+					
+					// Changed by Manish on 22/03/16 for DDUK 
+					if("DDUK".equalsIgnoreCase(projectName)  )
+					{
+						sql = " SELECT D.PTCN, WT.REF_SER FROM DESPATCH D, WAVE_TASK_DET WT WHERE D.PTCN = WT.PTCN AND D.DESP_ID = ? ";
+					}
+					// Changed by Manish on 22/03/16 for DDUK 
+					else
+					{
 						sql = " SELECT PTCN, REF_SER FROM SHIP_DOCS D, SHIPMENT S WHERE S.SHIPMENT_ID = D.SHIPMENT_ID AND D.SHIPMENT_ID = ? " ;	
+					}
 					pstmt1 = conn.prepareStatement(sql);
 					for(int tmpCtr = 0;tmpCtr < tmpListLen; tmpCtr++)
 					{
@@ -972,7 +1117,8 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
 						System.out.println("Current Shipment ID :::"+shipmentIDs);
 						pstmt1.setString(1,shipmentIDs);
 						rs1 = pstmt1.executeQuery();  
-						if( rs1.next())
+						//	if( rs1.next())
+						while( rs1.next())
 						{
 							ptcns = checkNull(rs1.getString("PTCN"));
 							refser = checkNull(rs1.getString("REF_SER"));
@@ -993,16 +1139,37 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
 							//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 30/08/14 update close out date
 							//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 " ;		
+							
+							// Changed by Manish on 22/03/16 for DDUK 
+							if("DDUK".equalsIgnoreCase(projectName)  )
+							{
+								updateSql = " UPDATE CARTON_MASTER SET SF_IDENTITY = ?, CLOSEOUT_DATE = ? WHERE PTCN IN (SELECT PTCN FROM DESPATCH WHERE DESP_ID = ? ) AND STATUS = 'U' AND CARTON_TYPE IN ('M','P','A') AND SF_IDENTITY IS NULL " ;
+							}
+							// Changed by Manish on 22/03/16 for DDUK 
+							else
+							{
 								updateSql = " UPDATE CARTON_MASTER SET SF_IDENTITY = ?, CLOSEOUT_DATE = ? 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") )
 						{
 							//changed by sankara on 30/08/14 update close out date
 							//updateSql = " UPDATE CARTON_MASTER SET SF_IDENTITY = ? WHERE CARTON_NO IN ( SELECT CARTON_NO FROM SHIPMENT_CONTENT C, SHIP_DOCS D, SHIPMENT S " +
+							
+							// Changed by Manish on 22/03/16 for DDUK 
+							if("DDUK".equalsIgnoreCase(projectName)  )
+							{
+								updateSql = " UPDATE CARTON_MASTER SET SF_IDENTITY = ?, CLOSEOUT_DATE = ? WHERE CARTON_NO IN ( SELECT W.CARTON_NO FROM DESPATCH D,WAVE_STATUS_ORG_DET W " +
+								"WHERE D.PTCN = W.PTCN   AND D.DESP_ID = ? ) AND STATUS = 'U' AND SF_IDENTITY IS NULL " ;
+							}
+							// Changed by Manish on 22/03/16 for DDUK 
+							else
+							{
 								updateSql = " UPDATE CARTON_MASTER SET SF_IDENTITY = ?, CLOSEOUT_DATE = ? WHERE CARTON_NO IN ( SELECT CARTON_NO FROM SHIPMENT_CONTENT C, SHIP_DOCS D, SHIPMENT S " +
 								" WHERE S.SHIPMENT_ID = D.SHIPMENT_ID OR D.SHIPMENT_ID IS NULL AND S.SHIPMENT_ID = C.SHIPMENT_ID " +
 								" AND S.SHIPMENT_ID = ? ) AND STATUS = 'U' AND SF_IDENTITY IS NULL " ;
 							}
+						}
 						pstmt = conn.prepareStatement(updateSql);
 						pstmt.setString(1,sfIdentity);
 						//changed by sankara on 30/08/14 update close out date