From 685609114a981b58256d32da6a261d1c9dc4d651 Mon Sep 17 00:00:00 2001 From: zds <2388969634@qq.com> Date: Tue, 25 Oct 2022 20:38:45 +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 --- .../impl/DevicerepairmstServiceImpl.java | 46 +++++++++--------- .../wms/sb/run/wql/EM_DEVICERUNRECORD001.wql | 3 +- .../wms/basedata/em/equipmentfile/index.vue | 1 - .../wms/sb/repair/devicegridcheck/index.vue | 47 ++++++++++--------- .../wms/sb/run/devicerunrecord/PaDialog.vue | 1 + .../wms/sb/run/devicerunrecord/index.vue | 4 +- 6 files changed, 55 insertions(+), 47 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairmstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairmstServiceImpl.java index 7c5921d0..b2e5b573 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairmstServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairmstServiceImpl.java @@ -451,35 +451,39 @@ public class DevicerepairmstServiceImpl implements DevicerepairmstService { @Override @Transactional(rollbackFor = Exception.class) - public void confirmRepair(JSONObject whereJson) { + public void confirmRepair(JSONObject map) { Long currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getNickName(); WQLObject reMstTab = WQLObject.getWQLObject("EM_BI_DeviceRepairMst"); // 设备维修单主表 WQLObject reDtlTab = WQLObject.getWQLObject("EM_BI_DeviceRepairDtl"); // 设备维修单明细表 - // 1.判断维修单明细中是否完成 都为是，不是则报错 - JSONArray reDtlArr = reDtlTab.query("repair_id = '" + whereJson.getString("repair_id") + "'").getResultJSONArray(0); - if (ObjectUtil.isEmpty(reDtlArr)) throw new BadRequestException("明细为空"); - for (int i = 0; i < reDtlArr.size(); i++) { - JSONObject json = reDtlArr.getJSONObject(i); - if (!StrUtil.equals(json.getString("isfinish"), "1")) { - throw new BadRequestException("维修项目未完成"); + JSONArray rows = map.getJSONArray("rows"); + for(int m=0; m "" (file.device_code like 输入.device_code or @@ -121,7 +122,7 @@ OPTION 输入.deptIds <> "" d1.dept_id in 输入.deptIds ENDOPTION - + order by file.use_groupid,file.device_code ENDSELECT ENDQUERY ENDIF diff --git a/mes/qd/src/views/wms/basedata/em/equipmentfile/index.vue b/mes/qd/src/views/wms/basedata/em/equipmentfile/index.vue index c8bedaba..01d6827f 100644 --- a/mes/qd/src/views/wms/basedata/em/equipmentfile/index.vue +++ b/mes/qd/src/views/wms/basedata/em/equipmentfile/index.vue @@ -490,7 +490,6 @@ export default { this.changeShow = true }, querytable() { - //this.crud.toQuery() this.crud.refresh() this.handleCurrentChange() }, diff --git a/mes/qd/src/views/wms/sb/repair/devicegridcheck/index.vue b/mes/qd/src/views/wms/sb/repair/devicegridcheck/index.vue index 7f1e1a5c..5ac0f3de 100644 --- a/mes/qd/src/views/wms/sb/repair/devicegridcheck/index.vue +++ b/mes/qd/src/views/wms/sb/repair/devicegridcheck/index.vue @@ -93,7 +93,6 @@ type="success" icon="el-icon-position" size="mini" - :disabled="crud.selections.length !== 1" @click="confirmRepair" > 班组验收 @@ -102,38 +101,38 @@ - + - - - - - + + + + + - - - + + + - + - - + + - + - - + + - + @@ -251,11 +250,16 @@ export default { }, confirmRepair() { const _selectData = this.$refs.table.selection - const data = _selectData[0] - if (data.invstatus !== '06') { - return this.crud.notify('只能对结束状态的单据确认', CRUD.NOTIFICATION_TYPE.INFO) + if (_selectData.length === 0) { + return this.crud.notify('请选择需要确认的记录！', CRUD.NOTIFICATION_TYPE.INFO) } - crudDevicerepairmst.confirmRepair(data).then(res => { + for (let i = 0; i < _selectData.length; i++) { + const now = _selectData[i] + if (now.invstatus !== '06') { + return this.crud.notify('只能对结束状态的单据确认:' + now.repair_code, CRUD.NOTIFICATION_TYPE.INFO) + } + } + crudDevicerepairmst.confirmRepair({ rows: _selectData }).then(res => { this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS) this.crud.toQuery() }) @@ -376,7 +380,6 @@ export default { color: "#CCCFD6"; - } .vue-treeselect--has-value .vue-treeselect__input { diff --git a/mes/qd/src/views/wms/sb/run/devicerunrecord/PaDialog.vue b/mes/qd/src/views/wms/sb/run/devicerunrecord/PaDialog.vue index 8754f65c..a8d2850b 100644 --- a/mes/qd/src/views/wms/sb/run/devicerunrecord/PaDialog.vue +++ b/mes/qd/src/views/wms/sb/run/devicerunrecord/PaDialog.vue @@ -120,6 +120,7 @@ export default { }, close() { this.$emit('update:dialogShow', false) + this.$emit('tableChanged') }, cancel() { this.dialogVisible = false diff --git a/mes/qd/src/views/wms/sb/run/devicerunrecord/index.vue b/mes/qd/src/views/wms/sb/run/devicerunrecord/index.vue index f5f977e7..d250f930 100644 --- a/mes/qd/src/views/wms/sb/run/devicerunrecord/index.vue +++ b/mes/qd/src/views/wms/sb/run/devicerunrecord/index.vue @@ -59,7 +59,7 @@ - + @@ -161,7 +161,7 @@ - +