From ae70f3bf5ec3169ccd1b0f845981cf419daaa108 Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期三, 10 一月 2024 10:56:15 +0800
Subject: [PATCH] 设备档案-工序字段修改
---
jcdm-main/src/main/java/com/jcdm/main/em/equipmentArchives/domain/EmEquipmentArchives.java | 12 ++++++------
jcdm-main/src/main/resources/mapper/em/equipmentArchives/EmEquipmentArchivesMapper.xml | 10 +++++-----
jcdm-ui/src/views/main/em/equipmentArchives/index.vue | 4 ++--
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/em/equipmentArchives/domain/EmEquipmentArchives.java b/jcdm-main/src/main/java/com/jcdm/main/em/equipmentArchives/domain/EmEquipmentArchives.java
index 7c1d0d5..2edf9f0 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/em/equipmentArchives/domain/EmEquipmentArchives.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/em/equipmentArchives/domain/EmEquipmentArchives.java
@@ -56,7 +56,7 @@
/** 宸ュ簭缂栫爜 */
@Excel(name = "宸ュ簭缂栫爜")
- private String processes;
+ private String processesCode;
/** 璁惧鐘舵�� */
@Excel(name = "璁惧鐘舵��")
@@ -176,14 +176,14 @@
{
return lineCode;
}
- public void setProcesses(String processes)
+ public void setProcessesCode(String processesCode)
{
- this.processes = processes;
+ this.processesCode = processesCode;
}
- public String getProcesses()
+ public String getProcessesCode()
{
- return processes;
+ return processesCode;
}
public void setStatus(String status)
{
@@ -262,7 +262,7 @@
.append("equipmentTypeName", getEquipmentTypeName())
.append("workshopCode", getWorkshopCode())
.append("lineCode", getLineCode())
- .append("processes", getProcesses())
+ .append("processesCode", getProcessesCode())
.append("status", getStatus())
.append("remark", getRemark())
.append("createUser", getCreateUser())
diff --git a/jcdm-main/src/main/resources/mapper/em/equipmentArchives/EmEquipmentArchivesMapper.xml b/jcdm-main/src/main/resources/mapper/em/equipmentArchives/EmEquipmentArchivesMapper.xml
index b3342ef..33af1f1 100644
--- a/jcdm-main/src/main/resources/mapper/em/equipmentArchives/EmEquipmentArchivesMapper.xml
+++ b/jcdm-main/src/main/resources/mapper/em/equipmentArchives/EmEquipmentArchivesMapper.xml
@@ -15,7 +15,7 @@
<result property="equipmentTypeName" column="equipment_type_name" />
<result property="workshopCode" column="workshop_code" />
<result property="lineCode" column="line_code" />
- <result property="processes" column="processes" />
+ <result property="processesCode" column="processes_code" />
<result property="status" column="status" />
<result property="remark" column="remark" />
<result property="createUser" column="create_user" />
@@ -44,7 +44,7 @@
<if test="equipmentTypeName != null and equipmentTypeName != ''"> and equipment_type_name like concat('%', #{equipmentTypeName}, '%')</if>
<if test="workshopCode != null and workshopCode != ''"> and workshop_code = #{workshopCode}</if>
<if test="lineCode != null and lineCode != ''"> and line_code = #{lineCode}</if>
- <if test="processes != null and processes != ''"> and processes = #{processes}</if>
+ <if test="processesCode != null and processesCode != ''"> and processes_code = #{processesCode}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="createUser != null and createUser != ''"> and create_user = #{createUser}</if>
<if test="updateUser != null and updateUser != ''"> and update_user = #{updateUser}</if>
@@ -73,7 +73,7 @@
<if test="equipmentTypeName != null">equipment_type_name,</if>
<if test="workshopCode != null">workshop_code,</if>
<if test="lineCode != null">line_code,</if>
- <if test="processes != null">processes,</if>
+ <if test="processesCode != null">processes_code,</if>
<if test="status != null">status,</if>
<if test="remark != null">remark,</if>
<if test="createUser != null">create_user,</if>
@@ -96,7 +96,7 @@
<if test="equipmentTypeName != null">#{equipmentTypeName},</if>
<if test="workshopCode != null">#{workshopCode},</if>
<if test="lineCode != null">#{lineCode},</if>
- <if test="processes != null">#{processes},</if>
+ <if test="processesCode != null">#{processesCode},</if>
<if test="status != null">#{status},</if>
<if test="remark != null">#{remark},</if>
<if test="createUser != null">#{createUser},</if>
@@ -122,7 +122,7 @@
<if test="equipmentTypeName != null">equipment_type_name = #{equipmentTypeName},</if>
<if test="workshopCode != null">workshop_code = #{workshopCode},</if>
<if test="lineCode != null">line_code = #{lineCode},</if>
- <if test="processes != null">processes = #{processes},</if>
+ <if test="processesCode != null">processes_code = #{processesCode},</if>
<if test="status != null">status = #{status},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="createUser != null">create_user = #{createUser},</if>
diff --git a/jcdm-ui/src/views/main/em/equipmentArchives/index.vue b/jcdm-ui/src/views/main/em/equipmentArchives/index.vue
index c3dd8e1..db4bb36 100644
--- a/jcdm-ui/src/views/main/em/equipmentArchives/index.vue
+++ b/jcdm-ui/src/views/main/em/equipmentArchives/index.vue
@@ -217,7 +217,7 @@
equipmentTypeName: null,
workshopCode: null,
lineCode: null,
- processes: null,
+ processesCode: null,
status: null,
createUser: null,
updateUser: null,
@@ -295,7 +295,7 @@
equipmentTypeName: null,
workshopCode: null,
lineCode: null,
- processes: null,
+ processesCode: null,
status: null,
remark: null,
createUser: null,
--
Gitblit v1.9.3