添加账套参数

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

@@ -33,16 +33,11 @@ public class MESHelperServiceImpl implements MESHelperService {
 	@Value("${spring.datasource.username}")
 	private String username;
 
-	String Master;
-
-	String accessKey1="";
 	@Override
 	public Map<Object,Object> DLLMain(String accessKey, String requestId, String data) {
 		String AE_MASTER = checkAccessKey(accessKey, requestId);
-		accessKey1=accessKey;
 		SpObserver.putSp(AE_MASTER);
 		//Master=SpObserver.getSp();
-		Master = baseDao.getFieldDataByCondition("APIEMPLOYEE", "AE_MASTER", "AE_KEY='" + accessKey + "'").toString();
 		Map<Object, Object> map = BaseUtil.parseFormStoreToMap(data);
 		//解析map
 		if(!StringUtil.hasText(map.get("type"))){
@@ -62,76 +57,76 @@ public class MESHelperServiceImpl implements MESHelperService {
 		Map<Object, Object> remap = new HashMap<Object, Object>();
 		switch(helperType){
 			case CheckRoutePassed:
-				remap = CheckRoutePassed(json);
+				remap = CheckRoutePassed(json,AE_MASTER);
 				break;
 			case CheckUserAndResourcePassed:
-				remap = CheckUserAndResourcePassed(json);
+				remap = CheckUserAndResourcePassed(json,AE_MASTER);
 				break;
 			case GetAddressRangeByMO:
-				remap = GetAddressRangeByMO(json);
+				remap = GetAddressRangeByMO(json,AE_MASTER);
 				break;
 			case GetMEIOrNetCodeRange:
-				remap = GetMEIOrNetCodeRange(json);
+				remap = GetMEIOrNetCodeRange(json,AE_MASTER);
 				break;
 			case GetRcardMOInfo:
-				remap = GetRcardMOInfo(json);
+				remap = GetRcardMOInfo(json,AE_MASTER);
 				break;
 			case GetMobileAllInfo:
-				remap = GetMobileAllInfo(json);
+				remap = GetMobileAllInfo(json,AE_MASTER);
 				break;
 			case SetAddressInfo:
-				remap = SetAddressInfo(json);
+				remap = SetAddressInfo(json,AE_MASTER);
 				break;
 			case GetMaster:
-				remap = GetMaster(json);
+				remap = GetMaster(json,AE_MASTER);
 				break;
 			case SetMobileData:
-				remap = SetMobileData(json);
+				remap = SetMobileData(json,AE_MASTER);
 				break;
 			case SetIMEIInfo:
-				remap = SetIMEIInfo(json);
+				remap = SetIMEIInfo(json,AE_MASTER);
 				break;
 			case SetTestDetail:
-				remap = SetTestDetail(json);
+				remap = SetTestDetail(json,AE_MASTER);
 				break;
 			case SetPcbaData:
-				remap = SetPcbaData(json);
+				remap = SetPcbaData(json,AE_MASTER);
 				break;
 			case GetInfoByMaterial:
-				remap = GetInfoByMaterial(json);
+				remap = GetInfoByMaterial(json,AE_MASTER);
 				break;
 			case GoMo:
-				remap = GoMo(json);
+				remap = GoMo(json,AE_MASTER);
 				break;
 			case GetMakeInfoBySN:
-				remap = GetMakeInfoBySN(json);
+				remap = GetMakeInfoBySN(json,AE_MASTER);
 				break;
 			case GetMakeInfoByProd:
-				remap = GetMakeInfoByProd(json);
+				remap = GetMakeInfoByProd(json,AE_MASTER);
 				break;
 			case GetProdInfo:
-				remap = GetProdInfo(json);
+				remap = GetProdInfo(json,AE_MASTER);
 				break;
 			case GetPSN:
-				remap = GetPSN(json);
+				remap = GetPSN(json,AE_MASTER);
 				break;
 			case GetMakeRelation:
-				remap = GetMakeRelation(json);
+				remap = GetMakeRelation(json,AE_MASTER);
 				break;
 			case GetFeeReason:
-				remap = GetFeeReason(json);
+				remap = GetFeeReason(json,AE_MASTER);
 				break;
 			case GetMakeSN:
-				remap = GetMakeSN(json);
+				remap = GetMakeSN(json,AE_MASTER);
 				break;
 			case SetFeeReason:
-				remap = SetFeeReason(json);
+				remap = SetFeeReason(json,AE_MASTER);
 				break;
 			case WriteMakeInfo:
-				remap = WriteMakeInfo(json);
+				remap = WriteMakeInfo(json,AE_MASTER);
 				break;
 			case GetMakeInfo:
-				remap = GetMakeInfo(json);
+				remap = GetMakeInfo(json,AE_MASTER);
 				break;
 			default:
 				err = -1;
@@ -144,7 +139,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return remap;
 	}
 
-	private Map<Object,Object> GetMakeInfo(JSONObject map){
+	private Map<Object,Object> GetMakeInfo(JSONObject map,String Master){
 		Map<Object, Object> rmap = new HashMap<Object, Object>();
 		String iSN=null;
 		String oErrMessage=null;
@@ -175,7 +170,7 @@ public class MESHelperServiceImpl implements MESHelperService {
     }*/
 	}
 
-	private Map<Object,Object> WriteMakeInfo(JSONObject map){
+	private Map<Object,Object> WriteMakeInfo(JSONObject map,String Master){
 		Map<Object, Object> rmap = new HashMap<Object, Object>();
 		String oErrMessage=null;
 		if(map.get("iMakeCode")==null){
@@ -212,7 +207,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return rmap;
 	}
 
-	private Map<Object,Object> GetMakeSN(JSONObject map){
+	private Map<Object,Object> GetMakeSN(JSONObject map,String Master){
 		Map<Object, Object> rmap = new HashMap<Object, Object>();
 		List<Map<String, Object>> maps = new ArrayList<>();
 		String ma_custname="";
@@ -243,7 +238,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return rmap;
 	}
 
-	private Map<Object,Object> GetFeeReason(JSONObject map){
+	private Map<Object,Object> GetFeeReason(JSONObject map,String Master){
 		Map<Object, Object> rmap = new HashMap<Object, Object>();
 		String oErrMessage="";
 		if(map.get("CT_ID")==null){
@@ -265,7 +260,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		}
 	}
 
-	private Map<Object,Object> SetFeeReason(JSONObject map){
+	private Map<Object,Object> SetFeeReason(JSONObject map,String Master){
 		Map<Object, Object> rmap = new HashMap<Object, Object>();
 		String formstore=map.get("data").toString();
 		Map<Object, Object> gstore = BaseUtil.parseFormStoreToMap(formstore);
@@ -274,7 +269,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return null;
 	}
 
-	private Map<Object,Object> GoMo(JSONObject map){
+	private Map<Object,Object> GoMo(JSONObject map,String Master){
 		Map<Object, Object> rmap = new HashMap<Object, Object>();
 		String iSN=null;
 		String iResCode=null;
@@ -316,7 +311,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")
@@ -328,7 +323,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return rmap;
 	}
 
-	private Map<Object,Object> GetInfoByMaterial(JSONObject map){
+	private Map<Object,Object> GetInfoByMaterial(JSONObject map,String Master){
 		Map<Object, Object> rmap = new HashMap<Object, Object>();
 		String iPCBA=null;
 		String oErrMessage=null;
@@ -357,7 +352,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return rmap;
 	}
 
-	private Map<Object,Object> CheckRoutePassed(JSONObject map){
+	private Map<Object,Object> CheckRoutePassed(JSONObject map,String Master){
 		//实际业务数据
 		Map<Object, Object> rmap = new HashMap<>();
 		String iSN=map.get("iSN").toString();
@@ -368,8 +363,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 			oErrMessage = "SN不能为空";
 		}
 		List<String> list = new ArrayList<String>();
-		Object AE_MASTER = baseDao.getFieldDataByCondition("APIEMPLOYEE", "AE_MASTER", "AE_KEY='" + accessKey1 + "'");
-		list = baseDao.callProcedureWithOut(AE_MASTER+".CS_CHECKSTEPSNANDMACODE", new Object[]{
+		list = baseDao.callProcedureWithOut(Master+".CS_CHECKSTEPSNANDMACODE", new Object[]{
 				String.valueOf(""),
 				String.valueOf(iResCode),
 				String.valueOf(iSN),
@@ -378,7 +372,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		oErrMessage=list.get(2);
 		if(oErrMessage!=null){
 			rmap.put("oErrMessage",oErrMessage);
-			rmap.put("oMaster",AE_MASTER);
+			rmap.put("oMaster",Master);
 			return rmap;
 		}
 		SqlRowList rs = baseDao.queryForRowSet("select ms_status,ms_stepcode,ms_nextstepcode from "+Master+".makeserial where ms_id=(  select max(ms_id) from "+Master+".makeserial where ms_sncode  in ( select '" + iSN + "' from dual union select sn from "+Master+".makesnrelation where beforesn='" + iSN + "' and sn<>' '  union select beforesn from "+Master+".makesnrelation where sn='" + iSN + "' and beforesn<>' '))");
@@ -390,17 +384,17 @@ 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;
 		}
 		rmap.put("oErrMessage",oErrMessage);
-		rmap.put("oMaster",AE_MASTER);
+		rmap.put("oMaster",Master);
 		return rmap;
 	}
 
-	private Map<Object,Object> CheckUserAndResourcePassed(JSONObject map){
+	private Map<Object,Object> CheckUserAndResourcePassed(JSONObject map,String Master){
 		//实际业务数据
 		Map<Object, Object> rmap = new HashMap<>();
 		String oErrMessage = null;
@@ -413,7 +407,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);
@@ -464,7 +458,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		rmap.put("oErrMessage",oErrMessage);
 		return rmap;
 	}
-	private Map<Object,Object> GetAddressRangeByMO(JSONObject map){
+	private Map<Object,Object> GetAddressRangeByMO(JSONObject map,String Master){
 		//实际业务数据
 		Map<Object, Object> rmap = new HashMap<>();
 		String iSN="";
@@ -483,7 +477,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);
@@ -512,7 +506,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return rmap;
 	}
 
-	private Map<Object,Object> GetMEIOrNetCodeRange(JSONObject map){
+	private Map<Object,Object> GetMEIOrNetCodeRange(JSONObject map,String Master){
 		//实际业务数据
 		Map<Object, Object> rmap = new HashMap<>();
 		String iSN="";
@@ -573,7 +567,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return rmap;
 	}
 
-	private Map<Object,Object> GetRcardMOInfo(JSONObject map){
+	private Map<Object,Object> GetRcardMOInfo(JSONObject map,String Master){
 		//实际业务数据
 		Map<Object, Object> rmap = new HashMap<>();
 		//取MakeProcess表中的执行记录ID最大的一个工单的号码
@@ -615,7 +609,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 
 
 
-	private Map<Object,Object> GetMobileAllInfo(JSONObject map){
+	private Map<Object,Object> GetMobileAllInfo(JSONObject map,String Master){
 		//实际业务数据
 		Map<Object, Object> rmap = new HashMap<>();
 		String iSN="";
@@ -688,7 +682,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return rmap;
 	}
 
-	private Map<Object,Object> SetAddressInfo(JSONObject map){
+	private Map<Object,Object> SetAddressInfo(JSONObject map,String Master){
 		//实际业务数据
 		Map<Object, Object> rmap = new HashMap<>();
 		String oErrMessage = null;
@@ -740,7 +734,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return rmap;
 	}
 
-	private Map<Object,Object> GetMaster(JSONObject map){
+	private Map<Object,Object> GetMaster(JSONObject map,String Master){
 		//实际业务数据
 		Map<Object, Object> rmap = new HashMap<>();
 		SqlRowList rs=baseDao.queryForRowSet("select ma_user,AE_KEY,AE_SECRET from mes.master left join MES.APIEMPLOYEE B  on ma_user=ae_master");
@@ -751,7 +745,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return rmap;
 	}
 
-	private Map<Object,Object> SetMobileData(JSONObject map){
+	private Map<Object,Object> SetMobileData(JSONObject map,String Master){
 		//实际业务数据
 		Map<Object, Object> rmap = new HashMap<>();
 		String oErrMessage = null;
@@ -799,7 +793,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return rmap;
 	}
 
-	private Map<Object,Object> SetIMEIInfo(JSONObject map){
+	private Map<Object,Object> SetIMEIInfo(JSONObject map,String Master){
 		//实际业务数据
 		Map<Object, Object> rmap = new HashMap<>();
 		String oErrMessage = null;
@@ -859,7 +853,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return rmap;
 	}
 
-	private Map<Object,Object> SetTestDetail(JSONObject map){
+	private Map<Object,Object> SetTestDetail(JSONObject map,String Master){
 		//实际业务数据
 		Map<Object, Object> rmap = new HashMap<>();
 		String oErrMessage=null;
@@ -895,7 +889,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("\\|");
@@ -915,7 +909,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return rmap;
 	}
 
-	private Map<Object,Object> SetPcbaData(JSONObject map){
+	private Map<Object,Object> SetPcbaData(JSONObject map,String Master){
 		//实际业务数据
 		Map<Object, Object> rmap = new HashMap<>();
 		String oErrMessage = null;
@@ -964,13 +958,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;
 	}
 
@@ -979,7 +973,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)
@@ -988,7 +982,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())
@@ -999,7 +993,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		}
 	}
 
-	private Map<Object,Object> GetMakeInfoBySN(JSONObject map)
+	private Map<Object,Object> GetMakeInfoBySN(JSONObject map,String Master)
 	{
 		Map<Object, Object> rmap = new HashMap<Object, Object>();
 		String iSN=null;
@@ -1039,7 +1033,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		}
 	}
 
-	private Map<Object,Object> GetPSN(JSONObject map){
+	private Map<Object,Object> GetPSN(JSONObject map,String Master){
 		String oErrMessage="";
 		Map<Object, Object> rmap = new HashMap<Object, Object>();
 		if(map.get("iSN")==null){
@@ -1082,7 +1076,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		}
 	}
 
-	private Map<Object,Object> GetMakeRelation(JSONObject map){
+	private Map<Object,Object> GetMakeRelation(JSONObject map,String Master){
 		String oErrMessage="";
 		Map<Object, Object> rmap = new HashMap<Object, Object>();
 		if(map.get("iSN")==null){
@@ -1204,7 +1198,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		}
 	}
 
-	private Map<Object,Object> GetProdInfo(JSONObject map){
+	private Map<Object,Object> GetProdInfo(JSONObject map,String Master){
 		Map<Object, Object> rmap = new HashMap<Object, Object>();
 		String iSN=null;
 		String oErrMessage=null;
@@ -1230,7 +1224,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		}*/
 	}
 
-	private Map<Object,Object> GetMakeInfoByProd(JSONObject map)
+	private Map<Object,Object> GetMakeInfoByProd(JSONObject map,String Master)
 	{
 		Map<Object, Object> rmap = new HashMap<Object, Object>();
 		String iSN=null;
@@ -1260,11 +1254,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)
@@ -1325,16 +1319,15 @@ 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)
 	{
-		Object AE_MASTER = baseDao.getFieldDataByCondition("APIEMPLOYEE", "AE_MASTER", "AE_KEY='" + accessKey1 + "'");
 		Map<Object, Object> rmap = new HashMap<>();
 		String oErrMessage=null;
 		List<String> list = new ArrayList<String>();
-		list = baseDao.callProcedureWithOut(AE_MASTER+".CS_SETSTEPRESULT_TOOL", new Object[]{
+		list = baseDao.callProcedureWithOut(Master+".CS_SETSTEPRESULT_TOOL", new Object[]{
 				String.valueOf(iMakeCode),
 				String.valueOf(iSourceCode),
 				String.valueOf(iSN),