修改支持账套调用

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

@@ -33,10 +33,13 @@ public class MESHelperServiceImpl implements MESHelperService {
 	@Value("${spring.datasource.username}")
 	private String username;
 
+	String Master;
+
 	@Override
 	public Map<Object,Object> DLLMain(String accessKey, String requestId, String data) {
 		String AE_MASTER = checkAccessKey(accessKey, requestId);
 		SpObserver.putSp(AE_MASTER);
+		Master=SpObserver.getSp();
 		Map<Object, Object> map = BaseUtil.parseFormStoreToMap(data);
 		//解析map
 		if(!StringUtil.hasText(map.get("type"))){
@@ -217,7 +220,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 			oErrMessage = "SN不能为空";
 		}
 		List<String> list = new ArrayList<String>();
-		list = baseDao.callProcedureWithOut("CS_CHECKSTEPSNANDMACODE", new Object[]{
+		list = baseDao.callProcedureWithOut(Master+".CS_CHECKSTEPSNANDMACODE", new Object[]{
 				String.valueOf(""),
 				String.valueOf(iResCode),
 				String.valueOf(iSN),
@@ -228,7 +231,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 			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<>' '))");
+		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<>' '))");
 		String ms_status = "";
 		String ms_stepcode = "";
 		String ms_nextstepcode = "";
@@ -261,7 +264,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		String iResCode=map.get("iResCode").toString();
 		if (CheckUserLogin(iUserCode, iPassWord))
 		{
-			String SQL = "select em_code,em_type,em_name from employee where em_code=? ";
+			String SQL = "select em_code,em_type,em_name from "+Master+".employee where em_code=? ";
 			SqlRowList rs = baseDao.queryForRowSet(SQL,  iUserCode);
 			if (rs.next())
 			{
@@ -275,14 +278,14 @@ public class MESHelperServiceImpl implements MESHelperService {
 				}
 				if (em_type.equals("admin"))
 				{
-					if (!baseDao.checkIf("Source", "sc_code='" + iResCode + "' and sc_statuscode='AUDITED'"))
+					if (!baseDao.checkIf(""+Master+".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'");
+					SqlRowList rs1=baseDao.queryForRowSet("select ur_resourcecode from "+Master+".cs$empgroup left join "+Master+".cs$userresource on ur_groupcode=eg_groupcode left join "+Master+".source on ur_resourcecode=sc_code where eg_emcode = '"+ iUserCode + "' and sc_statuscode='AUDITED'");
 					//如果存在该编号
 					if (rs1.next())
 					{
@@ -336,7 +339,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 			return rmap;
 		}
 		List<String> list = new ArrayList<String>();
-		list = baseDao.callProcedureWithOut("CS_GETADDRESSBYMAKECODE", new Object[]{
+		list = baseDao.callProcedureWithOut(Master+".CS_GETADDRESSBYMAKECODE", new Object[]{
 				String.valueOf(iSN),
 				String.valueOf(map2.get("oMoCode").toString()),
 		}, new Integer[]{1,2}, new Integer[]{3,4,5,6,7,8});
@@ -386,7 +389,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		}
 		iSN=map.get("iSN").toString();
 		List<String> list = new ArrayList<String>();
-		list = baseDao.callProcedureWithOut("CS_GETIMEIORNETCODERANGE", new Object[]{
+		list = baseDao.callProcedureWithOut(Master+".CS_GETIMEIORNETCODERANGE", new Object[]{
 				String.valueOf(iSN),
 				String.valueOf(""),
 				String.valueOf(oIMEI1),
@@ -568,7 +571,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 			iCode3=map.get("iCode3").toString();
 		}
 		List<String> list = new ArrayList<String>();
-		list = baseDao.callProcedureWithOut("CS_SETADDRESSINFO", new Object[]{
+		list = baseDao.callProcedureWithOut(Master+".CS_SETADDRESSINFO", new Object[]{
 				String.valueOf(iSN),
 				String.valueOf(iWIFI),
 				String.valueOf(iBT),
@@ -680,7 +683,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 			iID3=map.get("iID3").toString();
 		}
 		List<String> list = new ArrayList<String>();
-		list = baseDao.callProcedureWithOut("CS_SETIMEIINFO", new Object[]{
+		list = baseDao.callProcedureWithOut(Master+".CS_SETIMEIINFO", new Object[]{
 				String.valueOf(iSN),
 				String.valueOf(iIMEI1),
 				String.valueOf(iIMEI2),
@@ -828,7 +831,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 
 	private Boolean CheckUserLogin(String iUserCode, String iPassWord)
 	{
-		SqlRowList rs =baseDao.queryForRowSet("select em_code from employee where em_code='"+iUserCode+"' and em_password =?",iPassWord);
+		SqlRowList rs =baseDao.queryForRowSet("select em_code from "+Master+".employee where em_code='"+iUserCode+"' and em_password =?",iPassWord);
 		if (rs.next())
 			return true;
 		else
@@ -848,8 +851,8 @@ public class MESHelperServiceImpl implements MESHelperService {
 			return rmap;
 		}
 		iSN=map.get("iSN").toString();
-		SqlRowList rs=baseDao.queryForRowSet("select ma_remark1,ma_remark2,ma_remark3,ma_remark4,ma_remark5,ma_remark6,ma_remark7,ma_remark8,ma_remark9,ma_remark10,ma_remark11,ma_remark12,ma_remark13,ma_remark14,ma_remark15,ma_remark16,ma_remark17,ma_remark18 from  make  " +
-				"left join makeserial on ms_makecode=ma_code  where ms_sncode='"+iSN+"' order by ms_id desc");
+		SqlRowList rs=baseDao.queryForRowSet("select ma_remark1,ma_remark2,ma_remark3,ma_remark4,ma_remark5,ma_remark6,ma_remark7,ma_remark8,ma_remark9,ma_remark10,ma_remark11,ma_remark12,ma_remark13,ma_remark14,ma_remark15,ma_remark16,ma_remark17,ma_remark18 from  "+Master+".make  " +
+				"left join "+Master+".makeserial on ms_makecode=ma_code  where ms_sncode='"+iSN+"' order by ms_id desc");
 		if(rs.next()){
 			rmap.put("oMaremark1",rs.getString("ma_remark1"));
 			rmap.put("oMaremark2",rs.getString("ma_remark2"));
@@ -1072,7 +1075,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		}
 		iSN=map.get("iSN").toString();
 		SqlRowList rs=baseDao.queryForRowSet("select pr_remark1,pr_remark2,pr_remark3,pr_remark4,pr_remark5" +
-				",pr_remark6,pr_remark7,pr_remark8 from Makeserial left join  product on pr_code=ms_prodcode where ms_sncode='"+iSN+"' order by ms_id desc");
+				",pr_remark6,pr_remark7,pr_remark8 from  "+Master+".Makeserial left join  "+Master+".product on pr_code=ms_prodcode where ms_sncode='"+iSN+"' order by ms_id desc");
 		if(rs.next()){
 			rmap.put("oProdmark1",rs.getString("pr_remark1"));
 			rmap.put("oProdmark2",rs.getString("pr_remark2"));