From 974dcd616c3f3b7ab22d5192f669abac20ed9f36 Mon Sep 17 00:00:00 2001 From: "ZHOUZ\\Noble'lift" <1014987728@qq.com> Date: Wed, 29 Jun 2022 11:29:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E4=BC=A0=E3=80=81=E9=85=8D=E6=96=B9?= =?UTF-8?q?=E5=B0=8F=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/ext/erp/service/impl/WmsToErpServiceImpl.java | 4 +++- .../org/nl/pda/pdm/service/impl/PdmWorkTaskServiceImpl.java | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) 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);