修改信息返回接口

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

@@ -831,18 +831,22 @@ public class MESHelperServiceImpl implements MESHelperService {
 		String iResCode=null;
 		String iMo=null;
 		String oErrMessage=null;
+		Int code=0;
 		if(map.get("iMo")==null){
 			oErrMessage = "工单号不能为空";
+			code=-1;
 			rmap.put("oErrMessage",oErrMessage);
 			return rmap;
 		}
 		if(map.get("iResCode")==null){
 			oErrMessage = "岗位资源不能为空";
+			code=-1;
 			rmap.put("oErrMessage",oErrMessage);
 			return rmap;
 		}
 		if(map.get("iSN")==null){
 			oErrMessage = "SN不能为空";
+			code=-1;
 			rmap.put("oErrMessage",oErrMessage);
 			return rmap;
 		}
@@ -868,13 +872,17 @@ public class MESHelperServiceImpl implements MESHelperService {
 			ms_nextstepcode=rs.getString("ms_nextstepcode");
 		}
 		String stepcode = GetStepCodeBySource(iResCode);
-		if ( oErrMessage == null || (ms_status == "3" && ms_stepcode == stepcode))
+		if (oErrMessage == null || (ms_status == "3" && ms_stepcode == stepcode))
 		{
 			if (ms_status == "3")
 			{
 				oErrMessage =  null;
+				code=0;
 			}
+		}else{
+			code=-1;
 		}
+		rmap.put("code",code);
 		rmap.put("oErrMessage",oErrMessage);
 		return rmap;
 	}
@@ -946,9 +954,11 @@ public class MESHelperServiceImpl implements MESHelperService {
 		String iSN=map.get("iSN").toString();
 		String iResCode=map.get("iResCode").toString();
 		String oErrMessage="";
+		Int code=0;
 		if (iSN ==null)
 		{
 			oErrMessage = "SN不能为空";
+			code=-1;
 		}
 		List<String> list = new ArrayList<String>();
 		list = baseDao.callProcedureWithOut("CS_CHECKSTEPSNANDMACODE", new Object[]{
@@ -959,6 +969,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		}, new Integer[]{1, 2, 3, 4}, new Integer[]{5, 6, 7});
 		oErrMessage=list.get(2);
 		if(oErrMessage!=null){
+			rmap.put("code",-1);
 			rmap.put("oErrMessage",oErrMessage);
 			return rmap;
 		}
@@ -975,7 +986,9 @@ public class MESHelperServiceImpl implements MESHelperService {
 		if (ms_nextstepcode != "" && !ms_nextstepcode.equals(stepcode))
 		{
 			oErrMessage = "当前序列号下一工序" + ms_nextstepcode;
+			code=-1;
 		}
+		rmap.put("code",code);
 		rmap.put("oErrMessage",oErrMessage);
 		return rmap;
 	}
@@ -984,9 +997,11 @@ public class MESHelperServiceImpl implements MESHelperService {
 		//实际业务数据
 		Map<Object, Object> rmap = new HashMap<>();
 		String oErrMessage;
+		Int code=0;
 		if (iSN ==null)
 		{
 			oErrMessage = "SN不能为空";
+			code=-1;
 		}
 		List<String> list = new ArrayList<String>();
 		list = baseDao.callProcedureWithOut("CS_CHECKSTEPSNANDMACODE", new Object[]{
@@ -1513,8 +1528,11 @@ public class MESHelperServiceImpl implements MESHelperService {
 		//实际业务数据
 		Map<Object, Object> rmap = new HashMap<>();
 		String oErrMessage = null;
+		Int code=0;
 		if(map.get("iSN")==null){
+			code=-1;
 			oErrMessage = "SN不能为空";
+			rmap.put("code",code);
 			rmap.put("oErrMessage",oErrMessage);
 			return rmap;
 		}
@@ -1637,6 +1655,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<>();
+		Int code=0;
 		switch (iResult)
 		{
 			case "OK":
@@ -1645,6 +1664,8 @@ public class MESHelperServiceImpl implements MESHelperService {
 				if (iErrCode == "")
 				{
 					oErrMessage = "测试结果为NG时必须传递不良代码";
+					code=-1;
+					rmap.put("code",code);
 					rmap.put("oErrMessage",oErrMessage);
 					return rmap;
 				}
@@ -1657,6 +1678,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;
 						}
@@ -1675,6 +1698,8 @@ public class MESHelperServiceImpl implements MESHelperService {
 				break;
 			default:
 				oErrMessage = "测试结果必须为NG或者OK";
+				code=-1;
+				rmap.put("code",code);
 				rmap.put("oErrMessage",oErrMessage);
 				return rmap;
 		}
@@ -1711,6 +1736,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;
 	}