diff --git a/src/main/java/com/xujie/sys/common/utils/TaskUtils.java b/src/main/java/com/xujie/sys/common/utils/TaskUtils.java
index f6ba31c9..8d5782db 100644
--- a/src/main/java/com/xujie/sys/common/utils/TaskUtils.java
+++ b/src/main/java/com/xujie/sys/common/utils/TaskUtils.java
@@ -73,7 +73,7 @@ public class TaskUtils {
modbusCommunicateService.readPerSecond();
}
- //@Scheduled(cron = "${loraurl.getLoraWatchTime}")
+ @Scheduled(cron = "${loraurl.getLoraWatchTime}")
//@Scheduled(cron = "0/30 * * * * ?")
public void getLoraWatchMessage(){eamService.getLoraWatch();};
@@ -83,7 +83,8 @@ public class TaskUtils {
//@Scheduled(cron = "${loraurl.sendThreeColourTime}")
public void sendThreeColourLight(){eamService.sendThreeColourLight();};
- //@Scheduled(cron = "${loraurl.sendRedColourTime}")
+ @Scheduled(cron = "${loraurl.sendRedColourTime}")
+ //@Scheduled(cron = "0/10 * * * * ?")
public void sendLoraRedLight(){eamService.sendLoraRedLight();}
/**
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 54e938f2..b14c2c8a 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
@@ -487,4 +487,6 @@ public interface EamMapper {
EamPropertiesModelDetailData getDownItemdataEam(EamPropertiesModelDetailData inData);
void updateEamItemOrder(EamPropertiesModelDetailData inData);
+
+ void updateMessageNotificationByParameter(@Param("site") String site,@Param("buNo") String buNo,@Param("planID") String planID,@Param("orderNo") String orderNo);
}
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 af7e84b2..3763b7db 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
@@ -2195,6 +2195,7 @@ public class EamServiceImpl implements EamService {
// 如果是维修,工单取消后要反刷计划状态
if ("C".equals(inData.getFunctionType())) {
eamMapper.updateFeedBackStatus(inData);
+ eamMapper.updateMessageNotificationByParameter(inData.getSite(),inData.getBuNo(),inData.getPlanID(),inData.getOrderNo());
}
}
diff --git a/src/main/resources/mapper/pms/EamMapper.xml b/src/main/resources/mapper/pms/EamMapper.xml
index 3abf4f0a..b1fd3db4 100644
--- a/src/main/resources/mapper/pms/EamMapper.xml
+++ b/src/main/resources/mapper/pms/EamMapper.xml
@@ -3670,6 +3670,11 @@
and code_no = #{codeNo}
and function_type = #{functionType}
+
+ update TPM_Message_Notification
+ set send_flag = 'N'
+ WHERE SITE = #{site} AND bu_no = #{buNo} AND plan_no = #{planID} AND order_no = #{orderNo}
+