主板号关联工单调整

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

@@ -175,17 +175,21 @@ public class MESHelperServiceImpl implements MESHelperService {
 			return rmap;
 		}
 		iPCBA=map.get("iPCBA").toString();
-		SqlRowList rs=baseDao.queryForRowSet("select ms_firstsn,ms_sncode,ma_bios,ma_ec,ma_hardware from CRAFTMATERIAL left join make on cm_makecode=ma_code " +
-				"left join makeserial on ms_firstsn=cm_firstsn and cm_makecode=ms_makecode  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 CRAFTMATERIAL left join makeserial on ms_firstsn=cm_firstsn  where cm_barcode='"+iPCBA+"' and nvl(cm_status,0)<>-1 order by cm_id desc");
 		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"));
-		}else{
-			oErrMessage = "主板SN未查询到关联信息";
-			rmap.put("oErrMessage",oErrMessage);
-			return rmap;
+			if(!rs.getString("ms_id").equals("0")){
+				rs=baseDao("select ma_bios,ma_ec from makeserial left join 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"));
+				}
+			}else{
+				oErrMessage = "主板SN未查询到关联信息";
+				rmap.put("oErrMessage",oErrMessage);
+				return rmap;
+			}
 		}
 		return rmap;
 	}