修改只返回信息的数据

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

@@ -558,13 +558,13 @@ public class MESHelperServiceImpl implements MESHelperService {
 		ma_custname=map.get("MA_CUSTNAME").toString();
 		TIME_BEGIN=map.get("TIME_BEGIN").toString();
 		TIME_END=map.get("TIME_END").toString();
-		SqlRowList rs=baseDao.queryForRowSet("select sn from DeliveryIn " +
+		SqlRowList rs=baseDao.queryForRowSet("select sn from  (select sn from DeliveryIn " +
 				" where DELIVERY between to_date('"+TIME_BEGIN+"','yyyy-mm-dd') " +
 				"and to_date('"+TIME_END+"','yyyy-mm-dd') union select sn from Deliveryout " +
 				"where DELIVERY between to_date('"+TIME_BEGIN+"','yyyy-mm-dd') " +
 				"and to_date('"+TIME_END+"','yyyy-mm-dd') union select asd_sn from aftersaledet " +
 				"where ASD_FINISHTIME  between to_date('"+TIME_BEGIN+"','yyyy-mm-dd') " +
-				"and to_date('"+TIME_END+"','yyyy-mm-dd') ");
+				"and to_date('"+TIME_END+"','yyyy-mm-dd') ) left join makeserial on ms_sncode=sn where substr(ms_makecode,0,2)='XX' ");
 		rmap.put("data",rs.getResultList());
 		return rmap;
 	}