添加接口数据

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

@@ -1777,8 +1777,11 @@ public class MESHelperServiceImpl implements MESHelperService {
 		//实际业务数据
 		Map<Object, Object> rmap = new HashMap<>();
 		String oErrMessage = null;
+		Integer code=0;
 		if(map.get("iSN")==null){
+			code=-1;
 			oErrMessage = "SN不能为空";
+			rmap.put("code",code);
 			rmap.put("oErrMessage",oErrMessage);
 			return rmap;
 		}
@@ -1811,6 +1814,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return rmap;
 	}
 
+
 	private Object SetPcbaData(String iSN,String iResCode,String iOperator,String iResult){
 		//实际业务数据
 		Map<Object, Object> rmap = new HashMap<>();
@@ -1901,6 +1905,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		String CurrentStep = GetStepCodeBySource(iSourceCode);
 		Object BgCode = baseDao.getFieldDataByCondition("step", "nvl(st_badgroupcode,' ')", "st_code='" + CurrentStep + "'");
 		Map<Object, Object> rmap = new HashMap<>();
+		Integer code=0;
 		switch (iResult)
 		{
 			case "OK":
@@ -1909,6 +1914,8 @@ public class MESHelperServiceImpl implements MESHelperService {
 				if (iErrCode == "")
 				{
 					oErrMessage = "测试结果为NG时必须传递不良代码";
+					code=-1;
+					rmap.put("code",code);
 					rmap.put("oErrMessage",oErrMessage);
 					return rmap;
 				}
@@ -1921,6 +1928,8 @@ public class MESHelperServiceImpl implements MESHelperService {
 					{
 						if(!baseDao.checkIf("badcode","bc_code='"+ BadCode[i]+"'")){
 							oErrMessage = "不良代码"+BadCode[i]+"不存在";
+							code=-1;
+							rmap.put("code",code);
 							rmap.put("oErrMessage",oErrMessage);
 							return rmap;
 						}
@@ -1939,6 +1948,8 @@ public class MESHelperServiceImpl implements MESHelperService {
 				break;
 			default:
 				oErrMessage = "测试结果必须为NG或者OK";
+				code=-1;
+				rmap.put("code",code);
 				rmap.put("oErrMessage",oErrMessage);
 				return rmap;
 		}
@@ -1975,6 +1986,11 @@ public class MESHelperServiceImpl implements MESHelperService {
 				String.valueOf(iResult),
 		}, new Integer[]{1, 2, 3, 4, 5}, new Integer[]{6});
 		oErrMessage = list.get(0);
+		if(oErrMessage==null){
+			rmap.put("code",0);
+		}else{
+			rmap.put("code",-1);
+		}
 		rmap.put("oErrMessage",oErrMessage);
 		return rmap;
 	}