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 @@ + + 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 @@ +