From 67447b61640e464892d96804a1938b2ab96a62fc Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202303>
Date: Tue, 1 Aug 2023 18:12:40 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=BA=8F=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E4=BA=A7=E7=BA=BF=E8=AE=BE=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 op-modules/op-mes/src/main/resources/bootstrap.yml     |  4 ++--
 .../main/java/com/op/technology/domain/ProProcess.java | 10 ++++++++++
 .../resources/mapper/technology/ProProcessMapper.xml   |  6 +++++-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/op-modules/op-mes/src/main/resources/bootstrap.yml b/op-modules/op-mes/src/main/resources/bootstrap.yml
index 222424bd..f7166042 100644
--- a/op-modules/op-mes/src/main/resources/bootstrap.yml
+++ b/op-modules/op-mes/src/main/resources/bootstrap.yml
@@ -14,12 +14,12 @@ spring:
     nacos:
       discovery:
         namespace: lanju-op
-        group: ywl
+        group: jgy
         # 服务注册地址
         server-addr: 140.249.53.142:8848
       config:
         namespace: lanju-op
-        group: ywl
+        group: jgy
         #命名空间
         #group: local
         # 配置中心地址
diff --git a/op-modules/op-technology/src/main/java/com/op/technology/domain/ProProcess.java b/op-modules/op-technology/src/main/java/com/op/technology/domain/ProProcess.java
index 97872329..69c31f62 100644
--- a/op-modules/op-technology/src/main/java/com/op/technology/domain/ProProcess.java
+++ b/op-modules/op-technology/src/main/java/com/op/technology/domain/ProProcess.java
@@ -61,6 +61,8 @@ public class ProProcess extends BaseEntity
     private String workCenter;
     //工作时长
     private Double workTime;
+    //线体设备
+    private String equipment;
 
     public List<BaseFile> getFiles() {
         return files;
@@ -200,6 +202,14 @@ public class ProProcess extends BaseEntity
         return attr4;
     }
 
+    public void setEquipment(String equipment)
+    {
+        this.equipment = equipment;
+    }
+    public String getEquipment()
+    {
+        return equipment;
+    }
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
diff --git a/op-modules/op-technology/src/main/resources/mapper/technology/ProProcessMapper.xml b/op-modules/op-technology/src/main/resources/mapper/technology/ProProcessMapper.xml
index d7c9bd03..c209831e 100644
--- a/op-modules/op-technology/src/main/resources/mapper/technology/ProProcessMapper.xml
+++ b/op-modules/op-technology/src/main/resources/mapper/technology/ProProcessMapper.xml
@@ -24,12 +24,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="sync"    column="sync"/>
         <result property="workCenter"    column="work_center"/>
         <result property="workTime"    column="work_time"/>
+        <result property="equipment"    column="equipment"/>
     </resultMap>
 
     <sql id="selectProProcessVo">
         select process_id, process_code, process_name, attention,
                enable_flag, remark, attr1, attr2, attr3, attr4, create_by, create_time,
-               update_by, update_time,split_merge,split_merg_num,sync,work_center,work_time
+               update_by, update_time,split_merge,split_merg_num,sync,work_center,work_time,equipment
         from pro_process
     </sql>
 
@@ -85,6 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="sync != null">sync,</if>
             <if test="workCenter != null">work_center,</if>
             <if test="workTime != null">work_time,</if>
+            <if test="equipment != null">equipment,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             #{processId},
@@ -106,6 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="sync != null">#{sync},</if>
             <if test="workCenter != null">#{workCenter},</if>
             <if test="workTime != null">#{workTime},</if>
+            <if test="equipment != null">#{equipment},</if>
          </trim>
     </insert>
     <update id="updateProProcess" parameterType="ProProcess">
@@ -129,6 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="sync != null">sync = #{sync},</if>
             <if test="workCenter != null">work_center = #{workCenter},</if>
             <if test="workTime != null">work_time = #{workTime},</if>
+            <if test="equipment != null">equipment = #{equipment},</if>
         </trim>
         where process_id = #{processId}
     </update>