|
|
@@ -272,13 +272,13 @@ public class StartServiceImpl implements StartService{
|
|
|
BaseUtil.showError("不同PI号工单不允许一起报工");
|
|
|
}
|
|
|
}
|
|
|
- rs=baseDao.queryForRowSet("select nvl(max(mm_qty),0)mm_qty from MAKEMATERIAL left join MAKEMATERIALREPLACE on \n" +
|
|
|
+ rs=baseDao.queryForRowSet("select nvl(min(mm_qty),0)mm_qty from MAKEMATERIAL left join MAKEMATERIALREPLACE on \n" +
|
|
|
"mm_id=mp_mmid where mm_code in ("+allmacode+") and mm_prodcode in ("+allprodcode+")");
|
|
|
if(rs.next()){
|
|
|
Double mm_qty=rs.getDouble("mm_qty");
|
|
|
Object bhp_outqty=baseDao.getFieldDataByCondition("BEFOREHANDPROCESS","nvl(sum(bhp_outqty),0)","BHP_MAKECODE="+allmacode +" and BHP_PRODCODE='"+prods+"'" );
|
|
|
- //Object ma_qty=baseDao.getFieldDataByCondition("make","nvl(sum(ma_qty),0)","ma_code in ("+allmacode+")");
|
|
|
- if(Double.parseDouble(reportqty)+Double.parseDouble(bhp_outqty.toString())>mm_qty){
|
|
|
+ Object ma_qty=baseDao.getFieldDataByCondition("make","nvl(sum(ma_qty),0)","ma_code in ("+allmacode+")");
|
|
|
+ if(Double.parseDouble(reportqty)+Double.parseDouble(bhp_outqty.toString())>Double.parseDouble(ma_qty.toString()) && Math.ceil(mm_qty)==mm_qty){
|
|
|
BaseUtil.showError("预加工已经报工"+bhp_outqty+"加本次报工数量"+reportqty+"超出工单数量");
|
|
|
}
|
|
|
}
|
