[海格森EIS]setpcba接口与settestdetail接口合并,返回值顺序异常调整

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

@@ -769,11 +769,12 @@ public class MESHelperServiceImpl implements MESHelperService {
 		if (map2.get("oErrMessage")==null)
 		{
 			rmap = SetTestDetail(map);
-			if (map2.get("oErrMessage")==null)
+			if (rmap.get("oErrMessage")==null)
 			{
-				return rmap;
+				return SetStepFinish(oMoCode, iResCode, iSN, "", iResult, iOperator, iErrCode);
 			}
-			return SetStepFinish(oMoCode, iResCode, iSN, "", iResult, iOperator, iErrCode);
+			return rmap;
+
 		}
 		return map2;
 	}