接口新增

src/main/java/com/uas/eis/controller/MESHelperController.java

@@ -55,6 +55,16 @@ public class MESHelperController {
         return map;
     }
 
+    //
+    //天马电子秤对接接口
+    @RequestMapping(value="/Weigh")
+    public Map<Object,Object> Weigh(HttpServletRequest request,  @RequestBody String json){
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        Map<Object,Object> map = mesHelperService.Weigh(json);
+        return map;
+    }
+
+
     @RequestMapping(value="/CheckRoutePassed")
     public Map<Object,Object> CheckRoutePassed(HttpServletRequest request,  @RequestBody String json){
         Map<String, Object> modelMap = new HashMap<String, Object>();
@@ -104,14 +114,6 @@ public class MESHelperController {
     }
 
 
-    //
-    //天马电子秤对接接口
-    @RequestMapping(value="/Weigh")
-    public Map<Object,Object> Weigh(HttpServletRequest request,  @RequestBody String json){
-        Map<String, Object> modelMap = new HashMap<String, Object>();
-        Map<Object,Object> map = mesHelperService.Weigh(json);
-        return map;
-    }
 
     //镭雕机接口
     @RequestMapping(value="/Radium")

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

@@ -1155,6 +1155,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		//实际业务数据
 		Map<Object, Object> rmap = new HashMap<>();
 		Map<String, Object> map=null;
+		Integer code=0;
 		try{
 			map =BaseUtil.convertJsonToMap(data);
 		}catch (Exception e){
@@ -1183,6 +1184,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 				String em_type = rs.getString("em_type");
 				if (iResCode ==null)
 				{
+					code=-1;
 					oErrMessage = "岗位资源不允许为空";
 					rmap.put("oErrMessage",oErrMessage);
 					return rmap;
@@ -1191,6 +1193,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 				{
 					if (!baseDao.checkIf("Source", "sc_code='" + iResCode + "' and sc_statuscode='AUDITED'"))
 					{
+						code=-1;
 						oErrMessage = "岗位资源编号错误或者未审核！";
 					}
 				}
@@ -1204,6 +1207,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 						while (rs.next())
 						{
 							if (!rs.getString("ur_resourcecode").equals("iResCode")){
+								code=-1;
 								oErrMessage = "用户不处于当前资源所属分组!";
 							}else
 							{
@@ -1212,15 +1216,21 @@ public class MESHelperServiceImpl implements MESHelperService {
 							}
 						}
 					}
-					else
+					else{
+						code=-1;
 						oErrMessage = "岗位资源编号错误或者未审核！";
+					}
 				}
 			}
-			else
+			else{
+				code=-1;
 				oErrMessage = "用户不存在!";
+			}
 		}else{
+			code=-1;
 			oErrMessage = "用户名密码不正确!";
 		}
+		rmap.put("code",code);
 		rmap.put("oErrMessage",oErrMessage);
 		return rmap;
 	}