接口修改提交

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

@@ -151,7 +151,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		iResCode=map.get("iResCode").toString();
 		iMo=map.get("iMo").toString();
 		List<String> list = new ArrayList<String>();
-		list = baseDao.callProcedureWithOut("CS_CHECKSTEPSNANDMACODE", new Object[]{
+		list = baseDao.callProcedureWithOut(Master+".CS_CHECKSTEPSNANDMACODE", new Object[]{
 				String.valueOf(iMo),
 				String.valueOf(iResCode),
 				String.valueOf(iSN),
@@ -159,7 +159,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		}, new Integer[]{1, 2, 3, 4}, new Integer[]{5, 6, 7});
 		oErrMessage=list.get(2);
 
-		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 = "";
@@ -190,10 +190,10 @@ public class MESHelperServiceImpl implements MESHelperService {
 			return rmap;
 		}
 		iPCBA=map.get("iPCBA").toString();
-		SqlRowList rs=baseDao.queryForRowSet("select nvl(max(ms_id),0)ms_id from CRAFTMATERIAL left join makeserial on ms_firstsn=cm_firstsn  where cm_barcode='"+iPCBA+"' and nvl(cm_status,0)<>-1 order by cm_id desc");
+		SqlRowList rs=baseDao.queryForRowSet("select nvl(max(ms_id),0)ms_id from "+Master+".CRAFTMATERIAL left join "+Master+".makeserial on ms_firstsn=cm_firstsn  where cm_barcode='"+iPCBA+"' and nvl(cm_status,0)<>-1 order by cm_id desc");
 		if(rs.next()){
 			if(!rs.getString("ms_id").equals("0")){
-				rs=baseDao.queryForRowSet("select ma_bios,ma_ec,ms_sncode,ma_hardware from makeserial left join make on ms_makecode=ma_code where ms_id='"+rs.getString("ms_id")+"'");
+				rs=baseDao.queryForRowSet("select ma_bios,ma_ec,ms_sncode,ma_hardware from "+Master+".makeserial left join "+Master+".make on ms_makecode=ma_code where ms_id='"+rs.getString("ms_id")+"'");
 				if (rs.next()){
 					rmap.put("oSN",rs.getString("ms_sncode"));
 					rmap.put("oBIOS",rs.getString("ma_bios"));
@@ -889,19 +889,19 @@ public class MESHelperServiceImpl implements MESHelperService {
 			return rmap;
 		}
 		String iSN=map.get("iSN").toString();
-		Object iMakecode=baseDao.getFieldDataByCondition("makeserial","ms_makecode","ms_id=(select max(ms_id) from makeserial where ms_sncode='"+iSN+"')");
+		Object iMakecode=baseDao.getFieldDataByCondition(""+Master+".makeserial","ms_makecode","ms_id=(select max(ms_id) from "+Master+".makeserial where ms_sncode='"+iSN+"')");
 		if(iMakecode==null){
 			oErrMessage = iSN+"无关联工单";
 			rmap.put("oErrMessage",oErrMessage);
 			return rmap;
 		}
 		//之前有获取过的
-		SqlRowList rs=baseDao.queryForRowSet("select msl_sncode from makesnlist where msl_beforesn='"+iSN+"'");
+		SqlRowList rs=baseDao.queryForRowSet("select msl_sncode from "+Master+".makesnlist where msl_beforesn='"+iSN+"'");
 		if(rs.next()){
 			rmap.put("msl_sncode",rs.getString("msl_sncode"));
 			return rmap;
 		}
-		rs=baseDao.queryForRowSet("select msl_sncode,msl_id from makesnlist where msl_makecode='"+iMakecode+"' and msl_type='after' and nvl(msl_status,0)=0 order by msl_sncode");
+		rs=baseDao.queryForRowSet("select msl_sncode,msl_id from "+Master+".makesnlist where msl_makecode='"+iMakecode+"' and msl_type='after' and nvl(msl_status,0)=0 order by msl_sncode");
 		if(rs.next()){
 			String msl_id=rs.getString("msl_id");
 			String msl_sncode=rs.getString("msl_sncode");
@@ -924,7 +924,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 			return rmap;
 		}
 		String iSN=map.get("iSN").toString();
-		Object iMakecode=baseDao.getFieldDataByCondition("makeserial","ms_makecode","ms_id=(select max(ms_id) from makeserial where ms_sncode='"+iSN+"')");
+		Object iMakecode=baseDao.getFieldDataByCondition(Master+".makeserial","ms_makecode","ms_id=(select max(ms_id) from "+Master+".makeserial where ms_sncode='"+iSN+"')");
 		if(iMakecode==null){
 			oErrMessage = iSN+"无关联工单";
 			rmap.put("oErrMessage",oErrMessage);