From ae1459d90f53ac81177e75790d859c6a12e7ed54 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 12 十一月 2025 11:09:10 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassNewTask.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassNewTask.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassNewTask.java
index 241b4fe..5d0aad2 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassNewTask.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassNewTask.java
@@ -122,6 +122,7 @@
private static final String ALARM_TYPE1 = "涓�绾垮崸寮忕悊鐗囩";
private static final String ALARM_TYPE2 = "浜岀嚎鍗у紡鐞嗙墖绗�";
private static final String ALARM_CODE_NOGLASS = "noGlass";
+ private static final String ALARM_CODE_ID = "idSame";
@Scheduled(fixedDelay = 1000)
public void startOneOpcTask() throws Exception {
@@ -323,6 +324,17 @@
}
if (glassInIdOne.equals(task.getGlassIdIn()) || glassInIdTwo.equals(task.getGlassIdIn())) {
log.info("鐜荤拑id涓庝笂娆＄浉鍚岋紝绂佹杩涚墖");
+ ProductAlarmInfo alarmInfo = new ProductAlarmInfo();
+ alarmInfo.setState(Const.LOAD_RAW_GLASS_NEW);
+ alarmInfo.setAlarmModule(ALARM_MODULE);
+ if (deviceId == 1) {
+ alarmInfo.setAlarmType(ALARM_TYPE1);
+ } else {
+ alarmInfo.setAlarmType(ALARM_TYPE2);
+ }
+ alarmInfo.setAlarmCode(ALARM_CODE_ID);
+ alarmInfo.setAlarmMessage(task.getGlassIdIn());
+ productAlarmInfoService.save(alarmInfo);
Date endDate = new Date();
log.info("缁撴潫杩涚墖浠诲姟璁惧涓簕}锛岀粨鏉熸椂闂翠负锛歿}锛屽叡鑰楁椂锛歿}ms", deviceId, endDate, endDate.getTime() - startDate.getTime());
return Boolean.FALSE;
@@ -380,9 +392,9 @@
private boolean outTask(S7DataWL task, int deviceId, int cellFlag) {
Date startDate = new Date();
- GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getGlassId, task.getGlassIdOut()));
+ GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getGlassId, task.getGlassIdIn()));
if (null == glassInfo && StringUtils.isNotBlank(task.getGlassIdIn())) {
- log.info("杩涚墖鐜荤拑淇℃伅涓嶅瓨鍦紝鐜荤拑id:{}", task.getGlassIdIn());
+ log.info("鐩撮�氱幓鐠冧俊鎭笉瀛樺湪锛岀幓鐠僫d:{}", task.getGlassIdIn());
ProductAlarmInfo alarmInfo = new ProductAlarmInfo();
alarmInfo.setState(Const.LOAD_RAW_GLASS_NEW);
alarmInfo.setAlarmModule(ALARM_MODULE);
--
Gitblit v1.8.0