【微浦MES】条码上料判定增加制造单明细表校验

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

@@ -337,10 +337,10 @@ public class PdaSMTServiceImpl implements PdaSMTService {
 		mapR.put("DSL_REMAINQTY", bar_remain);
 		mapR.put("DSL_FESPEC", rs.getString("psl_feeder"));
 
-		 rs=baseDao.queryForRowSet("select * from (select psl_location from(select min(psl_detno)psl_detno,psl_location||'|'||PSL_PRODCODE  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) "
-		    		+" group by psl_location||'|'||PSL_PRODCODE  order by psl_detno)) where rownum<=20 ",map.get("PS_ID"),map.get("DL_TABLE"),linecode,dl_macode,map.get("DL_TABLE"));
+		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) "
+				+" group by psl_location order by psl_detno)) where rownum<=20 ",map.get("PS_ID"),map.get("DL_TABLE"),linecode,dl_macode,map.get("DL_TABLE"));
 		if(rs.next()){
 			mapR.put("NotFeedLocation", rs.getResultList());
 		}else{
@@ -1558,10 +1558,10 @@ public class PdaSMTServiceImpl implements PdaSMTService {
 				ps_prodcode = rs.getString("dl_prodcode");
 			}
 			//未上料站位前二十条
-			rs=baseDao.queryForRowSet("select * from (select psl_location from(select min(psl_detno)psl_detno,psl_location||'|'||PSL_PRODCODE  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||'|'||PSL_PRODCODE order by psl_detno asc)) where rownum<=20 ",linecode,ps_prodcode,table,linecode,macode,table);
+			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_detno asc)) where rownum<=20 ",linecode,ps_prodcode,table,linecode,macode,table);
 				if(rs.next()){
 					mapR.put("NotFeedLocation", rs.getResultList());
 				}else{