再次获取账套

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

@@ -35,9 +35,12 @@ public class MESHelperServiceImpl implements MESHelperService {
 
 	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=AE_MASTER;
 		Map<Object, Object> map = BaseUtil.parseFormStoreToMap(data);
@@ -326,6 +329,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 	}
 
 	private Map<Object,Object> GetInfoByMaterial(JSONObject map){
+		Object AE_MASTER = baseDao.getFieldDataByCondition("APIEMPLOYEE", "AE_MASTER", "AE_KEY='" + accessKey1 + "'");
 		Map<Object, Object> rmap = new HashMap<Object, Object>();
 		String iPCBA=null;
 		String oErrMessage=null;
@@ -335,16 +339,16 @@ 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 "+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");
+		SqlRowList rs=baseDao.queryForRowSet("select nvl(max(ms_id),0)ms_id from "+AE_MASTER+".CRAFTMATERIAL left join "+AE_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 "+Master+".makeserial left join "+Master+".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 "+AE_MASTER+".makeserial left join "+AE_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"));
 					rmap.put("oEC",rs.getString("ma_ec"));
 					rmap.put("oHardWare",rs.getString("ma_hardware"));
-					rmap.put("oMaster",Master);
+					rmap.put("oMaster",AE_MASTER);
 				}
 			}else{
 				oErrMessage = "主板SN未查询到关联信息";