From b4c13db95aad89adc9e48c8e5e36f9f135458d1f Mon Sep 17 00:00:00 2001 From: "ZHOUZ\\Noble'lift" <1014987728@qq.com> Date: Wed, 24 Aug 2022 10:33:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pda/st/in/service/impl/HandNewMaterialServiceImpl.java | 5 +++++ .../java/org/nl/wms/basedata/master/wql/QMD_ME_MATERIAL.wql | 1 + 2 files changed, 6 insertions(+) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/service/impl/HandNewMaterialServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/service/impl/HandNewMaterialServiceImpl.java index 868baaf9..4c88ab25 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/service/impl/HandNewMaterialServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/service/impl/HandNewMaterialServiceImpl.java @@ -575,6 +575,11 @@ public class HandNewMaterialServiceImpl implements HandNewMaterialService { bucket_now.put("base_bill_code", row.get("base_bill_code")); bucket_now.put("base_bill_table", row.get("base_bill_table")); if (StrUtil.isNotEmpty((String) row.get("source_billdtl_id"))) { + //查询该单据是否存在 + JSONObject pro_jo = WQLObject.getWQLObject("PCS_IF_PurchaseOrderProc").query("id = '" + row.get("source_billdtl_id") + "'").uniqueResult(0); + if (ObjectUtil.isNotEmpty(pro_jo)){ + throw new PdaRequestException("采购订单数据发生变化，请重新选择选择明细生成入库单！"); + } HashMap proc_map = new HashMap<>(); proc_map.put("proc_status", "02"); proc_map.put("update_optid", currentUserId + ""); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_ME_MATERIAL.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_ME_MATERIAL.wql index fe727be9..8a278daa 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_ME_MATERIAL.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_ME_MATERIAL.wql @@ -57,6 +57,7 @@ class.class_code, class.class_name, unit_name, + mb.ext_id, producmaterialext.standard_weight, unit_name as base_unit_id_name, producmaterialext.product_series,