|
|
@@ -532,9 +532,11 @@ public class MESServiceImpl implements MESService {
|
|
|
"values (PRODIODETAIL_SEQ.nextval," + bcpiid + ",'" + bccode + "','"+bcpiclass+"'," + detno + ",'" + itemNo +
|
|
|
"'," + qty + ",'" + warehouses2[0] + "','" + warehouses2[1] + "','" + warehouses[0] + "','" + warehouses[1] + "','"+ficmoBillNo+"',"+mmdetno+")");
|
|
|
}
|
|
|
- Object mmqty = baseDao.getFieldDataByCondition("MakeMaterial", "mm_qty", "mm_id in (" + lineId + ")");
|
|
|
- Double aDouble = Double.parseDouble(StringUtil.nvl(mmqty, "0"));
|
|
|
- qty = qty.compareTo(aDouble) > 0 ? aDouble : qty;
|
|
|
+ SqlRowList sqlRowList = baseDao.queryForRowSet("select round((mm_qty-nvl(mm_canuserepqty,0)-(nvl(mm_havegetqty,0)-nvl(mm_haverepqty,0)+(nvl(mm_returnmqty,0)-nvl(mm_repreturnmqty,0))-(nvl(mm_addqty,0)-NVL(mm_repaddqty,0)))-nvl(mm_totaluseqty,0)+NVL(mm_repqty,0))-NVL(mm_stepinqty,0),7) mmqty from MakeMaterial where mm_id in (" + lineId + ")");
|
|
|
+ if (sqlRowList.next()){
|
|
|
+ Double mmqty = sqlRowList.getGeneralDouble("mmqty");
|
|
|
+ qty = qty.compareTo(mmqty) > 0 ? mmqty : qty;
|
|
|
+ }
|
|
|
sqls.add("insert into prodiodetail (pd_id,pd_piid,pd_inoutno,pd_piclass,pd_pdno,pd_prodcode," +
|
|
|
"pd_outqty,pd_whcode,pd_whname,pd_ordercode,pd_orderdetno,pd_macode,pd_madetno) " +
|
|
|
"values (PRODIODETAIL_SEQ.nextval," + llpiid + ",'" + llcode + "','"+llpiclass+"'," + detno + ",'" + itemNo +
|
