diff --git a/src/main/java/com/xujie/sys/modules/pms/data/EamWorkOrderInData.java b/src/main/java/com/xujie/sys/modules/pms/data/EamWorkOrderInData.java
index 1a887293..f2a262e1 100644
--- a/src/main/java/com/xujie/sys/modules/pms/data/EamWorkOrderInData.java
+++ b/src/main/java/com/xujie/sys/modules/pms/data/EamWorkOrderInData.java
@@ -114,6 +114,16 @@ public class EamWorkOrderInData extends  EamWorkOrderData{
     private String reportFaultFlag; // 是否有故障图片
 
     private String reportSparPartFlag; // 是否有备件图片
+    // 查询三色灯 的 ip地址 用到
+    private String ip;
+
+    public String getIp() {
+        return ip;
+    }
+
+    public void setIp(String ip) {
+        this.ip = ip;
+    }
 
     public Date getTaskStartDate() {
         return taskStartDate;
diff --git a/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java b/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java
index da0ff550..2fd5adca 100644
--- a/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java
+++ b/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java
@@ -518,4 +518,8 @@ public interface EamMapper {
     void abandonedEamWorkOrder(EamWorkOrderData data);
 
     List<ExportEamPropertiesModelData> exportEamPropertiesTemplateAndItem(@Param("query")EamPropertiesModelHeaderData data);
+
+    String getEquipmentFolderLocationIp(EamWorkOrderInData data);
+
+    void updateTpmMessageNotificationSendFlag(EamWorkOrderInData data);
 }
diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java
index cb2322a2..c330146b 100644
--- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java
@@ -3839,6 +3839,14 @@ public class EamServiceImpl implements EamService {
             //更新维修工单的维修类型
             data.setRepairType(repairType);
             eamMapper.updateRepairTypes(data);
+
+            //修改 三色灯 的信息表，取消 原IP报警
+            String ip = eamMapper.getEquipmentFolderLocationIp(data);
+            data.setIp(ip);
+            if (!ip.isEmpty() && !ip.trim().equals("")){
+                eamMapper.updateTpmMessageNotificationSendFlag(data);
+            }
+
             //设置参数
             inData.setOrderNo(data.getOrderNo());
             inData.setObjectID(data.getObjectID());
diff --git a/src/main/resources/mapper/pms/EamMapper.xml b/src/main/resources/mapper/pms/EamMapper.xml
index 040ef803..bf726866 100644
--- a/src/main/resources/mapper/pms/EamMapper.xml
+++ b/src/main/resources/mapper/pms/EamMapper.xml
@@ -3981,6 +3981,11 @@
         set Status = '已废弃' , abandoned_reason = #{abandonedReason} , update_by = #{updateBy} , update_date = getDate()
         where Site = #{site} and bu_no = #{buNo} and OrderNo = #{orderNo}
     </update>
+    <update id="updateTpmMessageNotificationSendFlag">
+        update TPM_Message_Notification
+        set send_flag = 'N'
+        WHERE SITE = #{site} AND bu_no = #{buNo} AND plan_no = #{planID} AND order_no = #{orderNo} and IP = #{ip} and mes_typ_desc = '三色灯'
+    </update>
     <select id="getUpItemdataEam" resultType="com.xujie.sys.modules.pms.data.EamPropertiesModelDetailData">
         select
             top 1
@@ -4125,4 +4130,7 @@
         </where>
         order by epmh.code_no,a.order_id
     </select>
+    <select id="getEquipmentFolderLocationIp" resultType="java.lang.String">
+        select IP from Equipment_folder_location where site = #{site} and bu_no = #{buNo} and repair_type = '换线专家组'
+    </select>
 </mapper>