From 14e848b328eeb9dcf463d91da7f84da65b3cd12d Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期一, 15 一月 2024 16:16:56 +0800
Subject: [PATCH] 工位终端配置代码更新
---
jcdm-ui/src/views/main/sc/stationConf/index.vue | 7 +++++++
jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/domain/ScStationConf.java | 11 ++++++++++-
jcdm-main/src/main/resources/mapper/sc/stationConf/ScStationConfMapper.xml | 7 ++++++-
3 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/domain/ScStationConf.java b/jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/domain/ScStationConf.java
index 3e418c0..959c22c 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/domain/ScStationConf.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/domain/ScStationConf.java
@@ -58,6 +58,8 @@
@Excel(name = "鏇存敼鐢ㄦ埛")
private String updateUser;
+ @Excel(name = "缃戝崱鍦板潃")
+ private String macAddress;
/** 澶囨敞 */
@Excel(name = "澶囨敞")
private String remarks;
@@ -76,9 +78,15 @@
this.processesCode = processesCode;
}
- public String getProcessesCode()
+ public String getProcessesCode()
{
return processesCode;
+ }
+ public void setMacAddress(String macAdress) {this.macAddress = macAdress;}
+
+ public String getMacAddress()
+ {
+ return macAddress;
}
public void setProcessesName(String processesName)
{
@@ -176,6 +184,7 @@
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("processesCode", getProcessesCode())
+ .append("macAddress", getMacAddress())
.append("processesName", getProcessesName())
.append("processesType", getProcessesType())
.append("ipAddress", getIpAddress())
diff --git a/jcdm-main/src/main/resources/mapper/sc/stationConf/ScStationConfMapper.xml b/jcdm-main/src/main/resources/mapper/sc/stationConf/ScStationConfMapper.xml
index 887a0bd..5a105a3 100644
--- a/jcdm-main/src/main/resources/mapper/sc/stationConf/ScStationConfMapper.xml
+++ b/jcdm-main/src/main/resources/mapper/sc/stationConf/ScStationConfMapper.xml
@@ -19,15 +19,17 @@
<result property="updateUser" column="update_user" />
<result property="updateTime" column="update_time" />
<result property="remarks" column="remarks" />
+ <result property="macAddress" column="mac_address" />
</resultMap>
<sql id="selectScStationConfVo">
- select id, processes_code, processes_name, processes_type, ip_address, spare_field_1, spare_field_2, spare_field_3, spare_field_4, create_user, create_time, update_user, update_time, remarks from sc_station_conf
+ select id, processes_code, mac_address,processes_name, processes_type, ip_address, spare_field_1, spare_field_2, spare_field_3, spare_field_4, create_user, create_time, update_user, update_time, remarks from sc_station_conf
</sql>
<select id="selectScStationConfList" parameterType="ScStationConf" resultMap="ScStationConfResult">
<include refid="selectScStationConfVo"/>
<where>
+ <if test="macAddress != null and macAddress != ''"> and mac_adress = #{macAddress}</if>
<if test="processesCode != null and processesCode != ''"> and processes_code = #{processesCode}</if>
<if test="processesName != null and processesName != ''"> and processes_name like concat('%', #{processesName}, '%')</if>
<if test="processesType != null and processesType != ''"> and processes_type = #{processesType}</if>
@@ -51,6 +53,7 @@
insert into sc_station_conf
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="processesCode != null">processes_code,</if>
+ <if test="macAddress != null">mac_address,</if>
<if test="processesName != null">processes_name,</if>
<if test="processesType != null">processes_type,</if>
<if test="ipAddress != null">ip_address,</if>
@@ -66,6 +69,7 @@
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="processesCode != null">#{processesCode},</if>
+ <if test="macAddress != null">#{macAddress},</if>
<if test="processesName != null">#{processesName},</if>
<if test="processesType != null">#{processesType},</if>
<if test="ipAddress != null">#{ipAddress},</if>
@@ -86,6 +90,7 @@
<trim prefix="SET" suffixOverrides=",">
<if test="processesCode != null">processes_code = #{processesCode},</if>
<if test="processesName != null">processes_name = #{processesName},</if>
+ <if test="macAddress != null">mac_address = #{macAddress},</if>
<if test="processesType != null">processes_type = #{processesType},</if>
<if test="ipAddress != null">ip_address = #{ipAddress},</if>
<if test="spareField1 != null">spare_field_1 = #{spareField1},</if>
diff --git a/jcdm-ui/src/views/main/sc/stationConf/index.vue b/jcdm-ui/src/views/main/sc/stationConf/index.vue
index 8b1089c..e267c11 100644
--- a/jcdm-ui/src/views/main/sc/stationConf/index.vue
+++ b/jcdm-ui/src/views/main/sc/stationConf/index.vue
@@ -89,6 +89,9 @@
</el-table-column>
<el-table-column label="IP鍦板潃" align="center" prop="ipAddress">
</el-table-column>
+ <el-table-column label="缃戝崱鍦板潃" align="center" prop="macAddress">
+ </el-table-column>
+
<el-table-column label="澶囨敞" align="center" prop="remarks">
</el-table-column>
<el-table-column fixed="right" width="200" label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
@@ -147,6 +150,9 @@
<el-form-item label="IP鍦板潃" prop="ipAddress">
<el-input v-model="form.ipAddress" placeholder="璇疯緭鍏P鍦板潃" />
</el-form-item>
+ <el-form-item label="缃戝崱鍦板潃" prop="macAddress">
+ <el-input v-model="form.macAddress" placeholder="璇疯緭鍏ョ綉鍗″湴鍧�" />
+ </el-form-item>
<el-form-item label="澶囨敞" prop="remarks">
<el-input v-model="form.remarks" placeholder="璇疯緭鍏ュ娉�" />
</el-form-item>
@@ -195,6 +201,7 @@
processesName: null,
processesType: null,
ipAddress: null,
+ macAddress: null,
spareField1: null,
spareField2: null,
spareField3: null,
--
Gitblit v1.9.3