修改GetBatteryBySN，GetLCDBySN

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

@@ -1286,7 +1286,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		iSN=map.get("iSN").toString();
 		SqlRowList rs=baseDao.queryForRowSet("select ms_firstsn from  "+Master+".makeserial  where ms_sncode='"+iSN+"' order by ms_id desc");
 		if(rs.next()){
-			rs=baseDao.queryForRowSet("select cm_barcode from "+Master+".craftmaterial left join "+Master+".product on cm_fsoncode=pr_code " +
+			rs=baseDao.queryForRowSet("select LISTAGG((cm_barcode),'||') WITHIN GROUP (ORDER BY cm_sncode)cm_barcode from "+Master+".craftmaterial left join "+Master+".product on cm_fsoncode=pr_code " +
 					"where cm_firstsn='"+rs.getString("ms_firstsn")+"' and cm_status=0 and (pr_kind2='屏')");
 			if(rs.next()){
 				rmap.put("oPCBA",rs.getString("cm_barcode"));
@@ -1307,7 +1307,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		iSN=map.get("iSN").toString();
 		SqlRowList rs=baseDao.queryForRowSet("select ms_firstsn from  "+Master+".makeserial  where ms_sncode='"+iSN+"' order by ms_id desc");
 		if(rs.next()){
-			rs=baseDao.queryForRowSet("select cm_barcode from "+Master+".craftmaterial left join "+Master+".product on cm_fsoncode=pr_code " +
+			rs=baseDao.queryForRowSet("select LISTAGG((cm_barcode),'||') WITHIN GROUP (ORDER BY cm_sncode)cm_barcode from "+Master+".craftmaterial left join "+Master+".product on cm_fsoncode=pr_code " +
 					"where cm_firstsn='"+rs.getString("ms_firstsn")+"' and cm_status=0 and (pr_kind2='电池')");
 			if(rs.next()){
 				rmap.put("oPCBA",rs.getString("cm_barcode"));