【行之成MES】前一道工序过站重复过站不报错

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

@@ -975,7 +975,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 != "" && !ms_nextstepcode.equals(stepcode)&& !ms_stepcode.equals(stepcode))
 		{
 			oErrMessage = "当前序列号下一工序" + ms_nextstepcode;
 		}
@@ -1012,7 +1012,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 != "" && !ms_nextstepcode.equals(stepcode)&& !ms_stepcode.equals(stepcode))
 		{
 			oErrMessage = "当前序列号"+iSN+"下一工序" + ms_nextstepcode;
 		}