修改主板字段取值

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

@@ -1123,7 +1123,7 @@ 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 "+Master+".CRAFTMATERIAL left join "+Master+".makeserial on ms_firstsn=cm_firstsn  where (cm_barcode='"+iPCBA+"' or cm_substr='"+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")+"'");