From cd7f3fa89aed4e7a4b87c0ee4164cd606103b318 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 15 四月 2025 09:38:41 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/TemperingTask.java | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/TemperingTask.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/TemperingTask.java
index 2ff37a9..d29e489 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/TemperingTask.java
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/TemperingTask.java
@@ -19,7 +19,6 @@
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import java.util.Comparator;
@@ -55,7 +54,7 @@
@Value("${mes.height}")
private Integer temperingHeight;
- @Scheduled(fixedDelay = 1000)
+// @Scheduled(fixedDelay = 1000)
public void temperingGlassBefore() {
Date startDate = new Date();
log.info("鏈浠诲姟寮�濮嬫墽琛屾椂闂达細{}", startDate);
@@ -70,15 +69,22 @@
//灏嗙‘璁ゅ瓧缃负0
plcControl.writeWord(plcParameterObject.getPlcParameter("confirmationWord").getAddress(), 0);
//鍙兘鏈夊嚑鐐夌幓鐠冨悓鏃跺湪閽紝闇�瑕佽幏鍙栭挗鍖栧皬鐗囪〃涓殑鏁版嵁淇℃伅鐘舵�佷负2锛堟棆杞彴鐜荤拑宸查�佸嚭鏈挗鍖栵紝姝ｅ湪閽㈠寲锛�
- List<TemperingGlassInfo> temperingGlassInfoList = temporaryGlassInfoService.list(new LambdaQueryWrapper<TemperingGlassInfo>()
- .eq(TemperingGlassInfo::getState, Const.TEMPERING_START));
+ List<TemperingGlassInfo> temperingGlassInfoList = temporaryGlassInfoService.list(
+ new LambdaQueryWrapper<TemperingGlassInfo>()
+ .inSql(TemperingGlassInfo::getTemperingLayoutId, "select distinct tempering_layout_id from tempering_glass_info where state=1")
+ .lt(TemperingGlassInfo::getState, Const.TEMPERING_START)
+ );
if (CollectionUtils.isEmpty(temperingGlassInfoList)) {
log.info("褰撳墠绯荤粺娌℃湁闇�瑕侀挗鍖栫殑鐜荤拑淇℃伅");
return;
}
+ TemperingGlassInfo minGlassInfo = temperingGlassInfoList.stream().min(Comparator.comparingLong(TemperingGlassInfo::getState)).get();
+ if (minGlassInfo.getState() < Const.TEMPERING_DROP) {
+ log.info("褰撳墠鐐夌幓鐠冩湭鍒伴綈锛岀◢鍚庡湪鎵ц");
+ return;
+ }
//鎷垮埌宸ョ▼id鍙婄倝鍙�
TemperingGlassInfo maxGlassInfo = temperingGlassInfoList.stream().max(Comparator.comparingLong(TemperingGlassInfo::getId)).get();
-
//灏嗘鍦ㄩ挗鍖栫殑鐐夊彿杩囨护鎺夛紝浠呰幏鍙栧緟閽㈠寲鐨勭幓鐠�:鍒ゆ柇寰呴挗鐨勭幓鐠冩槸鍚﹀凡鍙戦�佸鎺ユ暟鎹�
List<TemperingRecord> temperingRecordList = temperingRecordService.list(new LambdaQueryWrapper<TemperingRecord>().eq(TemperingRecord::getEngineerId, maxGlassInfo.getEngineerId())
.eq(TemperingRecord::getTemperingLayoutId, maxGlassInfo.getTemperingLayoutId()));
@@ -93,7 +99,7 @@
.sorted(Comparator.comparing(TemperingGlassInfo::getTemperingFeedSequence)).collect(Collectors.toList());
//鎸夌収鑶滅郴鑾峰彇鐜荤拑鏉愯川
SysDictData glassTypeSysDictData = sysDictDataService.getOne(new QueryWrapper<SysDictData>()
- .eq(StringUtils.isNotBlank(temperingGlassList.get(0).getFilmsid()), "dict_label", temperingGlassList.get(0).getFilmsid()));
+ .eq(StringUtils.isNotBlank(temperingGlassList.get(0).getFilmsId()), "dict_label", temperingGlassList.get(0).getFilmsId()));
double sumArea = temperingGlassList.stream().mapToDouble(e -> e.getWidth() * e.getHeight()).sum();
double maxArea = temperingGlassList.stream().mapToDouble(e -> e.getWidth() * e.getHeight()).max().orElse(0.0);
@@ -124,12 +130,12 @@
log.info("鏈浠诲姟缁撴潫鏃堕棿锛歿}锛屽叡鑰楁椂锛歿}ms", endDate, endDate.getTime() - startDate.getTime());
}
- @Scheduled(fixedDelay = 1000)
+// @Scheduled(fixedDelay = 1000)
public void temperingGlassAfter() {
//鏆備笉澶勭悊
}
- @Scheduled(fixedDelay = 1000)
+// @Scheduled(fixedDelay = 1000)
public void dealDamageTask() {
Date startDate = new Date();
log.info("閽㈠寲鐮存崯鐜荤拑娓呴櫎浠诲姟寮�濮嬫墽琛屾椂闂达細{}", startDate);
@@ -145,7 +151,7 @@
damage.setLine(Const.TEMPERING_OUT_TARGET_POSITION);
damage.setWorkingProcedure("閽㈠寲");
damage.setRemark("閽㈠寲");
- damage.setStatus(0);
+ damage.setStatus(1);
damage.setType(e.getState());
return damage;
}).collect(Collectors.toList());
--
Gitblit v1.8.0