From 7c2fe0ea60802423bd751ab1fb865774acd19357 Mon Sep 17 00:00:00 2001 From: zds <2388969634@qq.com> Date: Thu, 17 Nov 2022 14:44:42 +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 --- .../ql/service/impl/PhysicalMstServiceImpl.java | 15 --------------- .../src/views/wms/ql/physicalMstConfirm/index.vue | 11 ++++++++++- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/PhysicalMstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/PhysicalMstServiceImpl.java index fab0ed40..f76f33d3 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/PhysicalMstServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/PhysicalMstServiceImpl.java @@ -355,21 +355,6 @@ public class PhysicalMstServiceImpl implements PhysicalMstService { } } - /** - * 判断一级质检单主表明细表状态是否为质检中 不是则更新为质检中 - */ - /* JSONObject jsonSheetDtl = sheetDtlTab.query("material_id = '" + form.getString("material_id") + "' and pcsn = '" + form.getString("pcsn") + "'").uniqueResult(0); - JSONObject jsonSheetMst = sheetMstTab.query("inspection_id = '" + jsonSheetDtl.getString("inspection_id") + "'").uniqueResult(0); - - if (!StrUtil.equals(jsonSheetDtl.getString("bill_status"), "30")) { - jsonSheetDtl.put("bill_status", "30"); - sheetDtlTab.update(jsonSheetDtl); - } - if (!StrUtil.equals(jsonSheetMst.getString("bill_status"), "30")) { - jsonSheetMst.put("bill_status", "30"); - sheetMstTab.update(jsonSheetMst); - }*/ - } diff --git a/mes/qd/src/views/wms/ql/physicalMstConfirm/index.vue b/mes/qd/src/views/wms/ql/physicalMstConfirm/index.vue index 5d28958f..f221318f 100644 --- a/mes/qd/src/views/wms/ql/physicalMstConfirm/index.vue +++ b/mes/qd/src/views/wms/ql/physicalMstConfirm/index.vue @@ -150,6 +150,7 @@ type="success" icon="el-icon-refresh" size="mini" + :disabled="open_flag" @click="phySync" > 理化同步 @@ -315,6 +316,7 @@ export default { materShow: false, materType: '11', visiable1: false, + open_flag: false, inspection_id: null, statusList: [], permission: { @@ -441,9 +443,16 @@ export default { const data = { 'data': _selectData } + this.open_flag = true + this.crud.loading = true crudPhysicalMst.hpySync(data).then(res => { - this.crud.toQuery() this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS) + this.crud.loading = false + this.open_flag = false + this.crud.toQuery() + }).catch(() => { + this.crud.loading = false + this.open_flag = false }) } }