diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/ext/erp/service/impl/WmsToErpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/ext/erp/service/impl/WmsToErpServiceImpl.java index f2a4ca73..dd6cad06 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/ext/erp/service/impl/WmsToErpServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/ext/erp/service/impl/WmsToErpServiceImpl.java @@ -292,7 +292,9 @@ public class WmsToErpServiceImpl implements WmsToErpService { JSONObject purchase_jo = purchase_proc_wql.query("PURCHASE_ID_B = '" + PURCHASE_ID_B + "'").uniqueResult(0); if (ObjectUtil.isNotEmpty(purchase_jo)) { - if (purchase_jo.getString("proc_status").equals("01")) { + //判断是否生成了入库单 + JSONObject dtl = WQLObject.getWQLObject("st_ivt_iostorinvdtl").query("source_billdtl_id = '"+purchase_jo.getString("id")+"'").uniqueResult(0); + if (purchase_jo.getString("proc_status").equals("01") && ObjectUtil.isEmpty(dtl)) { //删除 purchase_wql.delete("PURCHASE_ID_B = '" + PURCHASE_ID_B + "'"); purchase_proc_wql.delete("PURCHASE_ID_B = '" + PURCHASE_ID_B + "'"); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/service/impl/PdmWorkTaskServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/service/impl/PdmWorkTaskServiceImpl.java index cb6be57b..9a270734 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/service/impl/PdmWorkTaskServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/service/impl/PdmWorkTaskServiceImpl.java @@ -1361,9 +1361,9 @@ public class PdmWorkTaskServiceImpl implements PdmWorkTaskService { double need_qty = jo.getDoubleValue("need_qty"); double storage_qty = jo.getDoubleValue("storage_qty"); if (need_qty > storage_qty) { - jo.put("needout_qty", storage_qty); + jo.put("needout_qty", NumberUtil.roundStr(storage_qty,4)); } else { - jo.put("needout_qty", need_qty); + jo.put("needout_qty", NumberUtil.roundStr(need_qty,4)); } WQLObject.getWQLObject("PDM_BI_FormulaDtlJob").insert(jo);