修改支持IMEI过站

src/main/java/com/uas/eis/serviceImpl/MESHelperServiceImpl.java

@@ -1007,6 +1007,15 @@ public class MESHelperServiceImpl implements MESHelperService {
 		}
 
 		String iSN=map.get("iSN").toString();
+		SqlRowList rs=baseDao.queryForRowSet("select ms_sncode from  makeserial where ms_imei1='"+iSN+"' or ms_imei2='"+iSN+"' or ms_imei3='"+iSN+"'");
+		if(rs.next()){
+			iSN=rs.getString("ms_sncode");
+		}else{
+			rs=baseDao.queryForRowSet("select mil_sncode from  makeimeilist where mil_imei1='"+iSN+"' or mil_imei2='"+iSN+"' or mil_imei3='"+iSN+"'");
+			if(rs.next()){
+				iSN=rs.getString("mil_sncode");
+			}
+		}
 		String iResCode=map.get("iResCode").toString();
 		String oErrMessage="";
 		Integer code=0;
@@ -1028,7 +1037,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 			rmap.put("oErrMessage",oErrMessage);
 			return rmap;
 		}
-		SqlRowList rs = baseDao.queryForRowSet("select ms_status,ms_stepcode,ms_nextstepcode from makeserial where ms_id=(  select max(ms_id) from makeserial where ms_sncode  in ( select '" + iSN + "' from dual union select sn from makesnrelation where beforesn='" + iSN + "' and sn<>' '  union select beforesn from makesnrelation where sn='" + iSN + "' and beforesn<>' '))");
+		rs = baseDao.queryForRowSet("select ms_status,ms_stepcode,ms_nextstepcode from makeserial where ms_id=(  select max(ms_id) from makeserial where ms_sncode  in ( select '" + iSN + "' from dual union select sn from makesnrelation where beforesn='" + iSN + "' and sn<>' '  union select beforesn from makesnrelation where sn='" + iSN + "' and beforesn<>' '))");
 		String ms_status = "";
 		String ms_stepcode = "";
 		String ms_nextstepcode = "";
@@ -1685,6 +1694,15 @@ public class MESHelperServiceImpl implements MESHelperService {
 			return rmap;
 		}
 		String iSN=map.get("iSN").toString();
+		SqlRowList rs=baseDao.queryForRowSet("select ms_sncode from  makeserial where ms_imei1='"+iSN+"' or ms_imei2='"+iSN+"' or ms_imei3='"+iSN+"'");
+		if(rs.next()){
+			iSN=rs.getString("ms_sncode");
+		}else{
+			rs=baseDao.queryForRowSet("select mil_sncode from  makeimeilist where mil_imei1='"+iSN+"' or mil_imei2='"+iSN+"' or mil_imei3='"+iSN+"'");
+			if(rs.next()){
+				iSN=rs.getString("mil_sncode");
+			}
+		}
 		String iResCode = null;
 		String iOperator = null;
 		String iResult = null;