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/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java | 127 +++++++++++++++++++++++++++++-------------
1 files changed, 88 insertions(+), 39 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
index c4bd971..f57697e 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
@@ -11,6 +11,7 @@
import com.mes.bigstorage.entity.BigStorageCage;
import com.mes.bigstorage.entity.BigStorageCageDetails;
import com.mes.bigstorage.entity.BigStorageDTO;
+import com.mes.bigstorage.entity.dto.FlowCardDTO;
import com.mes.bigstorage.entity.dto.SlotSequenceDTO;
import com.mes.bigstorage.entity.dto.TemperingLayoutDTO;
import com.mes.bigstorage.mapper.BigStorageCageDetailsMapper;
@@ -25,6 +26,8 @@
import com.mes.common.config.Const;
import com.mes.damage.entity.Damage;
import com.mes.damage.service.DamageService;
+import com.mes.engineering.entity.Engineering;
+import com.mes.engineering.mapper.EngineeringMapper;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.mapper.GlassInfoMapper;
import com.mes.glassinfo.service.GlassInfoService;
@@ -82,6 +85,8 @@
private BigStorageCageOutTaskService bigStorageCageOutTaskService;
@Resource
private BigStorageCageDetailsService bigStorageCageDetailsService;
+ @Resource
+ private EngineeringMapper engineeringMapper;
@Value("${mes.minCount}")
private int minCount;
@@ -108,6 +113,13 @@
.lt(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_SLOT)
.isNotNull(BigStorageCageFeedTask::getTargetSlot);
List<BigStorageCageFeedTask> bigStorageCageFeedTaskList = bigStorageCageFeedTaskMapper.selectList(feedTaskWrapper);
+
+ List<String> glassIds = bigStorageCageDetailsList.stream().map(BigStorageCageDetails::getGlassId).collect(Collectors.toList());
+ List<BigStorageCageFeedTask> feedTasks = bigStorageCageFeedTaskList.stream()
+ .filter(task -> !glassIds.contains(task.getGlassId()))
+ .collect(Collectors.toList());
+
+
Map<String, BigStorageCageFeedTask> listMap = bigStorageCageFeedTaskList.stream()
.collect(Collectors.toMap(BigStorageCageFeedTask::getGlassId, task -> task));
Iterator<BigStorageCageDetails> iterator = bigStorageCageDetailsList.iterator();
@@ -116,6 +128,14 @@
BigStorageCageFeedTask bigStorageCageFeedTask = listMap.get(bigStorageCageDetails.getGlassId());
bigStorageCageDetails.setBigStorageCageFeedTask(bigStorageCageFeedTask);
}
+ for (BigStorageCageFeedTask bigStorageCageFeedTask : feedTasks
+ ) {
+ BigStorageCageDetails bigStorageCageDetails = new BigStorageCageDetails();
+ bigStorageCageDetails.setBigStorageCageFeedTask(bigStorageCageFeedTask);
+ bigStorageCageDetailsList.add(bigStorageCageDetails);
+ }
+ bigStorageCageDetailsList.sort(Comparator
+ .comparing((BigStorageCageDetails detail) -> detail.getBigStorageCageFeedTask().getId()));
return bigStorageCageDetailsList;
}
@@ -213,13 +233,14 @@
}
Damage damage = new Damage();
if (status == 8) {
- bigStorageCageDetails.setState(Const.GLASS_STATE_DAMAGE);
+// bigStorageCageDetails.setState(Const.GLASS_STATE_DAMAGE);
damage.setType(Const.GLASS_STATE_DAMAGE);
} else {
- bigStorageCageDetails.setState(Const.GLASS_STATE_TAKE);
+// bigStorageCageDetails.setState(Const.GLASS_STATE_TAKE);
damage.setType(Const.GLASS_STATE_TAKE);
}
- baseMapper.updateById(bigStorageCageDetails);
+// baseMapper.updateById(bigStorageCageDetails);
+ baseMapper.deleteById(bigStorageCageDetails);
bigStorageCageService.updateRemainWidth(bigStorageCageDetails.getSlot());
damage.setGlassId(bigStorageCageDetails.getGlassId());
damage.setWorkingProcedure("閽㈠寲");
@@ -429,32 +450,40 @@
@Override
public boolean temperingGlass(String temperingLayoutId, String engineerId, String temperingFeedSequence) {
- LambdaQueryWrapper<TemperingGlassInfo> temperingGlassInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
- temperingGlassInfoLambdaQueryWrapper
- .eq(TemperingGlassInfo::getState, Const.TEMPERING_NEW);
- List<TemperingGlassInfo> temperingGlassInfoList = temperingGlassInfoMapper.selectList(temperingGlassInfoLambdaQueryWrapper);
- if (temperingGlassInfoList.size() == 0) {
- List<TemperingGlassInfo> temperingGlassInfos = glassInfoService.selectJoinList(TemperingGlassInfo.class, JoinWrappers.lambda(GlassInfo.class)
- .selectAll(GlassInfo.class)
- .select("-1 as state")
- .selectAs(BigStorageCageDetails::getSlot, TemperingGlassInfo::getSlot)
- .innerJoin(BigStorageCageDetails.class, BigStorageCageDetails::getGlassId, GlassInfo::getGlassId)
- .eq(GlassInfo::getTemperingLayoutId, temperingLayoutId)
- .eq(GlassInfo::getEngineerId, engineerId)
- .in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN)
- .orderBy(Boolean.TRUE, sequenceOrder, GlassInfo::getTemperingFeedSequence));
- if (CollectionUtils.isNotEmpty(temperingGlassInfos)) {
- if ("0".equals(temperingFeedSequence)) {
- if (CollectionUtils.isNotEmpty(temperingGlassInfos)) {
- plcStorageCageTask.computeOutMoreGlassInfo(temperingGlassInfos, Boolean.FALSE, 1);
+ Engineering engineering = engineeringMapper.selectOne(
+ new LambdaQueryWrapper<Engineering>()
+ .eq(Engineering::getEngineerId, engineerId)
+ );
+ if(engineering.getState()!=2){
+ LambdaQueryWrapper<TemperingGlassInfo> temperingGlassInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ temperingGlassInfoLambdaQueryWrapper
+ .eq(TemperingGlassInfo::getState, Const.TEMPERING_NEW);
+ List<TemperingGlassInfo> temperingGlassInfoList = temperingGlassInfoMapper.selectList(temperingGlassInfoLambdaQueryWrapper);
+ if (temperingGlassInfoList.size() == 0) {
+ List<TemperingGlassInfo> temperingGlassInfos = glassInfoService.selectJoinList(TemperingGlassInfo.class, JoinWrappers.lambda(GlassInfo.class)
+ .selectAll(GlassInfo.class)
+ .select("-1 as state")
+ .selectAs(BigStorageCageDetails::getSlot, TemperingGlassInfo::getSlot)
+ .innerJoin(BigStorageCageDetails.class, BigStorageCageDetails::getGlassId, GlassInfo::getGlassId)
+ .eq(GlassInfo::getTemperingLayoutId, temperingLayoutId)
+ .eq(GlassInfo::getEngineerId, engineerId)
+ .in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN)
+ .orderBy(Boolean.TRUE, sequenceOrder, GlassInfo::getTemperingFeedSequence));
+ if (CollectionUtils.isNotEmpty(temperingGlassInfos)) {
+ if ("0".equals(temperingFeedSequence)) {
+ if (CollectionUtils.isNotEmpty(temperingGlassInfos)) {
+ plcStorageCageTask.computeOutMoreGlassInfo(temperingGlassInfos, Boolean.FALSE, 1);
+ }
+ } else {
+ temperingGlassInfoService.saveBatch(temperingGlassInfos);
}
- } else {
- temperingGlassInfoService.saveBatch(temperingGlassInfos);
+ return true;
}
- return true;
}
+ return false;
+ }else{
+ return false;
}
- return false;
}
@@ -476,8 +505,22 @@
}
@Override
- public void appointEngineerId(String engineerId) {
- redisUtil.setCacheObject("temperingengineerId", engineerId);
+ public String appointEngineerId(String engineerId) {
+ if(engineerId!=""){
+ Engineering engineering = engineeringMapper.selectOne(
+ new LambdaQueryWrapper<Engineering>()
+ .eq(Engineering::getEngineerId, engineerId)
+ );
+ if (engineering.getState() != 2) {
+ redisUtil.setCacheObject("temperingengineerId", engineerId);
+ return "鎸囧畾鎴愬姛";
+ } else {
+ return "鎸囧畾澶辫触锛屾宸ョ▼宸茬粡琚姝㈢敓浜�";
+ }
+ }else{
+ redisUtil.setCacheObject("temperingengineerId", engineerId);
+ return "鎸囧畾鎴愬姛";
+ }
}
@Override
@@ -543,18 +586,24 @@
.in(BigStorageCageOutTask::getEndSlot, Const.OUT_TARGET_POSITION_ALL)
.eq(BigStorageCageOutTask::getTaskState, Const.BIG_STORAGE_OUT_NEW)
);
- List<String> outGlassId = bigStorageCageOutTasks.stream().map(BigStorageCageOutTask::getGlassId).collect(Collectors.toList());
- temperingGlassInfoService.remove(
- new LambdaUpdateWrapper<TemperingGlassInfo>()
- .in(TemperingGlassInfo::getGlassId, outGlassId)
- );
- bigStorageCageDetailsService.update(
- new LambdaUpdateWrapper<BigStorageCageDetails>()
- .set(BigStorageCageDetails::getState, Const.GLASS_STATE_IN)
- .eq(BigStorageCageDetails::getState, Const.GLASS_STATE_OUT_ING)
- .in(BigStorageCageDetails::getGlassId, outGlassId)
- );
- bigStorageCageOutTaskService.deleteTask(bigStorageCageOutTasks);
+ if (bigStorageCageOutTasks.size() > 0) {
+ List<String> outGlassId = bigStorageCageOutTasks.stream().map(BigStorageCageOutTask::getGlassId).collect(Collectors.toList());
+ temperingGlassInfoService.remove(
+ new LambdaUpdateWrapper<TemperingGlassInfo>()
+ .in(TemperingGlassInfo::getGlassId, outGlassId)
+ );
+ bigStorageCageDetailsService.update(
+ new LambdaUpdateWrapper<BigStorageCageDetails>()
+ .set(BigStorageCageDetails::getState, Const.GLASS_STATE_IN)
+ .eq(BigStorageCageDetails::getState, Const.GLASS_STATE_OUT_ING)
+ .in(BigStorageCageDetails::getGlassId, outGlassId)
+ );
+ bigStorageCageOutTaskService.deleteTask(bigStorageCageOutTasks);
+ }
+ }
+ @Override
+ public List<FlowCardDTO> selectFlowCardCount() {
+ return baseMapper.selectFlowCardCount();
}
}
--
Gitblit v1.8.0