|
|
@@ -4290,11 +4290,11 @@ public class MESServiceImpl implements MESService {
|
|
|
}else{
|
|
|
sql = "select md_detno,md_mmcode,md_prodcode from MakeScrapDetail left join makematerial on md_mmcode=mm_code and md_mmdetno=mm_detno left join make on mm_maid=ma_id where md_msid="
|
|
|
+ ms_id ;
|
|
|
- if(baseDao.isDBSetting("Make!Base", "allowChangeAfterCom")){
|
|
|
+ /*if(baseDao.isDBSetting("Make!Base", "allowChangeAfterCom")){
|
|
|
sql = sql+ " and round(nvl(mm_allscrapqty,0),4) > round(nvl(mm_havegetqty,0)-nvl(mm_backqty,0),4) ";
|
|
|
- }else{
|
|
|
+ }else{*/
|
|
|
sql += " and round(nvl(mm_allscrapqty,0),4)>round(nvl(mm_havegetqty,0)-mm_oneuseqty*ma_madeqty,4) ";
|
|
|
- }
|
|
|
+ /*}*/
|
|
|
}
|
|
|
SqlRowList rs = baseDao.queryForRowSet(sql);
|
|
|
while (rs.next()) {
|