change sql in isClearProNoLast method

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

webitm-dis/ibase/webitm/ejb/dis/SiteTransporterIC.java

@@ -438,15 +438,16 @@ public class SiteTransporterIC extends ValidatorEJB implements SiteTransporterIC
 				if(currentColumn.trim().equalsIgnoreCase("prono_from"))
 				{
 					String proNoFrom = "",tranCodeL = "";
-					tranCodeL = genericUtility.getColumnValue("tran_code", dom);
-					proNoFrom = genericUtility.getColumnValue("prono_from", dom);
+					tranCodeL = checkNull(genericUtility.getColumnValue("tran_code", dom));
+					proNoFrom = checkNull(genericUtility.getColumnValue("prono_from", dom));
+					siteCode  = checkNull(genericUtility.getColumnValue("site_code", dom));
 					proNoFrom = proNoFrom == null ? "" : proNoFrom.trim();
 					tranCodeL = tranCodeL == null ? "" : tranCodeL.trim();
 					
 					System.out.println(" item change proNoFrom@@ : ["+proNoFrom+"]");
 					System.out.println("tranCodeL@@ : ["+tranCodeL+"]");
 					
-					if(isClearProNoLast(tranCodeL,proNoFrom,conn))
+					if(isClearProNoLast(tranCodeL,proNoFrom,siteCode,conn))
 					{
 						valueXmlString.append( "<prono_last><![CDATA[]]></prono_last>\r\n" );
 						valueXmlString.append( "<prono_to><![CDATA[]]></prono_to>\r\n" );//Changed by Dadaso pawar on 22/04/15 [D15ASUN005] [For make blank prono_to]	
@@ -458,13 +459,14 @@ public class SiteTransporterIC extends ValidatorEJB implements SiteTransporterIC
 					String proNoTo = "",tranCodeL = "";
 					tranCodeL = genericUtility.getColumnValue("tran_code", dom);
 					proNoTo = genericUtility.getColumnValue("prono_to", dom);
+					siteCode  = checkNull(genericUtility.getColumnValue("site_code", dom));
 					proNoTo = proNoTo == null ? "" : proNoTo.trim();
 					tranCodeL = tranCodeL == null ? "" : tranCodeL.trim();
 					
 					System.out.println(" item change proNoTo@@ : ["+proNoTo+"]");
 					System.out.println("tranCodeL@@ : ["+tranCodeL+"]");
 					
-					if(isClearProNoLast(tranCodeL,proNoTo,conn))
+					if(isClearProNoLast(tranCodeL,proNoTo,siteCode,conn))
 					{
 						valueXmlString.append( "<prono_last><![CDATA[]]></prono_last>\r\n" );
 					}
@@ -586,16 +588,18 @@ public class SiteTransporterIC extends ValidatorEJB implements SiteTransporterIC
 		return findValue;
 	}
 	//Added by Dadadso pawar on 05/14/15 [Start]
-	private boolean isClearProNoLast(String tranCode,String proNoFrom ,Connection conn) throws ITMException,Exception
+	private boolean isClearProNoLast(String tranCode,String proNoFrom ,String siteCode,Connection conn) throws ITMException,Exception
 	{
 		ResultSet rs1 = null;
 		PreparedStatement pstmt1 = null;
 		String sql1 = "",proNoFromD = "";
 		try
 		{
-			sql1 = "SELECT PRONO_FROM,PRONO_TO,PRONO_LAST FROM TRANSPORTER WHERE TRAN_CODE = ?";
+			sql1 = "SELECT PRONO_FROM,PRONO_TO,PRONO_LAST FROM SITE_TRANSPORTER "
+					+ "WHERE TRAN_CODE = ? AND SITE_CODE = ?";
 			pstmt1 = conn.prepareStatement(sql1);
 			pstmt1.setString(1, tranCode);
+			pstmt1.setString(2, siteCode);
 			rs1 = pstmt1.executeQuery();
 			if(rs1.next())
 			{