From 3dc21c802311cd6f320445e32e09373593c496af Mon Sep 17 00:00:00 2001 From: zds <2388969634@qq.com> Date: Thu, 4 Aug 2022 11:23:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/wms/pf/service/impl/InitformulaServiceImpl.java | 4 ++++ mes/qd/src/views/wms/pf/formula/DivDialog.vue | 2 +- mes/qd/src/views/wms/pf/initformula/DivDialog.vue | 8 ++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/InitformulaServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/InitformulaServiceImpl.java index 4b461702..c28c9d43 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/InitformulaServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/InitformulaServiceImpl.java @@ -400,6 +400,10 @@ public class InitformulaServiceImpl implements InitformulaService { //是否软废 if(MaterOptTypeEnum.RD_AND_PG.getClass_idStr().contains(md_jo.getString("material_type_id"))){ JSONObject pro_jo = md_me_producmaterialext.query("material_id='"+jo.getString("material_id")+"'").uniqueResult(0); + if(pro_jo ==null){ + throw new BadRequestException("物料"+jo.getString("material_code")+" "+jo.getString("material_name")+"未设置成品物料扩展信息！"); + + } double net_rate = pro_jo.getDouble("net_rate"); RF_total = RF_total+jo.getDouble("formula_qty")*pro_jo.getDouble("net_rate")/100.0; } diff --git a/mes/qd/src/views/wms/pf/formula/DivDialog.vue b/mes/qd/src/views/wms/pf/formula/DivDialog.vue index 86ffbe75..dad6aaaa 100644 --- a/mes/qd/src/views/wms/pf/formula/DivDialog.vue +++ b/mes/qd/src/views/wms/pf/formula/DivDialog.vue @@ -877,7 +877,7 @@ export default { } for (let i = 0; i < this.tableDtl.length; i++) { if (!this.tableDtl[i].edit) { - this.crud.notify('尚有未完成编辑的副桶物料，明细序号为' + (i + 1) + '请检查！') + this.crud.notify('尚有未完成编辑的物料，明细序号为' + (i + 1) + '请检查！') return false } } diff --git a/mes/qd/src/views/wms/pf/initformula/DivDialog.vue b/mes/qd/src/views/wms/pf/initformula/DivDialog.vue index 4a5b9ca8..11fa5fe1 100644 --- a/mes/qd/src/views/wms/pf/initformula/DivDialog.vue +++ b/mes/qd/src/views/wms/pf/initformula/DivDialog.vue @@ -988,7 +988,7 @@ export default { } for (let i = 0; i < this.tableDtl.length; i++) { if (!this.tableDtl[i].edit) { - this.crud.notify('尚有未完成编辑的副桶物料，明细序号为' + (i + 1) + '请检查！') + this.crud.notify('尚有未完成编辑的主桶物料，明细序号为' + (i + 1) + '请检查！') return false } } @@ -1012,7 +1012,7 @@ export default { } for (let i = 0; i < this.tableDtl.length; i++) { if (!this.tableDtl[i].edit) { - this.crud.notify('尚有未完成编辑的副桶物料，明细序号为' + (i + 1) + '请检查！') + this.crud.notify('尚有未完成编辑的主桶物料，明细序号为' + (i + 1) + '请检查！') return false } } @@ -1077,7 +1077,7 @@ export default { } for (let i = 0; i < this.tableDtl.length; i++) { if (!this.tableDtl[i].edit) { - this.crud.notify('尚有未完成编辑的副桶物料，明细序号为' + (i + 1) + '请检查！') + this.crud.notify('尚有未完成编辑的主桶物料，明细序号为' + (i + 1) + '请检查！') return false } } @@ -1101,7 +1101,7 @@ export default { } for (let i = 0; i < this.tableDtl.length; i++) { if (!this.tableDtl[i].edit) { - this.crud.notify('尚有未完成编辑的副桶物料，明细序号为' + (i + 1) + '请检查！') + this.crud.notify('尚有未完成编辑的主桶物料，明细序号为' + (i + 1) + '请检查！') return false } }