|
|
@@ -732,7 +732,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 replace(wm_concat(cm_barcode),',','||')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_detail like '%主板 PCBA%' or pr_detail like '%主板%')");
|
|
|
if(rs.next()){
|
|
|
rmap.put("oPCBA",rs.getString("cm_barcode"));
|