【微浦MES】湿敏条码修改

(cherry picked from commit 523692c)

src/com/uas/mes/pda/service/impl/PdaSMTServiceImpl.java

@@ -1392,7 +1392,7 @@ public class PdaSMTServiceImpl implements PdaSMTService {
 		 rs=baseDao.queryForRowSet("select * from (select psl_location from(select min(psl_detno)psl_detno,psl_location from productsmtlocation "
 		    		+" where psl_psid=? and psl_table=? and  psl_location not in (select distinct dsl_location from devsmtlocation where "
 		    		+" dsl_linecode=? and dsl_makecode=? and dsl_table=?  and dsl_status=0 and dsl_ifcheck = -1) "
-		    		+" group by psl_location order by psl_detno)) where rownum<=20 ",ps_id,table,linecode,ma_code,table);
+		    		+" group by psl_location order by psl_detno asc)) where rownum<=20 ",ps_id,table,linecode,ma_code,table);
 		if(rs.next()){
 			mapR.put("NotCheckLocation", rs.getResultList());
 		}else{
@@ -1552,7 +1552,7 @@ public class PdaSMTServiceImpl implements PdaSMTService {
 			rs=baseDao.queryForRowSet("select * from (select psl_location from(select min(psl_detno)psl_detno,psl_location from productsmtlocation left join productsmt on ps_id = psl_psid"
 		    		+" where ps_linecode=? and ps_prodcode = ? and psl_table=? and  psl_location not in (select distinct dsl_location from devsmtlocation where "
 		    		+" dsl_linecode=? and dsl_makecode=? and dsl_table=?  and dsl_status=0) "
-		    		+" group by psl_location order by psl_location)) where rownum<=20 ",linecode,ps_prodcode,table,linecode,macode,table);
+		    		+" group by psl_location order by psl_id asc)) where rownum<=20 ",linecode,ps_prodcode,table,linecode,macode,table);
 				if(rs.next()){
 					mapR.put("NotFeedLocation", rs.getResultList());
 				}else{