root/wuHanXinRui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码更新

Browse Source
This commit is contained in:
liuxy
2022-07-29 16:01:16 +08:00
parent 9b7ee43bb2
commit 0b40cd9ff0
3 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairplanmstServiceImpl.java
View File

@@ -216,9 +216,19 @@ public class DevicerepairplanmstServiceImpl implements DevicerepairplanmstServic
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void changeActive(JSONObject json) { public void changeActive(JSONObject json) {
Long currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getNickName();
String now = DateUtil.now();
String is_active = "1"; String is_active = "1";
if (StrUtil.equals("1", json.getString("is_active"))) { if (StrUtil.equals("1", json.getString("is_active"))) {
is_active = "0"; 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); json.put("is_active", is_active);
WQLObject.getWQLObject("EM_BI_DeviceRepairPlanMst").update(json); WQLObject.getWQLObject("EM_BI_DeviceRepairPlanMst").update(json);

2
mes/qd/src/views/wms/sb/repair/devicerepairplan/index.vue
View File

@@ -111,6 +111,8 @@
<el-table-column prop="device_name" label="设备名称" show-overflow-tooltip /> <el-table-column prop="device_name" label="设备名称" show-overflow-tooltip />
<el-table-column prop="maintenancecycle" label="维修周期" :formatter="formatMainName" /> <el-table-column prop="maintenancecycle" label="维修周期" :formatter="formatMainName" />
<el-table-column prop="plan_start_date" label="计划开始日期" width="120px" /> <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_name" label="创建人" />
<el-table-column prop="create_time" label="创建时间" width="150px" /> <el-table-column prop="create_time" label="创建时间" width="150px" />
<el-table-column prop="confirm_optname" label="审核人" /> <el-table-column prop="confirm_optname" label="审核人" />

1
mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/index.vue
View File

@@ -111,6 +111,7 @@
<el-table-column prop="device_name" label="设备名称" /> <el-table-column prop="device_name" label="设备名称" />
<el-table-column prop="maintenancecycle" label="保养周期" :formatter="formatMainName"/> <el-table-column prop="maintenancecycle" label="保养周期" :formatter="formatMainName"/>
<el-table-column prop="plan_start_date" label="计划开始日期" width="150px" /> <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="real_end_date" label="实际结束日期" width="150px" />
<el-table-column prop="remark" label="备注" /> <el-table-column prop="remark" label="备注" />
<el-table-column prop="create_name" label="创建人姓名" /> <el-table-column prop="create_name" label="创建人姓名" />