修改支持账套调用

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

@@ -782,7 +782,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		if(map.get("iErrCode")!=null){
 			iErrCode=map.get("iErrCode").toString();
 		}
-		SqlRowList rs=baseDao.queryForRowSet("select nvl(st_ifinput,0)st_ifinput,nvl(st_ifoqc,0)st_ifoqc,nvl(st_ifweigh,0)st_ifweigh from source left join step on sc_stepcode=st_code where sc_code='"+iResCode+"'");
+		SqlRowList rs=baseDao.queryForRowSet("select nvl(st_ifinput,0)st_ifinput,nvl(st_ifoqc,0)st_ifoqc,nvl(st_ifweigh,0)st_ifweigh from "+Master+".source left join "+Master+".step on sc_stepcode=st_code where sc_code='"+iResCode+"'");
 		if(rs.next()){
 			String st_ifinput=rs.getString("st_ifinput");
 			String st_ifoqc=rs.getString("st_ifinput");
@@ -1047,8 +1047,8 @@ public class MESHelperServiceImpl implements MESHelperService {
 			return rmap;
 		}
 		iSN=map.get("iSN").toString();
-		String prcode=baseDao.getFieldDataByCondition("makeserial","ms_prodcode","ms_id=(select max(ms_id) from makeserial where ms_sncode='"+iSN+"')").toString();
-		SqlRowList rs=baseDao.queryForRowSet("select pid_item,pid_value from productitem left join productitemdetail on pi_id=pid_piid " +
+		String prcode=baseDao.getFieldDataByCondition(Master+".makeserial","ms_prodcode","ms_id=(select max(ms_id) from makeserial where ms_sncode='"+iSN+"')").toString();
+		SqlRowList rs=baseDao.queryForRowSet("select pid_item,pid_value from "+Master+".productitem left join "+Master+".productitemdetail on pi_id=pid_piid " +
 				"where pi_prodcode='"+prcode+"' and pid_item is not null");
 		while(rs.next()){
 			rmap.put(rs.getString("pid_item"),rs.getString("pid_value"));
@@ -1096,9 +1096,9 @@ public class MESHelperServiceImpl implements MESHelperService {
 	public Map<Object,Object> SetStepFinish(String iMakeCode, String iSourceCode, String iSN, String iMPKind, String iResult, String iUserCode, String iErrCode)
 	{
 		String oErrMessage = null;
-		Object StepCode = baseDao.getFieldDataByCondition("Makeserial", "ms_stepcode", "ms_sncode='" + iSN + "' and ms_makecode='" + iMakeCode + "'");
+		Object StepCode = baseDao.getFieldDataByCondition(Master+".Makeserial", "ms_stepcode", "ms_sncode='" + iSN + "' and ms_makecode='" + iMakeCode + "'");
 		String CurrentStep = GetStepCodeBySource(iSourceCode);
-		Object BgCode = baseDao.getFieldDataByCondition("step", "nvl(st_badgroupcode,' ')", "st_code='" + CurrentStep + "'");
+		Object BgCode = baseDao.getFieldDataByCondition(Master+".step", "nvl(st_badgroupcode,' ')", "st_code='" + CurrentStep + "'");
 		Map<Object, Object> rmap = new HashMap<>();
 		switch (iResult)
 		{
@@ -1113,7 +1113,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 				}
 				else
 				{
-					baseDao.updateByCondition("makebad", "mb_status=-1", "mb_sncode='" + iSN + "' and mb_makecode='" + iMakeCode + "' and mb_stepcode='" + CurrentStep + "' and mb_status=0");
+					baseDao.updateByCondition(""+Master+".makebad", "mb_status=-1", "mb_sncode='" + iSN + "' and mb_makecode='" + iMakeCode + "' and mb_stepcode='" + CurrentStep + "' and mb_status=0");
 					String[] BadCode = iErrCode.split(",");
 					StringBuffer sql=new StringBuffer();
 					for (int i = 0; i < BadCode.length; i++)
@@ -1125,7 +1125,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 						}
 						int mb_id = baseDao.getSeqId("makebad_seq");
 						sql.setLength(0);
-						sql.append("insert into makebad(mb_id,mb_makecode,mb_mscode,mb_sncode,mb_inman,mb_indate,mb_stepcode");
+						sql.append("insert into "+Master+".makebad(mb_id,mb_makecode,mb_mscode,mb_sncode,mb_inman,mb_indate,mb_stepcode");
 						sql.append(",mb_sourcecode,mb_badcode,mb_badtable,mb_bgcode,mb_soncode,mb_status) select '" + mb_id + "'");
 						sql.append(",ma_code,ms_code,ms_sncode,'" + iUserCode + "',sysdate,'" + CurrentStep + "','" + iSourceCode + "','" + BadCode[i] + "','',");
 						sql.append("'" + BgCode + "',sp_soncode,'0' from make left join makeSerial on ms_makecode=ma_code left join stepProduct on ");
@@ -1133,7 +1133,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 						baseDao.execute(sql.toString());
 					}
 					//将不良的序列号的状态码设为3
-					baseDao.execute("update makeserial set ms_status='3' where ms_sncode='" + iSN + "' and ms_makecode='" + iMakeCode + "'");
+					baseDao.execute("update "+Master+".makeserial set ms_status='3' where ms_sncode='" + iSN + "' and ms_makecode='" + iMakeCode + "'");
 				}
 				break;
 			default:
@@ -1152,9 +1152,9 @@ public class MESHelperServiceImpl implements MESHelperService {
 				String ms_prodcode = ob[2].toString();
 				if (ms_status == "3")
 				{
-					String nextstepcode =baseDao.getFieldDataByCondition("craft left join craftdetail on cr_id=cd_crid ", "cd_nextstepcode", "cr_code='" + ms_craftcode + "' and cr_prodcode='" + ms_prodcode + "' and cd_stepcode='" + CurrentStep + "'").toString();
-					baseDao.updateByCondition("makeserial", "ms_status=1,ms_nextstepcode='" + nextstepcode + "'", "ms_sncode='" + iSN + "' and ms_makecode='" + iMakeCode + "'");
-					baseDao.updateByCondition("makebad", "mb_status=-1", "mb_sncode='" + iSN + "' and mb_makecode='" + iMakeCode + "'");
+					String nextstepcode =baseDao.getFieldDataByCondition(Master+".craft left join "+Master+".craftdetail on cr_id=cd_crid ", "cd_nextstepcode", "cr_code='" + ms_craftcode + "' and cr_prodcode='" + ms_prodcode + "' and cd_stepcode='" + CurrentStep + "'").toString();
+					baseDao.updateByCondition(Master+".makeserial", "ms_status=1,ms_nextstepcode='" + nextstepcode + "'", "ms_sncode='" + iSN + "' and ms_makecode='" + iMakeCode + "'");
+					baseDao.updateByCondition(Master+".makebad", "mb_status=-1", "mb_sncode='" + iSN + "' and mb_makecode='" + iMakeCode + "'");
 				}
 			}
 		}
@@ -1166,7 +1166,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		Map<Object, Object> rmap = new HashMap<>();
 		String oErrMessage=null;
 		List<String> list = new ArrayList<String>();
-		list = baseDao.callProcedureWithOut("CS_SETSTEPRESULT_TOOL", new Object[]{
+		list = baseDao.callProcedureWithOut(Master+".CS_SETSTEPRESULT_TOOL", new Object[]{
 				String.valueOf(iMakeCode),
 				String.valueOf(iSourceCode),
 				String.valueOf(iSN),