From 0b40cd9ff0700df9f56b6f3658f304355a1b4667 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Fri, 29 Jul 2022 16:01:16 +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

---
 .../service/impl/DevicerepairplanmstServiceImpl.java   | 10 ++++++++++
 .../src/views/wms/sb/repair/devicerepairplan/index.vue |  2 ++
 .../wms/sb/upkeep/devicemaintenanceplan/index.vue      |  1 +
 3 files changed, 13 insertions(+)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairplanmstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairplanmstServiceImpl.java
index c39db67e..b1e6c58f 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairplanmstServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairplanmstServiceImpl.java
@@ -216,9 +216,19 @@ public class DevicerepairplanmstServiceImpl implements DevicerepairplanmstServic
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void changeActive(JSONObject json) {
+        Long currentUserId = SecurityUtils.getCurrentUserId();
+        String nickName = SecurityUtils.getNickName();
+        String now = DateUtil.now();
         String is_active = "1";
         if (StrUtil.equals("1", json.getString("is_active"))) {
             is_active = "0";
+            json.put("confirm_optid", "");
+            json.put("confirm_optname", "");
+            json.put("confirm_time", "");
+        } else {
+            json.put("confirm_optid", currentUserId);
+            json.put("confirm_optname", nickName);
+            json.put("confirm_time", now);
         }
         json.put("is_active", is_active);
         WQLObject.getWQLObject("EM_BI_DeviceRepairPlanMst").update(json);
diff --git a/mes/qd/src/views/wms/sb/repair/devicerepairplan/index.vue b/mes/qd/src/views/wms/sb/repair/devicerepairplan/index.vue
index fd04c84c..87091fea 100644
--- a/mes/qd/src/views/wms/sb/repair/devicerepairplan/index.vue
+++ b/mes/qd/src/views/wms/sb/repair/devicerepairplan/index.vue
@@ -111,6 +111,8 @@
         <el-table-column prop="device_name" label="设备名称" show-overflow-tooltip />
         <el-table-column prop="maintenancecycle" label="维修周期" :formatter="formatMainName" />
         <el-table-column prop="plan_start_date" label="计划开始日期" width="120px" />
+        <el-table-column prop="real_start_date" label="实际开始日期" width="120px" />
+        <el-table-column prop="real_end_date" label="实际结束日期" width="120px" />
         <el-table-column prop="create_name" label="创建人" />
         <el-table-column prop="create_time" label="创建时间" width="150px" />
         <el-table-column prop="confirm_optname" label="审核人" />
diff --git a/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/index.vue b/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/index.vue
index 4ac316bb..c2f0fc17 100644
--- a/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/index.vue
+++ b/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/index.vue
@@ -111,6 +111,7 @@
         <el-table-column prop="device_name" label="设备名称" />
         <el-table-column prop="maintenancecycle" label="保养周期" :formatter="formatMainName"/>
         <el-table-column prop="plan_start_date" label="计划开始日期" width="150px" />
+        <el-table-column prop="real_start_date" label="实际开始日期" width="150px" />
         <el-table-column prop="real_end_date" label="实际结束日期" width="150px" />
         <el-table-column prop="remark" label="备注" />
         <el-table-column prop="create_name" label="创建人姓名" />