修改支持账套调用

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

@@ -434,8 +434,8 @@ public class MESHelperServiceImpl implements MESHelperService {
 		}
 		String iSN=map.get("iSN").toString();
 		StringBuffer sql=new StringBuffer();
-		sql.append("select max(ms_id)ms_id from makeserial where ms_sncode in (select '" + iSN + "' from dual union select sn from ");
-		sql.append("makesnrelation where beforesn='" + iSN + "' and sn<>' '  union select beforesn from makesnrelation where sn='" + iSN + "' and beforesn<>' ')");
+		sql.append("select max(ms_id)ms_id from "+Master+".makeserial where ms_sncode in (select '" + iSN + "' from dual union select sn from ");
+		sql.append(""+Master+".makesnrelation where beforesn='" + iSN + "' and sn<>' '  union select beforesn from "+Master+".makesnrelation where sn='" + iSN + "' and beforesn<>' ')");
 		SqlRowList rs = baseDao.queryForRowSet(sql.toString());
 		String ms_id="";
 		if(rs.next()){
@@ -448,7 +448,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 				ms_id= rs.getString("ms_id");
 			}
 		}
-		Object[] oMoCode = baseDao.getFieldsDataByCondition("MakeSerial", "ms_makecode,ms_prodcode", "ms_id='" + ms_id + "'");
+		Object[] oMoCode = baseDao.getFieldsDataByCondition(Master+".MakeSerial", "ms_makecode,ms_prodcode", "ms_id='" + ms_id + "'");
 		if (oMoCode != null){
 			rmap.put("oMoCode",oMoCode[0]);
 			rmap.put("oPrCode",oMoCode[1]);
@@ -822,7 +822,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 	/// <returns></returns>
 	private String GetStepCodeBySource(String Source)
 	{
-		Object o=baseDao.getFieldDataByCondition("source", "sc_stepcode", "sc_code='" + Source + "'");
+		Object o=baseDao.getFieldDataByCondition(Master+".source", "sc_stepcode", "sc_code='" + Source + "'");
 		if(o!=null)
 			return o.toString();
 		else
@@ -1144,7 +1144,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		//不良采集为良品是更新
 		if (StepCode!=null &&StepCode.toString().equals(CurrentStep) && iResult == "OK")
 		{
-			Object[] ob = baseDao.getFieldsDataByCondition("makeserial", "ms_status,ms_craftcode,ms_prodcode", "ms_sncode='" + iSN + "' and ms_makecode='" + iMakeCode + "'");
+			Object[] ob = baseDao.getFieldsDataByCondition(Master+".makeserial", "ms_status,ms_craftcode,ms_prodcode", "ms_sncode='" + iSN + "' and ms_makecode='" + iMakeCode + "'");
 			if (ob!=null)
 			{
 				String ms_status =ob[0].toString();