关联信息查询接口修改

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

@@ -186,22 +186,32 @@ public class MESHelperServiceImpl implements MESHelperService {
 		Map<Object, Object> rmap = new HashMap<Object, Object>();
 		String iSN=null;
 		String oErrMessage=null;
-		if(map.get("iSN")==null){
-			oErrMessage = "SN不能为空";
-			rmap.put("oErrMessage",oErrMessage);
-			return rmap;
-		}
-		iSN=map.get("iSN").toString();
-		Object makecode=baseDao.getFieldDataByCondition(Master+".makeserial","ms_makecode","ms_id=(select max(ms_id) from "+Master+".makeserial where ms_sncode='"+iSN+"')");
-		if(makecode==null){
-			oErrMessage = "SN不存在";
-			rmap.put("oErrMessage",oErrMessage);
-			return rmap;
-		}
-		SqlRowList rs=baseDao.queryForRowSet("select mid_item,mid_value from "+Master+".makeitem left join "+Master+".makeitemdetail on mi_id=mid_miid " +
-				"where mi_makecode='"+makecode+"' and mid_item is not null");
-		while(rs.next()){
-			rmap.put(rs.getString("mid_item"),rs.getString("mid_value"));
+//		if(map.get("iSN")==null){
+//			oErrMessage = "SN不能为空";
+//			rmap.put("oErrMessage",oErrMessage);
+//			return rmap;
+//		}
+		String iMakeCode;
+		if(map.get("iMakeCode")!= null){
+			iMakeCode=map.get("iMakeCode").toString();
+			SqlRowList rs=baseDao.queryForRowSet("select mid_item,mid_value from "+Master+".makeitem left join "+Master+".makeitemdetail on mi_id=mid_miid " +
+					"where mi_makecode='"+iMakeCode+"' and mid_item is not null");
+			while(rs.next()){
+				rmap.put(rs.getString("mid_item"),rs.getString("mid_value"));
+			}
+		}else {
+			iSN=map.get("iSN").toString();
+			Object makecode=baseDao.getFieldDataByCondition(Master+".makeserial","ms_makecode","ms_id=(select max(ms_id) from "+Master+".makeserial where ms_sncode='"+iSN+"')");
+			if(makecode==null){
+				oErrMessage = "SN不存在";
+				rmap.put("oErrMessage",oErrMessage);
+				return rmap;
+			}
+			SqlRowList rs=baseDao.queryForRowSet("select mid_item,mid_value from "+Master+".makeitem left join "+Master+".makeitemdetail on mi_id=mid_miid " +
+					"where mi_makecode='"+makecode+"' and mid_item is not null");
+			while(rs.next()){
+				rmap.put(rs.getString("mid_item"),rs.getString("mid_value"));
+			}
 		}
 		return rmap;
     /*if(rs.next()){