关联信息查询接口修改

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

@@ -1214,13 +1214,15 @@ public class MESHelperServiceImpl implements MESHelperService {
 	{
 		Map<Object, Object> rmap = new HashMap<Object, Object>();
 		String iSN=null;
+		String iMakeCode=null;
 		String oErrMessage=null;
-		if(map.get("iSN")==null){
-			oErrMessage = "SN不能为空";
-			rmap.put("oErrMessage",oErrMessage);
-			return rmap;
+
+		if(map.get("iSN")!= null){
+			iSN=map.get("iSN").toString();
+		}
+		if(map.get("iMakeCode")!= null){
+			iMakeCode=map.get("iMakeCode").toString();
 		}
-		iSN=map.get("iSN").toString();
 		SqlRowList rs=baseDao.queryForRowSet("select ma_remark1,ma_remark2,ma_remark3,ma_remark4,ma_remark5,ma_remark6,ma_remark7,ma_remark8,ma_remark9,ma_remark10,ma_remark11,ma_remark12,ma_remark13,ma_remark14,ma_remark15,ma_remark16,ma_remark17,ma_remark18 from  "+Master+".make  " +
 				"left join "+Master+".makeserial on ms_makecode=ma_code  where ms_sncode='"+iSN+"' order by ms_id desc");
 		if(rs.next()){
@@ -1244,9 +1246,33 @@ public class MESHelperServiceImpl implements MESHelperService {
 			rmap.put("oMaremark18",rs.getString("ma_remark18"));
 			return rmap;
 		}else{
-			oErrMessage = "SN未查询到关联信息";
-			rmap.put("oErrMessage",oErrMessage);
-			return rmap;
+			rs=baseDao.queryForRowSet("select ma_remark1,ma_remark2,ma_remark3,ma_remark4,ma_remark5,ma_remark6,ma_remark7,ma_remark8,ma_remark9,ma_remark10,ma_remark11,ma_remark12,ma_remark13,ma_remark14,ma_remark15,ma_remark16,ma_remark17,ma_remark18 from  "+Master+".make  " +
+					"  where ma_code='"+iMakeCode+"'");
+			if(rs.next()){
+				rmap.put("oMaremark1",rs.getString("ma_remark1"));
+				rmap.put("oMaremark2",rs.getString("ma_remark2"));
+				rmap.put("oMaremark3",rs.getString("ma_remark3"));
+				rmap.put("oMaremark4",rs.getString("ma_remark4"));
+				rmap.put("oMaremark5",rs.getString("ma_remark5"));
+				rmap.put("oMaremark6",rs.getString("ma_remark6"));
+				rmap.put("oMaremark7",rs.getString("ma_remark7"));
+				rmap.put("oMaremark8",rs.getString("ma_remark8"));
+				rmap.put("oMaremark9",rs.getString("ma_remark9"));
+				rmap.put("oMaremark10",rs.getString("ma_remark10"));
+				rmap.put("oMaremark11",rs.getString("ma_remark11"));
+				rmap.put("oMaremark12",rs.getString("ma_remark12"));
+				rmap.put("oMaremark13",rs.getString("ma_remark13"));
+				rmap.put("oMaremark14",rs.getString("ma_remark14"));
+				rmap.put("oMaremark15",rs.getString("ma_remark15"));
+				rmap.put("oMaremark16",rs.getString("ma_remark16"));
+				rmap.put("oMaremark17",rs.getString("ma_remark17"));
+				rmap.put("oMaremark18",rs.getString("ma_remark18"));
+				return rmap;
+			}else {
+				oErrMessage = "未查询到关联信息";
+				rmap.put("oErrMessage",oErrMessage);
+				return rmap;
+			}
 		}
 	}