From 924ce82faeec6d896fcdc360b279215e84b69fb9 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 11 九月 2025 11:44:44 +0800
Subject: [PATCH] 1、代码补充提交
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 48 insertions(+), 3 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java
index 351ca33..71767b1 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java
@@ -27,6 +27,8 @@
import com.mes.device.PlcParameterObject;
import com.mes.edgglasstask.entity.EdgGlassTaskInfo;
import com.mes.edgglasstask.service.EdgGlassTaskInfoService;
+import com.mes.engineering.entity.Engineering;
+import com.mes.engineering.mapper.EngineeringMapper;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.service.GlassInfoService;
import com.mes.temperingglass.entity.TemperingGlassInfo;
@@ -68,6 +70,8 @@
private TemperingGlassInfoService temperingGlassInfoService;
@Resource
private DamageService damageService;
+ @Resource
+ private EngineeringMapper engineeringMapper;
@Resource
private RedisUtil redisUtil;
@@ -121,7 +125,7 @@
String d04ToMES = plcParameterObject.getPlcParameter("D04ToMES").getValue();
-// d01Id="P25010108|37|8";
+// d01Id="P25031806|15|3";
// d04ToMES="1";
// d01ToMES="1";
@@ -362,6 +366,17 @@
.isNull(BigStorageCageOutTask::getGlassId)
.orderBy(Boolean.TRUE, sequenceOrder, TemperingGlassInfo::getTemperingFeedSequence));
log.info("鏌ヨ鐨勫嚭鐗囦换鍔★細{}", temperingGlassInfoList);
+ List<String> glassIds = temperingGlassInfoList.stream().map(TemperingGlassInfo::getGlassId).collect(Collectors.toList());
+ List<BigStorageCageDetails> bigStorageCageDetailsList = bigStorageCageDetailsService.list(
+ new LambdaQueryWrapper<BigStorageCageDetails>()
+ .in(BigStorageCageDetails::getGlassId, glassIds)
+ .in(BigStorageCageDetails::getState, Const.GLASS_STATE_OUT)
+ );
+ if (CollectionUtils.isNotEmpty(temperingGlassInfoList)) {
+ List<String> detialGlassIds = bigStorageCageDetailsList.stream().map(BigStorageCageDetails::getGlassId).collect(Collectors.toList());
+ temperingGlassInfoList.removeIf(info -> detialGlassIds.contains(info.getGlassId()));
+ log.info("绗煎唴涓嶅瓨鍦ㄧ幓鐠冪殑閽㈠寲浠诲姟{}", bigStorageCageDetailsList);
+ }
if (CollectionUtils.isNotEmpty(temperingGlassInfoList)) {
log.info("鏈夋鍦ㄥ嚭鐗囩殑閽㈠寲浠诲姟");
computeOutMoreGlassInfo(temperingGlassInfoList, Boolean.TRUE, 1);
@@ -389,6 +404,16 @@
//鍒伴綈锛屽皢鐜荤拑灏忕墖鏁版嵁瀛樺叆閽㈠寲灏忕墖琛紝閫昏緫鐢熸垚鍑虹墖浠诲姟 缁撴潫
for (TemperingLayoutDTO item : temperingLayoutDTOList) {
if (redisUtil.getCacheObject("temperingengineerId").equals(item.getEngineerId())) {
+ Engineering engineering = engineeringMapper.selectOne(
+ new LambdaQueryWrapper<Engineering>()
+ .eq(Engineering::getEngineerId, item.getEngineerId())
+ );
+ if (engineering.getState() == 2) {
+ redisUtil.setCacheObject("temperingengineerId", "");
+ Date endDate = new Date();
+ log.info("褰撳墠宸ョ▼琚姝㈢敓浜э紝澶х悊鐗囩鍑虹墖浠诲姟缁撴潫鏃堕棿锛歿}锛屽叡鑰楁椂锛歿}ms,缁撴潫鎵爜浠诲姟", endDate, endDate.getTime() - startDate.getTime());
+ return;
+ }
List<TemperingGlassInfo> temperingGlassInfos = glassInfoService.selectJoinList(TemperingGlassInfo.class, JoinWrappers.lambda(GlassInfo.class)
.selectAll(GlassInfo.class)
.select("-1 as state")
@@ -1299,11 +1324,11 @@
e.getWidth() * 10, e.getHeight() * 10, trainNumber, serialNumber++, 1, new Date()));
}
} else {
- if(serialNumber <= outCarMaxSize && remainWidth > maxLength){
+ if (serialNumber <= outCarMaxSize && remainWidth > maxLength) {
remainWidth = remainWidth - maxLength - glassGap;
bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getSlot(), Const.ARTIFICIAL_OUT_TARGET_POSITION,
e.getWidth() * 10, e.getHeight() * 10, trainNumber, serialNumber++, 1, new Date()));
- }else{
+ } else {
remainWidth = carWidth - maxLength - glassGap;
trainNumber = trainNumber + 1;
serialNumber = 1;
@@ -1322,6 +1347,26 @@
}
Assert.isFalse(CollectionUtils.isEmpty(bigStorageCageOutTaskList), "鏈幏鍙栧嚭鐗囨暟鎹紝缁撴潫鍑虹墖浠诲姟");
log.info("鑾峰彇鍑虹墖浠诲姟鏁版嵁{}鏉★紝鎵ц淇濆瓨", bigStorageCageOutTaskList.size());
+ List<String> outGlassIds = bigStorageCageOutTaskList.stream()
+ .map(BigStorageCageOutTask::getGlassId)
+ .collect(Collectors.toList());
+ //鍒ゆ柇宸ョ▼鍙樻洿鏃朵慨鏀瑰嚭鐗囦綅缃�
+ List<GlassInfo> glassInfos = glassInfoService.list(
+ new LambdaQueryWrapper<GlassInfo>()
+ .in(GlassInfo::getGlassId, outGlassIds)
+ .eq(GlassInfo::getProductionStatus, 3)
+ );
+ if (CollectionUtils.isNotEmpty(glassInfos)) {
+ List<String> changeGlassIds = glassInfos.stream()
+ .map(GlassInfo::getGlassId)
+ .collect(Collectors.toList());
+ bigStorageCageOutTaskList.forEach(task -> {
+ if (changeGlassIds.contains(task.getGlassId())) {
+ task.setEndSlot(Const.ARTIFICIAL_OUT_TARGET_POSITION);
+ }
+ });
+ }
+
bigStorageCageOutTaskService.saveBatch(bigStorageCageOutTaskList);
List<String> glassIds = bigStorageCageOutTaskList.stream().map(BigStorageCageOutTask::getGlassId).collect(Collectors.toList());
log.info("灏嗗嚭鐗囩幓鐠儃}鐜荤拑鐘舵�佹敼涓哄凡鍑虹墖", glassIds);
--
Gitblit v1.8.0