添加参数记录返回

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

@@ -313,10 +313,12 @@ 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 from "+Master+".makeitem left join "+Master+".makeitemdetail on mi_id=mid_miid " +
+			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 " +
 					"where mi_makecode='"+iMakeCode+"' and mid_item is not null");
 			while(rs.next()){
 				rmap.put(rs.getString("mid_item"),rs.getString("mid_value"));
+				rmap.put(rs.getString("sid_item"),rs.getString("sid_value"));
 			}
 		}else {
 			iSN=map.get("iSN").toString();
@@ -326,10 +328,12 @@ public class MESHelperServiceImpl implements MESHelperService {
 				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");
+			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 " +
+					"where mi_makecode='"+iMakeCode+"' and mid_item is not null");
 			while(rs.next()){
 				rmap.put(rs.getString("mid_item"),rs.getString("mid_value"));
+				rmap.put(rs.getString("sid_item"),rs.getString("sid_value"));
 			}
 		}
 		return rmap;