修改接口参数传参

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

@@ -34,8 +34,6 @@ public class MESHelperServiceImpl implements MESHelperService {
 	@Value("${spring.datasource.username}")
 	private String username;
 
-	String Master;
-
 	String accessKey1="";
 
 	@Override
@@ -43,7 +41,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		String AE_MASTER = checkAccessKey(accessKey, requestId);
 		accessKey1=accessKey;
 		SpObserver.putSp(AE_MASTER);
-		Master=AE_MASTER;
+		String Master=AE_MASTER;
 		Map<Object, Object> map = BaseUtil.parseFormStoreToMap(data);
 		//解析map
 		if(!StringUtil.hasText(map.get("type"))){
@@ -154,7 +152,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		String AE_MASTER = checkAccessKey(accessKey, requestId);
 		accessKey1=accessKey;
 		SpObserver.putSp(AE_MASTER);
-		Master=AE_MASTER;
+		String Master=AE_MASTER;
 		JSONArray arr = new JSONArray();
 		JSONObject obj = null;
 		for (String i : id.split(";")) {
@@ -352,7 +350,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 			ms_stepcode=rs.getString("ms_stepcode");
 			ms_nextstepcode=rs.getString("ms_nextstepcode");
 		}
-		String stepcode = GetStepCodeBySource(iResCode);
+		String stepcode = GetStepCodeBySource(iResCode,Master);
 		if ( oErrMessage == null || (ms_status == "3" && ms_stepcode == stepcode))
 		{
 			if (ms_status == "3")
@@ -448,7 +446,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 			ms_stepcode=rs.getString("ms_stepcode");
 			ms_nextstepcode=rs.getString("ms_nextstepcode");
 		}
-		String stepcode = GetStepCodeBySource(iResCode);
+		String stepcode = GetStepCodeBySource(iResCode,Master);
 		if (ms_nextstepcode != "" && !ms_nextstepcode.equals(stepcode))
 		{
 			oErrMessage = "当前序列号下一工序" + ms_nextstepcode;
@@ -470,7 +468,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		String iUserCode=map.get("iUserCode").toString();
 		String iPassWord=map.get("iPassWord").toString();
 		String iResCode=map.get("iResCode").toString();
-		if (CheckUserLogin(iUserCode, iPassWord))
+		if (CheckUserLogin(iUserCode, iPassWord,Master))
 		{
 			String SQL = "select em_code,em_type,em_name from "+Master+".employee where em_code=? ";
 			SqlRowList rs = baseDao.queryForRowSet(SQL,  iUserCode);
@@ -541,7 +539,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		//判断工单是否归属
 		JSONObject map3=new JSONObject();
 		map3.put("iSN",iSN);
-		Map<Object, Object> map2=GetRcardMOInfo(map3);
+		Map<Object, Object> map2=GetRcardMOInfo(map3,Master);
 		if(map2.get("oErrMessage")!=null){
 			oErrMessage=map2.get("oErrMessage").toString();
 			rmap.put("oErrMessage",oErrMessage);
@@ -955,7 +953,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		}
 		JSONObject map3=new JSONObject();
 		map3.put("iSN",iSN);
-		Map<Object, Object> map2=GetRcardMOInfo(map3);
+		Map<Object, Object> map2=GetRcardMOInfo(map3,Master);
 		String omakeCode = "";
 		StringBuffer sql=new StringBuffer();
 		String[] name=iClassName.split("\\|");
@@ -1032,13 +1030,13 @@ public class MESHelperServiceImpl implements MESHelperService {
 		}
 		JSONObject map3=new JSONObject();
 		map3.put("iSN",iSN);
-		Map<Object, Object> map2=GetRcardMOInfo(map3);
+		Map<Object, Object> map2=GetRcardMOInfo(map3,Master);
 		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 SetStepFinish(oMoCode, iResCode, iSN, "", iResult, iOperator, iErrCode,Master);
 		return rmap;
 	}
 
@@ -1047,7 +1045,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 	/// </summary>
 	/// <param name="Source"></param>
 	/// <returns></returns>
-	private String GetStepCodeBySource(String Source)
+	private String GetStepCodeBySource(String Source,String Master)
 	{
 		Object o=baseDao.getFieldDataByCondition(Master+".source", "sc_stepcode", "sc_code='" + Source + "'");
 		if(o!=null)
@@ -1056,7 +1054,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 			return "";
 	}
 
-	private Boolean CheckUserLogin(String iUserCode, String iPassWord)
+	private Boolean CheckUserLogin(String iUserCode, String iPassWord,String Master)
 	{
 		SqlRowList rs =baseDao.queryForRowSet("select em_code from "+Master+".employee where em_code='"+iUserCode+"' and em_password =?",iPassWord);
 		if (rs.next())
@@ -1336,11 +1334,11 @@ public class MESHelperServiceImpl implements MESHelperService {
 		}
 	}
 
-	public Map<Object,Object> SetStepFinish(String iMakeCode, String iSourceCode, String iSN, String iMPKind, String iResult, String iUserCode, String iErrCode)
+	public Map<Object,Object> SetStepFinish(String iMakeCode, String iSourceCode, String iSN, String iMPKind, String iResult, String iUserCode, String iErrCode,String Master)
 	{
 		String oErrMessage = null;
 		Object StepCode = baseDao.getFieldDataByCondition(Master+".Makeserial", "ms_stepcode", "ms_sncode='" + iSN + "' and ms_makecode='" + iMakeCode + "'");
-		String CurrentStep = GetStepCodeBySource(iSourceCode);
+		String CurrentStep = GetStepCodeBySource(iSourceCode,Master);
 		Object BgCode = baseDao.getFieldDataByCondition(Master+".step", "nvl(st_badgroupcode,' ')", "st_code='" + CurrentStep + "'");
 		Map<Object, Object> rmap = new HashMap<>();
 		switch (iResult)
@@ -1401,10 +1399,10 @@ public class MESHelperServiceImpl implements MESHelperService {
 				}
 			}
 		}
-		return CS_SetFinish(iMakeCode, iSourceCode, iSN, iUserCode, iResult);
+		return CS_SetFinish(iMakeCode, iSourceCode, iSN, iUserCode, iResult,Master);
 	}
 
-	private Map<Object,Object> CS_SetFinish(String iMakeCode, String iSourceCode, String iSN, String iUserCode, String iResult)
+	private Map<Object,Object> CS_SetFinish(String iMakeCode, String iSourceCode, String iSN, String iUserCode, String iResult,String Master)
 	{
 		Map<Object, Object> rmap = new HashMap<>();
 		String oErrMessage=null;