changed by sankara on 30/09/14 for site transporter

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

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

@@ -120,7 +120,8 @@ public class CheckSheetIC extends ValidatorEJB implements CheckSheetICLocal,Chec
 		String errorType = "", errCode = "";
 		ArrayList<String> errList = new ArrayList<String>();
 		ArrayList<String> errFields = new ArrayList<String>();
-
+		//changed by sankara on 22/09/14 for site transporter
+		String siteCodeShip = "";
 
 		try
 		{	
@@ -170,7 +171,9 @@ public class CheckSheetIC extends ValidatorEJB implements CheckSheetICLocal,Chec
 						{
 							//Changed by sumit on 04/10/12 changing sql for getting confirmed value
 							//sql = "SELECT COUNT(*) AS COUNT FROM SHIPMENT  WHERE SHIPMENT_ID = ?";
-							sql = "SELECT S.CONFIRMED,T.TRAN_CODE,T.SERVICE_CODE FROM SHIPMENT S, SHIP_DOCS SD,TRANSPORTER T  WHERE S.SHIPMENT_ID = ? " +
+							
+							//changed by sankara on 22/09/14 for site transporter start.	
+							/*	sql = "SELECT S.CONFIRMED,T.TRAN_CODE,T.SERVICE_CODE FROM SHIPMENT S, SHIP_DOCS SD,TRANSPORTER T  WHERE S.SHIPMENT_ID = ? " +
 									" AND S.SHIPMENT_ID = SD.SHIPMENT_ID AND T.TRAN_CODE  = S.TRAN_CODE "+
 									" AND SD.REF_SER = ?";
 							pstmt = conn.prepareStatement( sql );
@@ -178,6 +181,69 @@ public class CheckSheetIC extends ValidatorEJB implements CheckSheetICLocal,Chec
 							pstmt.setString( 2, "S-DSP" );
 							rs = pstmt.executeQuery();
 
+							if( rs.next() )
+							{
+								//changed by sumit on 04/10/12 for validation of confirmed shipment id start.
+								//count = rs.getInt("COUNT");
+								confirmed = rs.getString("CONFIRMED");
+								tranCode =  rs.getString("TRAN_CODE");
+								serviceCode =  rs.getString("SERVICE_CODE");
+
+								if( "Y".contentEquals(confirmed))
+								{
+									errList.add( "VMSHIPACON" );
+									errFields.add( childNodeName.toLowerCase() );
+								}
+							}
+							else
+							{
+								errList.add( "INVSHIPID" );
+								errFields.add( childNodeName.toLowerCase() );
+							}*/
+							//changed by sumit on 04/10/12 for validation of confirmed shipment id end.
+
+							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();
+							if( rs.next() )
+							{
+								siteCodeShip = checkNull(rs.getString("SITE_CODE__SHIP"));
+							}
+							rs.close();rs = null;
+							pstmt.close();pstmt = null;		
+
+							sql =   " SELECT S.CONFIRMED, ST.TRAN_CODE, ST.SERVICE_CODE FROM SHIPMENT S, SHIP_DOCS SD, SITE_TRANSPORTER ST WHERE S.SHIPMENT_ID = ? " +
+									" AND S.SHIPMENT_ID = SD.SHIPMENT_ID AND ST.TRAN_CODE = S.TRAN_CODE AND SD.REF_SER = ? " +
+									" AND ST.SITE_CODE = ? ";
+							pstmt = conn.prepareStatement( sql );
+							pstmt.setString( 1, shipmentId );
+							pstmt.setString( 2, "S-DSP" );
+							pstmt.setString( 3, siteCodeShip );
+							rs = pstmt.executeQuery();
+							if( rs.next() )
+							{
+								//changed by sumit on 04/10/12 for validation of confirmed shipment id start.
+								//count = rs.getInt("COUNT");
+								confirmed = rs.getString("CONFIRMED");
+								tranCode =  rs.getString("TRAN_CODE");
+								serviceCode =  rs.getString("SERVICE_CODE");
+								if( "Y".contentEquals(confirmed))
+								{
+									errList.add( "VMSHIPACON" );
+									errFields.add( childNodeName.toLowerCase() );
+								}
+							}
+							else
+							{
+								sql = " SELECT S.CONFIRMED,T.TRAN_CODE,T.SERVICE_CODE FROM SHIPMENT S, SHIP_DOCS SD,TRANSPORTER T  WHERE S.SHIPMENT_ID = ? " +
+										" AND S.SHIPMENT_ID = SD.SHIPMENT_ID AND T.TRAN_CODE  = S.TRAN_CODE "+
+										" AND SD.REF_SER = ?";
+								pstmt = conn.prepareStatement( sql );
+								pstmt.setString( 1, shipmentId );
+								pstmt.setString( 2, "S-DSP" );
+								rs = pstmt.executeQuery();
 								if( rs.next() )
 								{
 									//changed by sumit on 04/10/12 for validation of confirmed shipment id start.
@@ -198,6 +264,8 @@ public class CheckSheetIC extends ValidatorEJB implements CheckSheetICLocal,Chec
 									errFields.add( childNodeName.toLowerCase() );
 								}
 								//changed by sumit on 04/10/12 for validation of confirmed shipment id end.
+							}
+							//changed by sankara on 22/09/14 for site transporter end.		
 							rs.close();
 							rs = null;
 							pstmt.close();

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

@@ -1173,7 +1173,8 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo
 		
 		PreparedStatement pstmt = null;
 		ResultSet rs = null;
-		
+		//changed by sankara on 22/09/14 for site transporter start.
+		String siteCodeShip= "";
 		try
 		{
 			sql = "SELECT TRAN_CODE FROM WAVE_STATUS_ORG WHERE PTCN = ?";
@@ -1187,8 +1188,8 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo
 			rs.close(); rs = null;
 			pstmt.close(); pstmt = null;
 			
-			
-			sql = "SELECT S.TRAN_CODE,T.SERVICE_CODE FROM SHIPMENT S , SHIP_DOCS SD, TRANSPORTER T WHERE SD.PTCN = ? " +
+			//changed by sankara on 22/09/14 for site transporter start.	
+			/*	sql = "SELECT S.TRAN_CODE,T.SERVICE_CODE FROM SHIPMENT S , SHIP_DOCS SD, TRANSPORTER T WHERE SD.PTCN = ? " +
 					" AND S.SHIPMENT_ID = SD.SHIPMENT_ID AND S.TRAN_CODE = T.TRAN_CODE ";
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1, ptcn);
@@ -1217,6 +1218,83 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo
 				{
 					return "NO";
 				}
+			}*/
+
+			sql = " SELECT DISTINCT S.SITE_CODE__SHIP FROM SORDER S, WAVE_TASK W, WAVE_TASK_DET WT " +
+					" WHERE W.WAVE_ID = WT.WAVE_ID AND S.SALE_ORDER = WT.SALE_ORDER AND WT.PTCN = ? ";
+			pstmt = conn.prepareStatement( sql );
+			pstmt.setString( 1, ptcn );
+			rs = pstmt.executeQuery();
+			if( rs.next() )
+			{
+				siteCodeShip = checkNull(rs.getString("SITE_CODE__SHIP"));
+			}
+			rs.close();rs = null;
+			pstmt.close();pstmt = null;		
+
+			sql = "SELECT ST.TRAN_CODE, ST.SERVICE_CODE FROM SHIPMENT S, SHIP_DOCS SD, SITE_TRANSPORTER ST WHERE SD.PTCN = ? " +
+					" AND S.SHIPMENT_ID = SD.SHIPMENT_ID AND S.TRAN_CODE = ST.TRAN_CODE AND ST.SITE_CODE = ? ";
+			pstmt = conn.prepareStatement(sql);
+			pstmt.setString(1, ptcn);
+			pstmt.setString(2, siteCodeShip);
+			rs = pstmt.executeQuery();
+			if(rs.next())
+			{
+				shipTranCode = rs.getString("TRAN_CODE");
+				serviceCode = rs.getString("SERVICE_CODE");
+			}
+			else
+			{
+				sql =  " SELECT S.TRAN_CODE,T.SERVICE_CODE FROM SHIPMENT S , SHIP_DOCS SD, TRANSPORTER T WHERE SD.PTCN = ? " +
+						" AND S.SHIPMENT_ID = SD.SHIPMENT_ID AND S.TRAN_CODE = T.TRAN_CODE AND T.SITE_CODE = ? ";
+				pstmt = conn.prepareStatement(sql);
+				pstmt.setString(1, ptcn);
+				rs = pstmt.executeQuery();
+				if(rs.next())
+				{
+					shipTranCode = rs.getString("TRAN_CODE");
+					serviceCode = rs.getString("SERVICE_CODE");
+				}
+				else
+				{
+					rs.close(); rs = null;
+					pstmt.close(); pstmt = null;
+
+					sql = "SELECT ST.TRAN_CODE,ST.SERVICE_CODE FROM DESPATCH D,WAVE_TASK_DET W, SITE_TRANSPORTER ST "
+							+" WHERE D.DESP_ID = W.REF_ID AND W.REF_SER='S-DSP'" 
+							+" AND ST.TRAN_CODE = D.TRAN_CODE AND W.PTCN = ? AND ST.SITE_CODE = ? ";
+
+					pstmt = conn.prepareStatement(sql);
+					pstmt.setString(1, ptcn);
+					pstmt.setString(2, siteCodeShip);
+					rs = pstmt.executeQuery();
+					if(rs.next())
+					{
+						shipTranCode = rs.getString("TRAN_CODE");
+						serviceCode = rs.getString("SERVICE_CODE");
+					}
+					else
+					{
+						//return "NO";
+						rs.close(); rs = null;
+						pstmt.close(); pstmt = null;
+
+						sql = "SELECT T.TRAN_CODE,T.SERVICE_CODE FROM DESPATCH D,WAVE_TASK_DET W,TRANSPORTER T "
+								+" WHERE D.DESP_ID = W.REF_ID AND W.REF_SER='S-DSP'" 
+								+" AND T.TRAN_CODE = D.TRAN_CODE AND W.PTCN = ?";
+
+						pstmt = conn.prepareStatement(sql);
+						pstmt.setString(1, ptcn);
+						rs = pstmt.executeQuery();
+						if(rs.next())
+						{
+							shipTranCode = rs.getString("TRAN_CODE");
+							serviceCode = rs.getString("SERVICE_CODE");
+						}
+						rs.close(); rs = null;
+						pstmt.close(); pstmt = null;					
+					}
+				}
 			}
 			rs.close(); rs = null;
 			pstmt.close(); pstmt = null;

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

@@ -747,7 +747,8 @@ public class PalletNoIC extends ValidatorEJB implements PalletNoICLocal, PalletN
 		String pickType = "";
 		String tranCode = "";
 		StringBuffer valueXmlString;
-
+		//changed by sankara on 22/09/14 for site transporter
+        String siteCodeShip = "";
 		System.out.println("xtraParams=["+xtraParams+"]");
 		DistCommon distCommon = new DistCommon();
 
@@ -836,6 +837,55 @@ public class PalletNoIC extends ValidatorEJB implements PalletNoICLocal, PalletN
 					pstmt = null;
 					
 					if("M".equalsIgnoreCase(pickType))
+					{
+						//changed by sankara on 22/09/14 for site transporter start.	
+						/*	sql = "SELECT T.LOC_CODE__DOCK FROM WAVE_TASK_DET W,DESPATCH D,TRANSPORTER T WHERE" 
+								+" W.PTCN = (SELECT PTCN FROM WAVE_TASK_DET WHERE REF_ID =?)" 
+								+" AND W.REF_SER='S-DSP'"
+								+" AND D.DESP_ID = W.REF_ID"
+								+" AND T.TRAN_CODE = D.TRAN_CODE";
+						pstmt = conn.prepareStatement( sql );
+						pstmt.setString( 1, pickOrder );
+						rs = pstmt.executeQuery();
+						if ( rs.next() )
+						{
+							docLocCode = rs.getString(1);
+						}
+						rs.close();
+						rs = null;
+						pstmt.close();
+						pstmt = null;*/
+						
+						sql = " SELECT S.SITE_CODE__SHIP FROM SORDER S, PICK_ORD_HDR P WHERE P.SALE_ORDER = S.SALE_ORDER " +
+								" AND P.PICK_ORDER = ? ";
+						pstmt = conn.prepareStatement( sql );
+						pstmt.setString( 1, pickOrder );
+						rs = pstmt.executeQuery();
+						if ( rs.next() )
+						{
+							siteCodeShip = rs.getString(1);
+							System.out.println("siteCodeShip::::::"+siteCodeShip);
+						}
+						rs.close();rs = null;
+						pstmt.close();pstmt = null;
+
+						sql =    " SELECT ST.LOC_CODE__DOCK FROM WAVE_TASK_DET W,DESPATCH D, SITE_TRANSPORTER ST WHERE " 
+								+" W.PTCN = (SELECT PTCN FROM WAVE_TASK_DET WHERE REF_ID = ?) " 
+								+" AND W.REF_SER='S-DSP'"
+								+" AND D.DESP_ID = W.REF_ID"
+								+" AND ST.TRAN_CODE = D.TRAN_CODE" 
+								+" AND ST.TRAN_CODE = D.TRAN_CODE" 
+								+" AND ST.SITE_CODE = ? ";				   	        
+						pstmt = conn.prepareStatement( sql );
+						pstmt.setString( 1, pickOrder );
+						pstmt.setString( 2, siteCodeShip );
+						rs = pstmt.executeQuery();
+						if ( rs.next() )
+						{
+							docLocCode = rs.getString(1);
+							System.out.println("docLocCode::::::"+docLocCode);
+						}
+						else
 						{
 							sql = "SELECT T.LOC_CODE__DOCK FROM WAVE_TASK_DET W,DESPATCH D,TRANSPORTER T WHERE" 
 									+" W.PTCN = (SELECT PTCN FROM WAVE_TASK_DET WHERE REF_ID =?)" 
@@ -849,6 +899,7 @@ public class PalletNoIC extends ValidatorEJB implements PalletNoICLocal, PalletN
 							{
 								docLocCode = rs.getString(1);
 							}
+						}
 						rs.close();
 						rs = null;
 						pstmt.close();

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

@@ -2716,7 +2716,8 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC
 		String userId = "";
 		String actCartonNo = "";
 		String actPackCode = "";
-		
+		//changed by sankara on 22/09/14 for site transporter
+		String siteCodeShip = "";
 		int currentFormNo = 0;
 		int lineNoOrd = 0;
 		int lineNoIss = 0;
@@ -3497,7 +3498,8 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC
 						locCodeTo = checkNull(genericUtility.getColumnValue("loc_code__to", allFormDataDom, "3" ));
 						pickOrder =  checkNull(genericUtility.getColumnValue("pick_order", allFormDataDom, "3" ));
 						
-						sql="select t.loc_code__dock from transporter t, despatch d "
+						//changed by sankara on 22/09/14 for site transporter start.
+						/*sql="select t.loc_code__dock from transporter t, despatch d "
 								+ " where t.tran_code = d.tran_code "
 								+ " and d.desp_id in ( "
 								+ " select wt.ref_id from wave_task_det wt where wt.ref_ser = 'S-DSP' and wt.ptcn in (select i.ptcn from wave_task_det i "
@@ -3512,7 +3514,53 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC
 						rs.close();
 						rs = null;
 						pstmt.close();
-						pstmt = null;
+						pstmt = null;*/
+
+						sql = " select s.site_code__ship from sorder s, pick_ord_hdr p where p.sale_order = s.sale_order " +
+								" and p.pick_order = ? ";
+						pstmt = conn.prepareStatement( sql );
+						pstmt.setString( 1, pickOrder );
+						rs = pstmt.executeQuery();
+						if ( rs.next() )
+						{
+							siteCodeShip = checkNull(rs.getString(1));
+							System.out.println("siteCodeShip::::::"+siteCodeShip);
+						}
+						rs.close();rs = null;
+						pstmt.close();pstmt = null;
+
+						sql="select st.loc_code__dock from despatch d, site_transporter st "
+								+ " where st.tran_code = d.tran_code "
+								+ " and st.site_code = ? "
+								+ " and d.desp_id in ( "
+								+ " select wt.ref_id from wave_task_det wt where wt.ref_ser = 'S-DSP' and wt.ptcn in (select i.ptcn from wave_task_det i "
+								+ " where i.ref_id = ? ) )  ";
+						pstmt = conn.prepareStatement( sql );
+						pstmt.setString( 1, siteCodeShip );
+						pstmt.setString( 2, pickOrder );
+						rs = pstmt.executeQuery();
+						if ( rs.next() )
+						{
+							docLocCode = rs.getString(1);
+							System.out.println("docLocCode::::::::"+docLocCode);
+						}
+						else
+						{
+							sql="select t.loc_code__dock from transporter t, despatch d "
+									+ " where t.tran_code = d.tran_code "
+									+ " and d.desp_id in ( "
+									+ " select wt.ref_id from wave_task_det wt where wt.ref_ser = 'S-DSP' and wt.ptcn in (select i.ptcn from wave_task_det i "
+									+ " where i.ref_id = ? ) )  ";
+							pstmt = conn.prepareStatement( sql );
+							pstmt.setString( 1, pickOrder );
+							rs = pstmt.executeQuery();
+							if ( rs.next() )
+							{
+								docLocCode = rs.getString(1);
+							}
+						}
+						//changed by sankara on 22/09/14 for site transporter end.
+						
 						System.out.println(" locCodeTo [" + locCodeTo + "] docLocCode [" + docLocCode + "]");
 
 						valueXmlString.append( "<Detail4 domID='"+ domID +"' objContext = '"+currentFormNo+"' objName='"+objName+"' selected=\"Y\">\r\n" );

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

@@ -1403,8 +1403,8 @@ public class PickOrderIC extends ValidatorEJB implements PickOrderICLocal,PickOr
 		try
 		{
 									
-
-			sql = "SELECT T.LOC_CODE__DOCK FROM WAVE_TASK_DET W,DESPATCH D,TRANSPORTER T WHERE" 
+			//changed by sankara on 22/09/14 for site transporter start.
+			/*sql = "SELECT T.LOC_CODE__DOCK FROM WAVE_TASK_DET W,DESPATCH D,TRANSPORTER T WHERE" 
 				+" W.PTCN = (SELECT PTCN FROM WAVE_TASK_DET WHERE REF_ID =?)" 
 				+" AND W.REF_SER='S-DSP'"
 				+" AND D.DESP_ID = W.REF_ID"
@@ -1417,9 +1417,52 @@ public class PickOrderIC extends ValidatorEJB implements PickOrderICLocal,PickOr
 			if(rs.next())
 			{
 				docLoc = rs.getString(1);			
+			}*/
 
+			sql = " SELECT S.SITE_CODE__SHIP FROM SORDER S, PICK_ORD_HDR P WHERE P.SALE_ORDER = S.SALE_ORDER " +
+					" AND P.PICK_ORDER = ? ";
+			pstmt = conn.prepareStatement( sql );
+			pstmt.setString( 1, pickOrder );
+			rs = pstmt.executeQuery();
+			if ( rs.next() )
+			{
+				siteCodeShip = checkNull(rs.getString(1));
+				System.out.println("siteCodeShip::::::"+siteCodeShip);
 			}
+			rs.close();rs = null;
+			pstmt.close();pstmt = null;
+
+			sql = "SELECT ST.LOC_CODE__DOCK FROM WAVE_TASK_DET W,DESPATCH D,SITE_TRANSPORTER ST WHERE" 
+					+" W.PTCN = (SELECT PTCN FROM WAVE_TASK_DET WHERE REF_ID = ?)" 
+					+" AND W.REF_SER='S-DSP'"
+					+" AND D.DESP_ID = W.REF_ID"
+					+" AND ST.TRAN_CODE = D.TRAN_CODE"
+					+" AND ST.SITE_CODE = ? ";
 
+			pstmt = conn.prepareStatement(sql);
+			pstmt.setString(1,pickOrder);
+			pstmt.setString(2,siteCodeShip);
+			rs = pstmt.executeQuery();
+			if(rs.next())
+			{
+				docLoc = rs.getString(1);		
+				System.out.println("docLoc:::::::"+docLoc);
+			}
+			else
+			{
+				sql = "SELECT T.LOC_CODE__DOCK FROM WAVE_TASK_DET W,DESPATCH D,TRANSPORTER T WHERE" 
+						+" W.PTCN = (SELECT PTCN FROM WAVE_TASK_DET WHERE REF_ID =?)" 
+						+" AND W.REF_SER='S-DSP'"
+						+" AND D.DESP_ID = W.REF_ID"
+						+" AND T.TRAN_CODE = D.TRAN_CODE";	
+				pstmt = conn.prepareStatement(sql);
+				pstmt.setString(1,pickOrder);
+				rs = pstmt.executeQuery();				
+				if(rs.next())
+				{
+					docLoc = rs.getString(1);		
+				}
+			}
 
 			if( rs != null )
 			{
@@ -1431,7 +1474,7 @@ public class PickOrderIC extends ValidatorEJB implements PickOrderICLocal,PickOr
 				pstmt.close();
 				pstmt = null;
 			}
-		
+			//changed by sankara on 22/09/14 for site transporter end.
 		}
 		catch(Exception e)
 		{

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

@@ -1398,6 +1398,8 @@ public String itemChanged( Document dom, Document dom1, Document dom2, String ob
 	GenericUtility genericUtility = GenericUtility.getInstance();
 	//changed by sankara on 03/01/14 for freight_amt_add in ship_docs 
 	String freightamount = "";
+	//changed by sankara on 22/09/14 for site transporter start.
+    String siteCodeShip = "";
 	try
 	{
 		siteCode = getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode");
@@ -1470,7 +1472,9 @@ public String itemChanged( Document dom, Document dom1, Document dom2, String ob
 					columnValue = genericUtility.getColumnValue("tran_code",dom1);
 					lrNo = genericUtility.getColumnValue("lr_no",dom1);
 					// 02/08/12 prefix considered to generate SSCC18 complaint number
-					if( columnValue != null && columnValue.trim().length() > 0)
+					
+					//changed by sankara on 22/09/14 for not used any where start. 
+					/*if( columnValue != null && columnValue.trim().length() > 0)
 					{
 					sql = "SELECT tran_name, PRONO_LAST , PRONO_FROM, PREFIX FROM transporter WHERE tran_code = ? ";
 					pstmt = conn.prepareStatement(sql);
@@ -1494,7 +1498,21 @@ public String itemChanged( Document dom, Document dom1, Document dom2, String ob
 					if(descr1.trim().length() > 0)
 					{
 						pronoLast = Long.parseLong(descr1) + 1;
+					}*/
+					
+					sql = "SELECT TRAN_NAME FROM TRANSPORTER WHERE TRAN_CODE = ? ";
+					pstmt = conn.prepareStatement(sql);
+					pstmt.setString(1, columnValue);
+					rs = pstmt.executeQuery();
+					if( rs.next() )
+					{
+						descr = rs.getString(1);
 					}
+					rs.close();
+					rs = null;
+					pstmt.close();
+					pstmt = null;
+					//changed by sankara on 22/09/14 for not used any where end.
 					
 					//Changed by sumit on 10/11/12 commented this as pro_no and lr_no will insert from shipment, this logic is now written in shipmentconf start.
 					/*if(pronoLast != 0)
@@ -1549,8 +1567,6 @@ public String itemChanged( Document dom, Document dom1, Document dom2, String ob
 					valueXmlString.append( "<transporter_tran_name><![CDATA[" ).append( checkNull( descr) ).append( "]]></transporter_tran_name>\r\n" );
 					//valueXmlString.append( "<lr_no><![CDATA[" ).append( getLrNo(prefix,pronoLast,xtraParams,conn) ).append( "]]></lr_no>\r\n" ); // added to generate SSCC18 complaint number //commented as per suggestion				
 				}
-				
-				}
 				else if( currentColumn.trim().equalsIgnoreCase( "stan_code__from" ) )
 				{
 					columnValue = genericUtility.getColumnValue("stan_code__from",dom);
@@ -2236,7 +2252,9 @@ public String itemChanged( Document dom, Document dom1, Document dom2, String ob
 							if(tranCode != null && tranCode.trim().length() >0)
 							{		
 								valueXmlString.append( "<tran_code><![CDATA[" ).append( checkNull(tranCode) ).append( "]]></tran_code>\r\n" );
-								sql = "SELECT tran_name, PRONO_LAST , PRONO_FROM, PREFIX,tran_name FROM transporter WHERE tran_code = ? ";
+								
+								//changed by sankara on 22/09/14 not used any where start.
+								/*sql = "SELECT tran_name, PRONO_LAST , PRONO_FROM, PREFIX,tran_name FROM transporter WHERE tran_code = ? ";
 								pstmt = conn.prepareStatement(sql);
 								pstmt.setString(1, tranCode);
 								rs = pstmt.executeQuery();
@@ -2279,8 +2297,21 @@ public String itemChanged( Document dom, Document dom1, Document dom2, String ob
 								rs.close();
 								rs = null;
 								pstmt.close();
-								pstmt = null;
+								pstmt = null;*/
 								
+								sql = "SELECT TRAN_NAME FROM TRANSPORTER WHERE TRAN_CODE = ? ";
+								pstmt = conn.prepareStatement(sql);
+								pstmt.setString(1, tranCode);
+								rs = pstmt.executeQuery();
+								if( rs.next() )
+								{
+									tranName=rs.getString(1);
+								}
+								rs.close();
+								rs = null;
+								pstmt.close();
+								pstmt = null;
+								//changed by sankara on 22/09/14 not used any where end.
 								
 								// start tran_code check for previous
 								// changed by sankara on 08/08/13 already declared as string....

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

@@ -472,6 +472,8 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
 		String trackingNumber = "";
 		ArrayList tracknumList = new ArrayList(); 
 		StringBuffer trackingNum = new StringBuffer();  
+		//changed by sankara on 22/09/14 for site transporter
+		boolean istransporterexist = false;
 		try 
 		{
 			String userId = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginCode" );
@@ -580,7 +582,36 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
 				{
 					// changed by sankara on 29-06-13 added sql for getting shipment type
 				
+					//changed by sankara on 22/09/14 for site transporter start.
+					String siteCodeShip = "";
+					istransporterexist = false;
+					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();
+					if( rs.next() )
+					{
+						siteCodeShip = checkNull(rs.getString("SITE_CODE__SHIP"));
+						System.out.println("siteCodeShip::::"+siteCodeShip);
+					}
+					rs.close();rs = null;
+					pstmt.close();pstmt = null;		
 
+					if(siteCodeShip == null || siteCodeShip.trim().length() == 0 )
+					{
+						sql = " SELECT SITE_CODE FROM SHIPMENT WHERE SHIPMENT_ID = ? " ;
+						pstmt = conn.prepareStatement( sql );
+						pstmt.setString( 1, shipmentId );
+						rs = pstmt.executeQuery();
+						if( rs.next() )
+						{
+							siteCodeShip = checkNull(rs.getString(1));
+							System.out.println("manualsiteCodeShip::::"+siteCodeShip);
+						}
+						rs.close();rs = null;
+						pstmt.close();pstmt = null;	
+					}
 					
 					// 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  "; 
@@ -603,6 +634,63 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
 							" SELECT DISTINCT C.CARRIER_FRIENDLYNAME, T.SHIPMENT_TYPE, C.TRACKING_NO FROM CARTON_MASTER C, SHIP_DOCS S, SHIPMENT P, TRANSPORTER T,PACK_HDR PH 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 PH.OUTER_CARTON_NO = C.MASTER_CARTON AND PH.CONFIRMED = 'Y' AND C.CARRIER_FRIENDLYNAME IS NOT NULL " +
 							" AND C.STATUS <> 'R' "; */
+					
+					
+					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 " +
+							" SELECT DISTINCT C.CARRIER_FRIENDLYNAME, ST.SHIPMENT_TYPE, C.TRACKING_NO FROM CARTON_MASTER C, SHIP_DOCS S, SHIPMENT P, SITE_TRANSPORTER ST,PACK_HDR PH WHERE S.PTCN = C.PTCN " + 
+							" 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 = 'M' AND PH.OUTER_CARTON_NO = C.MASTER_CARTON AND PH.CONFIRMED = 'Y' AND C.CARRIER_FRIENDLYNAME IS NOT NULL " +
+							" AND C.STATUS <> 'R' "+
+							" UNION " +
+							" SELECT DISTINCT C.CARRIER_FRIENDLYNAME, ST.SHIPMENT_TYPE, C.TRACKING_NO FROM CARTON_MASTER C, SHIP_DOCS S, SHIPMENT P, SITE_TRANSPORTER ST WHERE S.PTCN = C.PTCN " +
+							//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' "
+							;
+					//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);
+					pstmt.setString(1,shipmentId);
+					pstmt.setString(2,siteCodeShip);
+					pstmt.setString(3,shipmentId);
+					pstmt.setString(4,siteCodeShip);
+					//changed by sankara on 07/03/14 for parcel pick update
+					pstmt.setString(5,shipmentId);
+					pstmt.setString(6,siteCodeShip);
+					rs = pstmt.executeQuery();  
+					//changed by sankara on 04-02-14 for close out changes based on tracking numbers
+					//if( rs.next())
+					while( rs.next())
+					{
+						//changed by sankara on 22/09/14 for sitetransporter start.
+						istransporterexist = true;
+						carrierFriendlyName = rs.getString("CARRIER_FRIENDLYNAME");	   	
+						shipperName = rs.getString("SHIPMENT_TYPE");
+						//changed by sankara on 04-02-14 for close out changes based on tracking numbers
+						trackingNumber = rs.getString("TRACKING_NO"); 
+						
+						if(!carrMap.containsKey(carrierFriendlyName + ":" + shipperName))
+						{
+							shipList = new ArrayList();
+												
+						}
+						else
+						{
+							shipList = (ArrayList)carrMap.get(carrierFriendlyName + ":" + shipperName);
+						}
+						shipList.add(shipmentId);
+						carrMap.put(carrierFriendlyName + ":" + shipperName, shipList);
+						//changed by sankara on 04-02-14 for close out changes based on tracking numbers
+						//tracknumList.add(trackingNumber);
+						//System.out.println("tracknumList::::::"+tracknumList);
+						trackingNum.append(trackingNumber+",");
+					}
+					//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)
+					{
 						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 " +
 								" UNION " +
@@ -649,6 +737,7 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
 							//System.out.println("tracknumList::::::"+tracknumList);
 							trackingNum.append(trackingNumber+",");
 						}
+					}
 					//changed by sankara on 04-02-14 for close out changes based on tracking numbers start
 					System.out.println("trackingNum:::::"+trackingNum);
 					trackingNumber = trackingNum.toString();

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

@@ -76,6 +76,8 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm
 		ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB();
 		//chnaged by sankara on 21/10/13 for clubbing ptcn for newly created shipment
 		Set keyset = new HashSet();
+		//changed by sankara on 22/09/14 for sitetransporter
+		String siteCodeShip = "";
 		try
 		{			
 			conn.setAutoCommit(false); 
@@ -106,6 +108,20 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm
 	        		shipmentId = checkNull(GenericUtility.getInstance().getColumnValueFromNode("shipment_id", dom.getElementsByTagName("Detail2").item(row)));
 	        		//Changed by sumit on 11/02/13 getting ref ser 
 	        		refSer.add(checkNull(GenericUtility.getInstance().getColumnValueFromNode("ref_ser", dom.getElementsByTagName("Detail2").item(row))).trim());
+	        		//changed by sankara on 22/09/14 for sitetransporter start.
+	        		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 WT.PTCN = ? ";	     
+	        		pstmt = conn.prepareStatement( sql );
+	        		pstmt.setString( 1, tempPtcn );
+	        		rs = pstmt.executeQuery();
+	        		if( rs.next() )
+	        		{
+	        			siteCodeShip = checkNull(rs.getString("SITE_CODE__SHIP"));
+	        			System.out.println("siteCodeShip::::::"+siteCodeShip);
+	        		}
+	        		rs.close();rs = null;
+	        		pstmt.close();pstmt = null;	
+	        		//changed by sankara on 22/09/14 for sitetransporter end.
 	  				
 	        		if( shipmentId == null || shipmentId.length() == 0 )
 	        		{
@@ -157,7 +173,9 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm
 						
 						System.out.println(" else sumit  ");
 						ptcnAndConsingnee = getConsigneAgainstPTCN(ptcn, conn);
-						newPtcnAndNewConsingnee = getConsigneAgainstNewPTCN(ptcn, conn);						
+						//changed by sankara on 22/09/14 for sitetransporter	
+						//newPtcnAndNewConsingnee = getConsigneAgainstNewPTCN(ptcn,conn);	
+						newPtcnAndNewConsingnee = getConsigneAgainstNewPTCN(ptcn, siteCodeShip, conn);					
 						System.out.println(" ptcnAndConsingnee "+ptcnAndConsingnee);
 						System.out.println(" newPtcnAndNewConsingnee "+newPtcnAndNewConsingnee);				
 						//chnaged by sankara on 21/10/13 for clubbing ptcn for newly created shipment
@@ -204,7 +222,10 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm
 					ptcnAndConsingnee.clear();
 					newPtcnAndNewConsingnee.clear();
 					ptcnAndConsingnee = getConsigneAgainstPTCN(ptcn, conn);
-					newPtcnAndNewConsingnee = getConsigneAgainstNewPTCN(ptcn, conn);						
+					//changed by sankara on 22/09/14 for sitetransporter	
+					//newPtcnAndNewConsingnee = getConsigneAgainstNewPTCN(ptcn,conn);			
+					newPtcnAndNewConsingnee = getConsigneAgainstNewPTCN(ptcn, siteCodeShip, conn);						
+					System.out.println(" * ptcnAndConsingnee "+ptcnAndConsingnee);		
 					System.out.println(" * ptcnAndConsingnee "+ptcnAndConsingnee);
 					System.out.println(" * newPtcnAndNewConsingnee "+newPtcnAndNewConsingnee);
 					
@@ -599,7 +620,9 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm
 		}
 		return isAllTransporterSame;
 	}
-	private HashMap getConsigneAgainstNewPTCN(Set ptcn, Connection conn) throws ITMException
+	//changed by sankara on 22/09/14 for sitetransporter 
+	//private HashMap getConsigneAgainstNewPTCN(Set ptcn, Connection conn) throws ITMException
+	private HashMap getConsigneAgainstNewPTCN(Set ptcn,String siteCodeShip, Connection conn) throws ITMException
 	{
 		String sql = "", sql1 = "";
 		PreparedStatement pstmt = null, pstmt1 =null;
@@ -616,7 +639,8 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm
 		String shipCustCodeDlv = "";
 		String serviceCode = "";
 		String shipmentType = "";
-		
+		//changed by sankara on 22/09/14 for sitetransporter
+		boolean istransporterexist = false;
 		try
 		{
 			Iterator iterator = ptcn.iterator();
@@ -641,14 +665,24 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm
 			/*sql = " SELECT DISTINCT WTD.PTCN FROM CUSTOMER C, DESPATCH D, WAVE_TASK_DET WTD WHERE C.CUST_CODE = D.CUST_CODE__DLV " +
 					" AND WTD.WAVE_ID = D.WAVE_ID AND WTD.REF_ID = D.DESP_ID AND WTD.PTCN NOT IN ('"+inputString+"') " +
 					" AND WTD.WAVE_ID IN ( SELECT DISTINCT WAVE_ID FROM WAVE_TASK_DET WHERE PTCN IN ('"+inputString+"') )";*/
-			sql = " SELECT DISTINCT WTD.PTCN,T.TRAN_CODE,T.SERVICE_CODE,T.SHIPMENT_TYPE FROM CUSTOMER C, DESPATCH D, WAVE_TASK_DET WTD," +
+			
+			//changed by sankara on 22/09/14 for sitetransporter start.
+			/*sql = " SELECT DISTINCT WTD.PTCN,T.TRAN_CODE,T.SERVICE_CODE,T.SHIPMENT_TYPE FROM CUSTOMER C, DESPATCH D, WAVE_TASK_DET WTD," +
 					" TRANSPORTER T WHERE C.CUST_CODE = D.CUST_CODE__DLV " +
 					" AND T.TRAN_CODE = D.TRAN_CODE AND WTD.WAVE_ID = D.WAVE_ID AND WTD.REF_ID = D.DESP_ID AND " +
 					" WTD.PTCN NOT IN ('"+inputString+"')  AND WTD.WAVE_ID IN ( SELECT DISTINCT WAVE_ID FROM " +
 					//changed by sankara on 21/10/13 for getting unconfirmed ptcn
 					//" WAVE_TASK_DET WHERE PTCN IN ('"+inputString+"') )";
-					" WAVE_TASK_DET WHERE PTCN IN ('"+inputString+"') ) AND D.CONFIRMED = 'N' ";
+					" WAVE_TASK_DET WHERE PTCN IN ('"+inputString+"') ) AND D.CONFIRMED = 'N' ";*/
 
+			sql = " SELECT DISTINCT WTD.PTCN,ST.TRAN_CODE,ST.SERVICE_CODE,ST.SHIPMENT_TYPE FROM CUSTOMER C, DESPATCH D, WAVE_TASK_DET WTD," +
+					" SITE_TRANSPORTER ST WHERE C.CUST_CODE = D.CUST_CODE__DLV " +
+					" AND ST.TRAN_CODE = D.TRAN_CODE AND WTD.WAVE_ID = D.WAVE_ID AND WTD.REF_ID = D.DESP_ID AND " +
+					" WTD.PTCN NOT IN ('"+inputString+"')  AND WTD.WAVE_ID IN ( SELECT DISTINCT WAVE_ID FROM " +
+					//changed by sankara on 21/10/13 for getting unconfirmed ptcn
+					//" WAVE_TASK_DET WHERE PTCN IN ('"+inputString+"') )";
+					" WAVE_TASK_DET WHERE PTCN IN ('"+inputString+"') ) AND D.CONFIRMED = 'N' AND ST.SITE_CODE = '"+siteCodeShip+"' ";
+			//changed by sankara on 22/09/14 for sitetransporter end.
 			pstmt = conn.prepareStatement(sql);
 
 			//Changed By Pragyan 25/04/13 to join with cust_code__dlv delivery.start
@@ -672,6 +706,59 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm
 			pstmt.setString(2, inputString);*/
 			rs = pstmt.executeQuery();
 			
+			while( rs.next() )
+			{
+				//changed by sankara on 22/09/14 for sitetransporter
+				istransporterexist = true;
+				stPTCN = rs.getString("PTCN");
+				serviceCode = checkNull(rs.getString("SERVICE_CODE"));
+				shipmentType = checkNull(rs.getString("SHIPMENT_TYPE"));
+				System.out.println(" serviceCode "+serviceCode+"]["+shipmentType+"]");
+				//changed by sankara on 15/10/13 for clubing multiple ptcn
+				//if(serviceCode.trim().length() == 0 && shipmentType.trim().length() == 0)
+				if(serviceCode.trim().length() == 0 )
+				{
+					pstmt1.setString(1, stPTCN);
+					rs1 = pstmt1.executeQuery();
+
+					if( rs1.next())
+					{
+						//Changed By Pragyan 25/04/13 to join with cust_code__dlv delivery.start
+						shiptConsiGroup = checkNull(rs1.getString("SHIP_CONS_GRP"));
+						shipCustCodeDlv = checkNull(rs1.getString("CUST_CODE__DLV"));
+
+
+						if(shiptConsiGroup.trim().length() > 0)
+						{
+							sipConsignee.put(stPTCN, shiptConsiGroup);
+						}
+						else
+						{
+							sipConsignee.put(stPTCN, shipCustCodeDlv);
+						}
+						//}
+						//Changed By Pragyan 25/04/13 to join with cust_code__dlv delivery.end
+						//PTCN, "SHIP_CONS_GRP";
+						//sipConsignee.put(stPTCN, rs1.getString("SHIP_CONS_GRP"));
+					}
+					pstmt1.clearParameters();
+					rs1.close(); rs1 = null;
+					count++;
+				}
+			}
+			//changed by sankara on 22/09/14 for sitetransporter start.
+			if(!istransporterexist)
+			{
+				sql = " SELECT DISTINCT WTD.PTCN,T.TRAN_CODE,T.SERVICE_CODE,T.SHIPMENT_TYPE FROM CUSTOMER C, DESPATCH D, WAVE_TASK_DET WTD," +
+						" TRANSPORTER T WHERE C.CUST_CODE = D.CUST_CODE__DLV " +
+						" AND T.TRAN_CODE = D.TRAN_CODE AND WTD.WAVE_ID = D.WAVE_ID AND WTD.REF_ID = D.DESP_ID AND " +
+						" WTD.PTCN NOT IN ('"+inputString+"')  AND WTD.WAVE_ID IN ( SELECT DISTINCT WAVE_ID FROM " +
+						//changed by sankara on 21/10/13 for getting unconfirmed ptcn
+						//" WAVE_TASK_DET WHERE PTCN IN ('"+inputString+"') )";
+						" WAVE_TASK_DET WHERE PTCN IN ('"+inputString+"') ) AND D.CONFIRMED = 'N' ";
+
+				pstmt = conn.prepareStatement(sql);
+				rs = pstmt.executeQuery();
 				while( rs.next() )
 				{
 					stPTCN = rs.getString("PTCN");
@@ -710,6 +797,7 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm
 						count++;
 					}
 				}
+			}
 			rs.close(); rs = null;
 			pstmt.close(); pstmt = null;
 			
@@ -738,6 +826,10 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm
 				{
 					pstmt.close(); pstmt = null;
 				}
+				if( pstmt1 != null)
+				{
+					pstmt1.close(); pstmt1 = null;
+				}
 			}
 			catch( Exception es)
 			{

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

@@ -313,6 +313,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 		ResultSet rs2 = null,rsMan = null,rsHld = null,rsM = null;
 		//changed by sankara on 04/02/14 getting order type
 	    String saleOrdertype = "";
+	    //changed by sankara on 26/09/14 getting order type
+	    String siteCodeShip = "";
 		retTabSepStrBuff = new StringBuffer( "<?xml version='1.0' encoding='UTF-8'?>\r\n<DocumentRoot>\r\n<description>Datawindow Root</description>\r\n<group0>\r\n" +
 		 		                             "<description>Group0 description</description>\r\n<Header0>\r\n<description>Header0 members</description>\r\n");
 		 
@@ -818,7 +820,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 					}
 					
 					//Changed By Pragyan recursive call if master pack yes and as well as parcel pick yes.end	
-					docLocation = getDocLoc(tranCod, conn);
+					//Changed By Pragyan for Site transporter
+					 siteCodeShip = (String)getTranInfo.get("SHIP_CODE");
+					//Changed By Site Transporter on 22/09/14 start.
+					//docLocation = getDocLoc(tranCod, conn);
+					docLocation = getDocLoc(tranCod,siteCodeShip, conn);
 					
 					pstmtTran = conn.prepareStatement(sqlTran);	
 					pstmtTran.setString(1,tranCod);
@@ -7730,13 +7736,17 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 			locTypeTransport = (String)transportInfoMap.get("LOC_TYPE");
 			custCodeDlv = (String)transportInfoMap.get("CUST_CODE_DLV");
 			dbShipType = (String)transportInfoMap.get("SHIP_TYPE");
+			//changed by sankara on 22/09/14 for site transporter
+			siteCodeShip = (String)transportInfoMap.get("SHIP_CODE");
 			transMode = (String)transportInfoMap.get("TRANS_MODE");
 			transMode = transMode != null?transMode.trim():transMode;
 			isADSIConnReq = (String)transportInfoMap.get("ADSI_FLAG");
 			isADSIConnReq = isADSIConnReq != null?isADSIConnReq:"N";
 			//changed by pragyan on 14/08/14 trancode and loc type parent start.
 			isTrancodeInput = (String)transportInfoMap.get("IS_DIRECT_TRANSPORTER");
-			docLoc = getDocLoc(tranCode, conn);
+			//docLoc = getDocLoc(tranCode, conn);
+			//changed by pragyan on 22/09/14 for site transporter
+			docLoc = getDocLoc(tranCode,siteCodeShip, conn);
 			//Changed By Pragyan for Cold Chain project on 19-SEP-14   [W14FSUN003]	
 			facilityCode = commonWmsUtility.getFacilityCode(siteCode, conn);
 			System.out.println("Found Facility Code As ["+facilityCode+"]");
@@ -17980,7 +17990,48 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 		return transInfoMap;	
 	}
 	*/
+	//Changed By Pragyan To Check Site Transporter on 19-SEP-14   [W14FSUN003]	
+	//private HashMap getTransporterInfoMap(String saleOrder,double perShipWeight ,double noArt,String pickType , String shipType ,Connection conn) throws ITMException
 	private HashMap getTransporterInfoMap(String saleOrder,double perShipWeight ,double noArt,String pickType , String shipType ,Connection conn) throws ITMException
+	{
+		HashMap distRouteDataMap = null;
+		String tranCode = "";
+
+		try
+		{
+			distRouteDataMap = getTransporterInfoMap(saleOrder,perShipWeight ,noArt,pickType , shipType ,true, conn);
+
+			if(distRouteDataMap != null)
+			{
+				tranCode = (String)distRouteDataMap.get("TRAN_CODE");
+
+				if(!(tranCode.length() > 0))				
+				{
+					distRouteDataMap = getTransporterInfoMap(saleOrder,perShipWeight ,noArt,pickType , shipType ,false, conn);
+				}
+			}
+		}
+		catch(Exception e)
+		{
+			System.out.println("Exception in  == >"+e);
+			e.printStackTrace();
+			throw new ITMException(e);
+		}
+		finally
+		{
+			try
+			{
+
+			}
+			catch (Exception e1)
+			{
+				throw new ITMException(e1);
+			}
+		}
+
+		return distRouteDataMap;	
+	}
+	private HashMap getTransporterInfoMap(String saleOrder,double perShipWeight ,double noArt,String pickType , String shipType ,boolean isSiteTransporter,Connection conn) throws ITMException
 	{
 		String sql = "";
 		String sql1 = "";
@@ -18015,11 +18066,21 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 			pinFrm = getPinSite(siteCodeShip,conn); 
 			//pinTo = getPinCust(custCodeDlv,conn);
 			pinTo = (String)stationInfoMap.get("DLV_PIN");
-			
+			//Changed by pragyan on 19-SEP-14  [W14FSUN003]	
+			if(isSiteTransporter)
+			{
+				sSQL =  " SELECT A.TRAN_CODE AS TRAN_CODE,A.TRANS_MODE AS TRANS_MODE,A.MAX_WEIGHT,A.LOC_TYPE,A.SHIP_TYPE,T.TRAN_CODE AS TRAN_CODE,T.SERVICE_CODE AS SERVICE_CODE,T.SHIPMENT_TYPE AS SHIPMENT_TYPE,ADSI_FLAG AS ADSI_FLAG FROM DISTROUTEDET A,DISTROUTE B, SITE_TRANSPORTER T "  
+						  + " WHERE T.SITE_CODE = '"+siteCodeShip+"' AND ( A.PIN__FR =  ?  OR A.PIN__FR = ' ' ) AND (A.PIN__TO = ?  OR   A.PIN__TO = ' ') AND (A.STAN_CODE__FR  =?  OR A.STAN_CODE__FR  = ' ' ) " 
+						  + " AND ( A.STAN_CODE__TO =?   OR A.STAN_CODE__TO = ' ')  AND ( A.STATE_CODE__FR  = ?   OR A.STATE_CODE__FR  = ' ') "
+						  + " AND ( A.STATE_CODE__TO = ?  OR  A.STATE_CODE__TO = ' ' )  AND (A.DIST_ROUTE = B.DIST_ROUTE) AND (T.TRAN_CODE = A.TRAN_CODE) AND ";
+			}
+			else
+			{
 				sSQL =  " SELECT A.TRAN_CODE AS TRAN_CODE,A.TRANS_MODE AS TRANS_MODE,A.MAX_WEIGHT,A.LOC_TYPE,A.SHIP_TYPE,T.TRAN_CODE AS TRAN_CODE,T.SERVICE_CODE AS SERVICE_CODE,T.SHIPMENT_TYPE AS SHIPMENT_TYPE,ADSI_FLAG AS ADSI_FLAG FROM DISTROUTEDET A,DISTROUTE B, TRANSPORTER T "  
 						  + " WHERE ( A.PIN__FR =  ?  OR A.PIN__FR = ' ' ) AND (A.PIN__TO = ?  OR   A.PIN__TO = ' ') AND (A.STAN_CODE__FR  =?  OR A.STAN_CODE__FR  = ' ' ) " 
 						  + " AND ( A.STAN_CODE__TO =?   OR A.STAN_CODE__TO = ' ')  AND ( A.STATE_CODE__FR  = ?   OR A.STATE_CODE__FR  = ' ') "
 						  + " AND ( A.STATE_CODE__TO = ?  OR  A.STATE_CODE__TO = ' ' )  AND (A.DIST_ROUTE = B.DIST_ROUTE) AND (T.TRAN_CODE = A.TRAN_CODE) AND ";
+			}
 			
 			if(("P".equalsIgnoreCase(pickType) && "P".equalsIgnoreCase(shipType)) || ("M".equalsIgnoreCase(pickType) && "M".equalsIgnoreCase(shipType)) )//|| "".equalsIgnoreCase(shipType) || "L".equalsIgnoreCase(shipType))
 			{
@@ -18681,7 +18742,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 	}
 	
 	
-	private String getDocLoc(String tranCode,Connection conn) throws ITMException
+	//private String getDocLoc(String tranCode,String siteCodeShip,Connection conn) throws ITMException
+	private String getDocLoc(String tranCode,String siteCodeShip,Connection conn) throws ITMException
 	{
 		String sql = "";
 		String sqlShipStanCode = "";
@@ -18692,8 +18754,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 		try
 		{
 										
+			//Changed By Site Transporter on 22/09/14 start.
 
-			sql = "SELECT A.LOC_CODE__DOCK AS DOC_LOC FROM TRANSPORTER A "
+			/*sql = "SELECT A.LOC_CODE__DOCK AS DOC_LOC FROM TRANSPORTER A "
 				+ " WHERE A.TRAN_CODE = ? ";
 
 			pstmt = conn.prepareStatement(sql);
@@ -18701,9 +18764,41 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 			rs = pstmt.executeQuery();
 
 			while (rs.next())
+			{
+				docLoc  = rs.getString("DOC_LOC");
+			}*/
+
+
+			sql = "SELECT A.LOC_CODE__DOCK AS DOC_LOC FROM SITE_TRANSPORTER A "
+					+ " WHERE A.TRAN_CODE = ? AND SITE_CODE = ? ";
+
+			pstmt = conn.prepareStatement(sql);
+			pstmt.setString(1, tranCode);
+			pstmt.setString(2, siteCodeShip);
+			rs = pstmt.executeQuery();
+
+			if(rs.next())
 			{
 				docLoc  = rs.getString("DOC_LOC");
 			}
+			//Changed By Site Transporter on 22/09/14 end.
+			else
+			{
+				sql = "SELECT A.LOC_CODE__DOCK AS DOC_LOC FROM TRANSPORTER A "
+						+ " WHERE A.TRAN_CODE = ? ";
+
+				pstmt = conn.prepareStatement(sql);
+				pstmt.setString(1, tranCode);
+				rs = pstmt.executeQuery();
+
+				if(rs.next())
+				{
+					docLoc  = rs.getString("DOC_LOC");
+				}
+			}
+
+
+
 
 			if( rs != null )
 			{
@@ -23495,6 +23590,29 @@ private HashMap getArgTransporterInfoMap(String saleOrder, double perShipWeight
 
 		System.out.println("custCodeDlv::::::::"+custCodeDlv);
 		
+		//Changed BY Pragyan for Site Transporter on 22/09/14 start.
+		
+		sql = " SELECT T.SERVICE_CODE, T.SHIPMENT_TYPE, T.ADSI_FLAG,M.TRANS_MODE FROM SITE_TRANSPORTER T,TRANSPORTER_MODE M WHERE T.TRAN_CODE = ? AND M.TRAN_CODE = T.TRAN_CODE AND T.SITE_CODE = ?";   
+		pstmt = conn.prepareStatement(sql);
+		pstmt.setString(1, transporterCode); 
+		pstmt.setString(2, siteCodeShip); 
+		
+		rs = pstmt.executeQuery();
+		if(rs.next())
+		{
+			System.out.println("Block In else If found else rs.............");
+			serviceCode= checkNull(rs.getString("SERVICE_CODE"));
+			shipmentType = checkNull(rs.getString("SHIPMENT_TYPE"));
+			adsiFlag = checkNull(rs.getString("ADSI_FLAG"));
+			transMode = checkNull(rs.getString("TRANS_MODE"));
+		}
+		//Changed BY Pragyan for Site Transporter on 22/09/14 end.
+		else
+		{
+
+			rs.close(); rs = null;
+			pstmt.close(); pstmt = null;	
+			
 			sql = " SELECT T.SERVICE_CODE, T.SHIPMENT_TYPE, T.ADSI_FLAG,M.TRANS_MODE FROM TRANSPORTER T,TRANSPORTER_MODE M WHERE T.TRAN_CODE = ? AND M.TRAN_CODE = T.TRAN_CODE ";   
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1, transporterCode); 
@@ -23507,6 +23625,7 @@ private HashMap getArgTransporterInfoMap(String saleOrder, double perShipWeight
 				adsiFlag = checkNull(rs.getString("ADSI_FLAG"));
 				transMode = checkNull(rs.getString("TRANS_MODE"));
 			}
+		}
 		rs.close(); rs = null;
 		pstmt.close(); pstmt = null;