接口新增

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

@@ -55,6 +55,29 @@ public class MESHelperController {
         return map;
     }
 
+    @RequestMapping(value="/CheckRoutePassed")
+    public Map<Object,Object> CheckRoutePassed(HttpServletRequest request,  @RequestBody String json){
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        Map<Object,Object> map = mesHelperService.CheckRoutePassed(json);
+        return map;
+    }
+
+
+    @RequestMapping(value="/SetPcbaData")
+    public Map<Object,Object> SetPcbaData(HttpServletRequest request,  @RequestBody String json){
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        Map<Object,Object> map = mesHelperService.SetPcbaData(json);
+        return map;
+    }
+
+    @RequestMapping(value="/CheckUserAndResourcePassed")
+    public Map<Object,Object> CheckUserAndResourcePassed(HttpServletRequest request,  @RequestBody String json){
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        Map<Object,Object> map = mesHelperService.CheckUserAndResourcePassed(json);
+        return map;
+    }
+
+
     //物料移动接口
     @RequestMapping(value="/SetupResultDataInterface")
     public Map<Object,Object> SetupResultDataInterface(HttpServletRequest request,  @RequestBody String json){

src/main/java/com/uas/eis/service/MESHelperService.java

@@ -18,6 +18,12 @@ public interface MESHelperService {
 
 	Map<Object, Object> SendPlaceData(String data);
 
+	Map<Object, Object> CheckRoutePassed(String data);
+
+	Map<Object, Object> SetPcbaData(String data);
+
+	Map<Object, Object> CheckUserAndResourcePassed(String data);
+
 	Map<Object, Object> StateEventDetail(String data);
 
 	Map<Object, Object> Radium(String data);

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

@@ -992,8 +992,62 @@ public class MESHelperServiceImpl implements MESHelperService {
 		rmap.put("oErrMessage",oErrMessage);
 		return rmap;
 	}
+	@Override
+	public Map<Object,Object> CheckRoutePassed(String data){
+		//实际业务数据
+		Map<Object, Object> rmap = new HashMap<>();
+		Map<String, Object> map=null;
+		try{
+			map =BaseUtil.convertJsonToMap(data);
+		}catch (Exception e){
+			rmap.put("code",-1);
+			rmap.put("message",e.getMessage());
+			System.out.printf(e.getMessage()) ;
+			return rmap;
+		}
 
-	private String CheckRoutePassed(String iSN,String iResCode){
+		String iSN=map.get("iSN").toString();
+		String iResCode=map.get("iResCode").toString();
+		String oErrMessage="";
+		Integer code=0;
+		if (iSN ==null)
+		{
+			oErrMessage = "SN不能为空";
+			code=-1;
+		}
+		List<String> list = new ArrayList<String>();
+		list = baseDao.callProcedureWithOut("CS_CHECKSTEPSNANDMACODE", new Object[]{
+				String.valueOf(""),
+				String.valueOf(iResCode),
+				String.valueOf(iSN),
+				String.valueOf("")
+		}, 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;
+		}
+		SqlRowList rs = baseDao.queryForRowSet("select ms_status,ms_stepcode,ms_nextstepcode from makeserial where ms_id=(  select max(ms_id) from makeserial where ms_sncode  in ( select '" + iSN + "' from dual union select sn from makesnrelation where beforesn='" + iSN + "' and sn<>' '  union select beforesn from makesnrelation where sn='" + iSN + "' and beforesn<>' '))");
+		String ms_status = "";
+		String ms_stepcode = "";
+		String ms_nextstepcode = "";
+		if(rs.next()){
+			ms_status= rs.getString("ms_status");
+			ms_stepcode=rs.getString("ms_stepcode");
+			ms_nextstepcode=rs.getString("ms_nextstepcode");
+		}
+		String stepcode = GetStepCodeBySource(iResCode);
+		if (ms_nextstepcode != "" && !ms_nextstepcode.equals(stepcode))
+		{
+			oErrMessage = "当前序列号下一工序" + ms_nextstepcode;
+			code=-1;
+		}
+		rmap.put("code",code);
+		rmap.put("oErrMessage",oErrMessage);
+		return rmap;
+	}
+	public String CheckRoutePassed(String iSN,String iResCode){
 		//实际业务数据
 		Map<Object, Object> rmap = new HashMap<>();
 		String oErrMessage;
@@ -1095,6 +1149,81 @@ public class MESHelperServiceImpl implements MESHelperService {
 		rmap.put("oErrMessage",oErrMessage);
 		return rmap;
 	}
+
+	@Override
+	public Map<Object,Object> CheckUserAndResourcePassed(String data){
+		//实际业务数据
+		Map<Object, Object> rmap = new HashMap<>();
+		Map<String, Object> map=null;
+		try{
+			map =BaseUtil.convertJsonToMap(data);
+		}catch (Exception e){
+			rmap.put("code",-1);
+			rmap.put("message",e.getMessage());
+			System.out.printf(e.getMessage()) ;
+			return rmap;
+		}
+		String oErrMessage = null;
+		if (map.get("iUserCode") == null || map.get("iResCode") == null || map.get("iPassWord") == null)
+		{
+			oErrMessage = "用户名,密码,岗位资源必须填写";
+			rmap.put("oErrMessage",oErrMessage);
+			return rmap;
+		}
+		String iUserCode=map.get("iUserCode").toString();
+		String iPassWord=map.get("iPassWord").toString();
+		String iResCode=map.get("iResCode").toString();
+		if (CheckUserLogin(iUserCode, iPassWord))
+		{
+			String SQL = "select em_code,em_type,em_name from employee where em_code=? ";
+			SqlRowList rs = baseDao.queryForRowSet(SQL,  iUserCode);
+			if (rs.next())
+			{
+				String em_name = rs.getString("em_name");
+				String em_type = rs.getString("em_type");
+				if (iResCode ==null)
+				{
+					oErrMessage = "岗位资源不允许为空";
+					rmap.put("oErrMessage",oErrMessage);
+					return rmap;
+				}
+				if (em_type.equals("admin"))
+				{
+					if (!baseDao.checkIf("Source", "sc_code='" + iResCode + "' and sc_statuscode='AUDITED'"))
+					{
+						oErrMessage = "岗位资源编号错误或者未审核！";
+					}
+				}
+				else
+				{
+					SqlRowList rs1=baseDao.queryForRowSet("select ur_resourcecode from cs$empgroup left join cs$userresource on ur_groupcode=eg_groupcode left join source on ur_resourcecode=sc_code where eg_emcode = '"+ iUserCode + "' and sc_statuscode='AUDITED'");
+					//如果存在该编号
+					if (rs1.next())
+					{
+						//判断如果多个岗位资源存在，用户输入的只要在其中就行
+						while (rs.next())
+						{
+							if (!rs.getString("ur_resourcecode").equals("iResCode")){
+								oErrMessage = "用户不处于当前资源所属分组!";
+							}else
+							{
+								oErrMessage=null;
+								continue;
+							}
+						}
+					}
+					else
+						oErrMessage = "岗位资源编号错误或者未审核！";
+				}
+			}
+			else
+				oErrMessage = "用户不存在!";
+		}else{
+			oErrMessage = "用户名密码不正确!";
+		}
+		rmap.put("oErrMessage",oErrMessage);
+		return rmap;
+	}
 	private Map<Object,Object> GetAddressRangeByMO(JSONObject map){
 		//实际业务数据
 		Map<Object, Object> rmap = new HashMap<>();
@@ -1523,6 +1652,57 @@ public class MESHelperServiceImpl implements MESHelperService {
 		rmap.put("oErrMessage",oErrMessage);
 		return rmap;
 	}
+	@Override
+	public Map<Object,Object> SetPcbaData(String data){
+		//实际业务数据
+		Map<Object, Object> rmap = new HashMap<>();
+		Map<String, Object> map=null;
+		try{
+			map =BaseUtil.convertJsonToMap(data);
+		}catch (Exception e){
+			rmap.put("code",-1);
+			rmap.put("message",e.getMessage());
+			System.out.printf(e.getMessage()) ;
+			return rmap;
+		}
+		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;
+		}
+		String iSN=map.get("iSN").toString();
+		String iResCode = null;
+		String iOperator = null;
+		String iResult = null;
+		String iErrCode = null;
+		if(map.get("iResCode")!=null){
+			iResCode=map.get("iResCode").toString();
+		}
+		if(map.get("iOperater")!=null){
+			iOperator=map.get("iOperater").toString();
+		}
+		if(map.get("iResult")!=null){
+			iResult=map.get("iResult").toString();
+		}
+		if(map.get("iErrCode")!=null){
+			iErrCode=map.get("iErrCode").toString();
+		}
+		JSONObject map3=new JSONObject();
+		map3.put("iSN",iSN);
+		Map<Object, Object> map2=GetRcardMOInfo(map3);
+		String oMoCode=null;
+		if(map2.get("oMoCode")!=null){
+			oMoCode=map2.get("oMoCode").toString();
+		}
+		if (map2.get("oErrMessage")==null)
+			return SetStepFinish(oMoCode, iResCode, iSN, "", iResult, iOperator, iErrCode);
+		return rmap;
+	}
+
 
 	private Map<Object,Object> SetPcbaData(JSONObject map){
 		//实际业务数据