优化不良品直接测试

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

@@ -218,10 +218,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 				String.valueOf("")
 		}, new Integer[]{1, 2, 3, 4}, new Integer[]{5, 6, 7});
 		oErrMessage=list.get(2);
-		if(oErrMessage!=null){
-			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<>' '))");
 		String ms_status = "";
 		String ms_stepcode = "";
@@ -232,7 +229,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 			ms_nextstepcode=rs.getString("ms_nextstepcode");
 		}
 		String stepcode = GetStepCodeBySource(iResCode);
-		if (ms_nextstepcode != "" && !ms_nextstepcode.equals(stepcode))
+		if (ms_nextstepcode != null && !ms_nextstepcode.equals(stepcode)&&oErrMessage==null)
 		{
 			oErrMessage = "当前序列号下一工序" + ms_nextstepcode;
 		}