From e6ba826a7aa2432c2049359ab40bdb1ef8735b9f Mon Sep 17 00:00:00 2001 From: liuxy Date: Tue, 5 Jul 2022 10:38:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/sb/run/service/impl/DevicerunrecordServiceImpl.java | 1 - mes/qd/src/views/wms/sb/repair/devicerepair/AddDialog.vue | 3 ++- .../src/views/wms/sb/repair/devicerepairplan/AddDialog.vue | 3 ++- .../views/wms/sb/repair/devicerepairplan/CopyAddDialog.vue | 3 ++- mes/qd/src/views/wms/sb/run/devicerunrecord/index.vue | 5 +++-- .../src/views/wms/sb/upkeep/devicemaintenance/AddDialog.vue | 3 ++- .../views/wms/sb/upkeep/devicemaintenanceplan/AddDialog.vue | 3 ++- .../wms/sb/upkeep/devicemaintenanceplan/CopyAddDialog.vue | 3 ++- 8 files changed, 15 insertions(+), 9 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/run/service/impl/DevicerunrecordServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/run/service/impl/DevicerunrecordServiceImpl.java index c55b328f..622b9848 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/run/service/impl/DevicerunrecordServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/run/service/impl/DevicerunrecordServiceImpl.java @@ -145,7 +145,6 @@ public class DevicerunrecordServiceImpl implements DevicerunrecordService { json.put("oee_value", oee_value); } catch (Exception e) { json.put("oee_value", 0); - tab.insert(json); } tab.insert(json); } diff --git a/mes/qd/src/views/wms/sb/repair/devicerepair/AddDialog.vue b/mes/qd/src/views/wms/sb/repair/devicerepair/AddDialog.vue index b74369c6..e71b562e 100644 --- a/mes/qd/src/views/wms/sb/repair/devicerepair/AddDialog.vue +++ b/mes/qd/src/views/wms/sb/repair/devicerepair/AddDialog.vue @@ -54,7 +54,7 @@ - + @@ -257,6 +257,7 @@ export default { }, tableChanged2(row) { this.form.devicerecord_id = row.devicerecord_id + this.form.device_code = row.device_code }, delRow(index, rows) { rows.splice(index, 1) diff --git a/mes/qd/src/views/wms/sb/repair/devicerepairplan/AddDialog.vue b/mes/qd/src/views/wms/sb/repair/devicerepairplan/AddDialog.vue index 73fec042..dd4c6d03 100644 --- a/mes/qd/src/views/wms/sb/repair/devicerepairplan/AddDialog.vue +++ b/mes/qd/src/views/wms/sb/repair/devicerepairplan/AddDialog.vue @@ -60,7 +60,7 @@ - + @@ -238,6 +238,7 @@ export default { }, tableChanged2(row) { this.form.devicerecord_id = row.devicerecord_id + this.form.device_code = row.device_code }, delRow(index, rows) { rows.splice(index, 1) diff --git a/mes/qd/src/views/wms/sb/repair/devicerepairplan/CopyAddDialog.vue b/mes/qd/src/views/wms/sb/repair/devicerepairplan/CopyAddDialog.vue index d3893167..3be2d390 100644 --- a/mes/qd/src/views/wms/sb/repair/devicerepairplan/CopyAddDialog.vue +++ b/mes/qd/src/views/wms/sb/repair/devicerepairplan/CopyAddDialog.vue @@ -63,7 +63,7 @@ - + @@ -213,6 +213,7 @@ export default { }, tableChanged2(row) { this.form1.devicerecord_id = row.devicerecord_id + this.form1.device_code = row.device_code }, delRow(index, rows) { rows.splice(index, 1) 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 7a4c796b..eaab473a 100644 --- a/mes/qd/src/views/wms/sb/run/devicerunrecord/index.vue +++ b/mes/qd/src/views/wms/sb/run/devicerunrecord/index.vue @@ -43,7 +43,7 @@ - + @@ -149,7 +149,7 @@ import crudMaterialbase from '@/api/wms/basedata/master/materialbase' import DateRangePicker from '@/components/DateRangePicker' import DeviceDialog from '@/views/wms/sb/upkeep/devicemaintenanceplan/DeviceDialog' -const defaultForm = { runrecord_id: null, devicerecord_id: null, run_date: null, run_times: null, prepare_times: null, error_times: null, adjust_times: null, product_qty: null, nok_qty: null, oee_value: null, remark: null, create_id: null, create_name: null, create_time: null } +const defaultForm = { runrecord_id: null, device_code: null, devicerecord_id: null, run_date: null, run_times: null, prepare_times: null, error_times: null, adjust_times: null, product_qty: null, nok_qty: null, oee_value: null, remark: null, create_id: null, create_name: null, create_time: null } export default { name: 'Devicerunrecord', components: { pagination, crudOperation, rrOperation, udOperation, Treeselect, DateRangePicker, DeviceDialog }, @@ -239,6 +239,7 @@ export default { }, tableChanged2(row) { this.form.devicerecord_id = row.devicerecord_id + this.form.device_code = row.device_code } } } diff --git a/mes/qd/src/views/wms/sb/upkeep/devicemaintenance/AddDialog.vue b/mes/qd/src/views/wms/sb/upkeep/devicemaintenance/AddDialog.vue index 0862d8e9..5978ed53 100644 --- a/mes/qd/src/views/wms/sb/upkeep/devicemaintenance/AddDialog.vue +++ b/mes/qd/src/views/wms/sb/upkeep/devicemaintenance/AddDialog.vue @@ -54,7 +54,7 @@ - + @@ -238,6 +238,7 @@ export default { }, tableChanged2(row) { this.form.devicerecord_id = row.devicerecord_id + this.form.device_code = row.device_code }, delRow(index, rows) { rows.splice(index, 1) diff --git a/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/AddDialog.vue b/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/AddDialog.vue index f3124262..7f4af1e4 100644 --- a/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/AddDialog.vue +++ b/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/AddDialog.vue @@ -60,7 +60,7 @@ - + @@ -259,6 +259,7 @@ export default { }, tableChanged2(row) { this.form.devicerecord_id = row.devicerecord_id + this.form.device_code = row.device_code }, delRow(index, rows) { rows.splice(index, 1) diff --git a/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/CopyAddDialog.vue b/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/CopyAddDialog.vue index ac1b9d0c..c4e4b467 100644 --- a/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/CopyAddDialog.vue +++ b/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/CopyAddDialog.vue @@ -63,7 +63,7 @@ - + @@ -223,6 +223,7 @@ export default { }, tableChanged2(row) { this.form1.devicerecord_id = row.devicerecord_id + this.form.device_code = row.device_code }, delRow(index, rows) { rows.splice(index, 1)