From 8a8cdaaed43b70be771c095e55f7f0676f4717b3 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Tue, 9 Jan 2024 11:24:07 +0800
Subject: [PATCH] =?UTF-8?q?2024-1-9-2=20=E5=9F=BA=E7=A1=80=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF-=E5=B7=A5=E5=8E=82-=E5=8A=A0=E5=B7=A5=E5=8E=82?=
 =?UTF-8?q?=E5=BB=BA=E6=A8=A1=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/device/EquFaultReasonMapper.xml  |  2 --
 .../src/main/java/com/op/wms/domain/SysFactory.java   | 11 +++++++++++
 .../main/resources/mapper/wms/SysFactoryMapper.xml    |  7 ++++++-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquFaultReasonMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquFaultReasonMapper.xml
index 431465fc..4d1539d2 100644
--- a/op-modules/op-device/src/main/resources/mapper/device/EquFaultReasonMapper.xml
+++ b/op-modules/op-device/src/main/resources/mapper/device/EquFaultReasonMapper.xml
@@ -51,8 +51,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="selectEquFaultReasonByFaultId" parameterType="String" resultMap="EquFaultReasonResult">
 		<include refid="selectEquFaultReasonVo"/>
 		where fault_id = #{faultId}
-
-
 	</select>
 		
 	<insert id="insertEquFaultReason" parameterType="EquFaultReason">
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/SysFactory.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/SysFactory.java
index 5b78ff86..d47e3894 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/domain/SysFactory.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/SysFactory.java
@@ -47,6 +47,10 @@ public class SysFactory extends TreeEntity {
 	@Excel(name = "工厂编码")
 	private String factoryCode;
 
+	/** 工厂建模类型 */
+	@Excel(name = "工厂建模类型")
+	private String fType;
+
 	//虚拟字段
 	private List<Map<String,String>> workCenter;
 	private String value;
@@ -111,6 +115,13 @@ public class SysFactory extends TreeEntity {
 		this.factoryCode = factoryCode;
 	}
 
+	public String getFType() {
+		return fType;
+	}
+	public void setFType(String fType) {
+		this.fType = fType;
+	}
+
 	public String getValue() {
 		return value;
 	}
diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/SysFactoryMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/SysFactoryMapper.xml
index f8f26d4e..72b70fd8 100644
--- a/op-modules/op-wms/src/main/resources/mapper/wms/SysFactoryMapper.xml
+++ b/op-modules/op-wms/src/main/resources/mapper/wms/SysFactoryMapper.xml
@@ -21,10 +21,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="updateTime"	column="update_time"	/>
 		<result property="factoryCode"	column="factory_code"	/>
 		<result property="delFlag"	column="del_flag"	/>
+		<result property="fType"	column="f_type"	/>
 	</resultMap>
 
 	<sql id="selectSysFactoryVo">
-		select factory_id, parent_id, ancestors, factory_name, order_num, leader, phone, email, status, del_flag, create_by, create_time, update_by, update_time, factory_code,del_flag from sys_factory
+		select factory_id, parent_id, ancestors, factory_name, order_num, leader, phone, email, status, del_flag, create_by, create_time, update_by, update_time, factory_code,del_flag , f_type from sys_factory
 	</sql>
 
 	<select id="selectSysFactoryList" parameterType="SysFactory" resultMap="SysFactoryResult">
@@ -39,6 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="phone != null  and phone != ''"> and phone = #{phone}</if>
 			<if test="email != null  and email != ''"> and email = #{email}</if>
 			<if test="status != null  and status != ''"> and status = #{status}</if>
+			<if test="fType != null  and fType != ''"> and f_type = #{fType}</if>
 			and del_flag = '0'
 		</where>
 	</select>
@@ -66,6 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="updateBy != null">update_by,</if>
 			<if test="updateTime != null">update_time,</if>
 			<if test="factoryCode != null">factory_code,</if>
+			<if test="fType != null">f_type,</if>
 		 </trim>
 		<trim prefix="values (" suffix=")" suffixOverrides=",">
 			<if test="parentId != null">#{parentId},</if>
@@ -82,6 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="updateBy != null">#{updateBy},</if>
 			<if test="updateTime != null">#{updateTime},</if>
 			<if test="factoryCode != null">#{factoryCode},</if>
+			<if test="fType != null">#{fType},</if>
 		 </trim>
 	</insert>
 
@@ -102,6 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="updateBy != null">update_by = #{updateBy},</if>
 			<if test="updateTime != null">update_time = #{updateTime},</if>
 			<if test="factoryCode != null">factory_code = #{factoryCode},</if>
+			<if test="fType != null">f_type = #{fType},</if>
 		</trim>
 		where factory_id = #{factoryId}
 	</update>