修改工单关联信息获取

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

@@ -337,8 +337,9 @@ public class MESHelperServiceImpl implements MESHelperService {
 		String iMakeCode;
 		if(map.get("iMakeCode")!= null){
 			iMakeCode=map.get("iMakeCode").toString();
-			SqlRowList rs=baseDao.queryForRowSet("select mid_item,mid_value,sid_item,sid_value from "+Master+".makeitem left join "+Master+".makeitemdetail on mi_id=mid_miid " +
-					"left join make on mi_makecode=ma_code left join SOFTWAREITEMDETAIL on ma_custpo=sid_custpo and ma_custpodetno=sid_custpodetno " +
+			SqlRowList rs=baseDao.queryForRowSet("select distinct mid_item,mid_value,sid_item,sid_value from "+Master+".makeitem left join "+Master+".makeitemdetail on mi_id=mid_miid " +
+					"left join make on mi_makecode=ma_code left join asus_product on" +
+					" (ma_prodcode=ap_unboxedcode or ma_prodcode=ap_finishedcode) left join SOFTWAREITEMDETAIL on ap_custprodcode=sid_pn  " +
 					"where mi_makecode='"+iMakeCode+"' and mid_item is not null");
 			while(rs.next()){
 				rmap.put(rs.getString("mid_item"),rs.getString("mid_value"));