|
|
@@ -1115,14 +1115,14 @@ public class PdaOutMaterialServiceImpl implements PdaOutMaterialService {
|
|
|
// throw new APIErrorException(APIErrorCode.DATA_NOT_FOUND,"没有需要采集的明细，或已经采集完成");
|
|
|
// }*/
|
|
|
sql=" select * from (select pd_prodcode,pr_detail,pr_spec,pd_outqty,pd_restqty,pr_zxbzs,sum(bar_remain) bar_remain,nvl(to_char(nvl(bar_madedate,bar_indate),'YYYYMMDD'),' ') DC from " +
|
|
|
- " (SELECT pd_prodcode,pr_detail,pr_spec,pd_outqty,pd_outqty-nvl(pdaqty,0)pd_restqty,pr_zxbzs " +
|
|
|
- " FROM (SELECT max(pd_prodcode)pd_prodcode,sum(pd_outqty)pd_outqty " +
|
|
|
+ " (SELECT pd_pdno,pd_prodcode,pr_detail,pr_spec,pd_outqty,pd_outqty-nvl(pdaqty,0)pd_restqty,pr_zxbzs " +
|
|
|
+ " FROM (SELECT max(pd_pdno)pd_pdno,max(pd_prodcode)pd_prodcode,sum(pd_outqty)pd_outqty " +
|
|
|
" from prodiodetail where pd_piid in("+ids+") group by pd_prodcode) A " +
|
|
|
" left join (select bi_prodcode,nvl(sum(nvL(pdaqty,0)),0)pdaqty from SCM_BARCODEIO_OUT_VIEW2 where BI_PIID in("+ids+") " +
|
|
|
" group by bi_prodcode) on bi_prodcode=pd_prodcode left join product on pr_code=pd_prodcode where pd_outqty>nvl(pdaqty,0))T " +
|
|
|
" LEFT JOIN barcode ON pd_prodcode=bar_prodcode " +
|
|
|
- " where nvl(bar_outno,' ')=' ' AND bar_status=1 group by pd_prodcode, pr_detail, pr_spec, pd_outqty, pd_restqty, " +
|
|
|
- "pr_zxbzs, nvl(to_char(nvl(bar_madedate,bar_indate),'YYYYMMDD'),' ') order by pd_prodcode desc,nvl(to_char(nvl(bar_madedate,bar_indate),'YYYYMMDD'),' ') asc) where rownum = 1 ";
|
|
|
+ " where nvl(bar_outno,' ')=' ' AND bar_status=1 group by pd_pdno,pd_prodcode, pr_detail, pr_spec, pd_outqty, pd_restqty, " +
|
|
|
+ "pr_zxbzs, nvl(to_char(nvl(bar_madedate,bar_indate),'YYYYMMDD'),' ') order by to_number(pd_pdno),nvl(to_char(nvl(bar_madedate,bar_indate),'YYYYMMDD'),' ') asc) where rownum = 1 ";
|
|
|
SqlRowList rs = baseDao.queryForRowSet(sql);
|
|
|
if(rs.next()){
|
|
|
return rs.getCurrentMap();
|
