From f68d3c71819feb59e7a227a5d992b059b900916c Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 28 三月 2025 08:28:26 +0800
Subject: [PATCH] 修改报表，界面添加查询流程卡个数，调整推送数据到前端的间隔
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java | 174 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 157 insertions(+), 17 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 94cbc61..131f8b7 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
@@ -2,14 +2,16 @@
import cn.hutool.core.lang.Assert;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.github.yulichang.base.MPJBaseServiceImpl;
import com.github.yulichang.toolkit.JoinWrappers;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.mes.base.entity.BigStorageCageBaseInfo;
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;
@@ -20,8 +22,8 @@
import com.mes.bigstoragetask.entity.UpdateBigStorageCageDTO;
import com.mes.bigstoragetask.mapper.BigStorageCageFeedTaskMapper;
import com.mes.bigstoragetask.mapper.BigStorageCageOutTaskMapper;
+import com.mes.bigstoragetask.service.BigStorageCageOutTaskService;
import com.mes.common.config.Const;
-import com.mes.common.utils.RedisUtil;
import com.mes.damage.entity.Damage;
import com.mes.damage.service.DamageService;
import com.mes.glassinfo.entity.GlassInfo;
@@ -31,6 +33,7 @@
import com.mes.temperingglass.entity.TemperingGlassInfo;
import com.mes.temperingglass.mapper.TemperingGlassInfoMapper;
import com.mes.temperingglass.service.TemperingGlassInfoService;
+import com.mes.utils.RedisUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
@@ -76,6 +79,10 @@
private DamageService damageService;
@Resource
private RedisUtil redisUtil;
+ @Resource
+ private BigStorageCageOutTaskService bigStorageCageOutTaskService;
+ @Resource
+ private BigStorageCageDetailsService bigStorageCageDetailsService;
@Value("${mes.minCount}")
private int minCount;
@@ -102,6 +109,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();
@@ -110,6 +124,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;
}
@@ -119,7 +141,8 @@
outWrapper.in(BigStorageCageDetails::getState, Const.GLASS_STATE_OUT_ING, Const.GLASS_STATE_SCHEDULE_ING);
List<BigStorageCageDetails> bigStorageCageDetailsList = baseMapper.selectList(outWrapper);
LambdaQueryWrapper<BigStorageCageOutTask> outTaskWrapper = new LambdaQueryWrapper<>();
- outTaskWrapper.lt(BigStorageCageOutTask::getTaskState, Const.BIG_STORAGE_OUT_SUCCESS);
+ outTaskWrapper.lt(BigStorageCageOutTask::getTaskState, Const.BIG_STORAGE_OUT_SUCCESS)
+ .orderByAsc(BigStorageCageOutTask::getId);
List<BigStorageCageOutTask> bigStorageCageOutTaskList = bigStorageCageOutTaskMapper.selectList(outTaskWrapper);
Map<String, BigStorageCageOutTask> listMap = bigStorageCageOutTaskList.stream()
@@ -134,6 +157,10 @@
BigStorageCageOutTask bigStorageCageOutTask = listMap.get(bigStorageCageDetails.getGlassId());
bigStorageCageDetails.setBigStorageCageOutTask(bigStorageCageOutTask);
}
+ bigStorageCageDetailsList.sort(Comparator
+ .comparing((BigStorageCageDetails detail) -> detail.getBigStorageCageOutTask().getTrainNumber())
+ .thenComparingInt((BigStorageCageDetails detail) -> detail.getBigStorageCageOutTask().getSerialNumber()));
+
return bigStorageCageDetailsList;
}
@@ -193,15 +220,15 @@
BigStorageCageDetails bigStorageCageDetails = baseMapper.selectOne(bigStorageCageDetailsWrapper);
if (temperingGlassInfo != null) {
- if (status == 0) {
+ if (status == 8) {
temperingGlassInfo.setState(Const.GLASS_STATE_DAMAGE);
} else {
temperingGlassInfo.setState(Const.GLASS_STATE_TAKE);
}
- temperingGlassInfoMapper.updateById(temperingGlassInfo);
+ temperingGlassInfoMapper.deleteById(temperingGlassInfo);
}
Damage damage = new Damage();
- if (status == 0) {
+ if (status == 8) {
bigStorageCageDetails.setState(Const.GLASS_STATE_DAMAGE);
damage.setType(Const.GLASS_STATE_DAMAGE);
} else {
@@ -266,6 +293,13 @@
@Override
public BigStorageDTO queryTargetSlotByTempering(GlassInfo glassInfo) {
+ List<GlassInfo> glassInfoList = glassInfoService.list(
+ new LambdaQueryWrapper<GlassInfo>()
+ .eq(GlassInfo::getEngineerId, glassInfo.getEngineerId())
+ .eq(GlassInfo::getTemperingLayoutId, glassInfo.getTemperingLayoutId())
+ .eq(GlassInfo::getTargetSlot, glassInfo.getTargetSlot())
+ );
+ List<String> glassIds = glassInfoList.stream().map(GlassInfo::getGlassId).collect(Collectors.toList());
BigStorageDTO bigStorageDTO = null;
MPJLambdaWrapper<BigStorageCage> wrapper = new MPJLambdaWrapper<>(BigStorageCage.class)
.selectAll(BigStorageCage.class)
@@ -275,13 +309,15 @@
.eq(BigStorageCageDetails::getEngineerId, glassInfo.getEngineerId())
.eq(BigStorageCageDetails::getTemperingLayoutId, glassInfo.getTemperingLayoutId())
.gt(BigStorageCage::getRemainWidth, Math.max(glassInfo.getWidth(), glassInfo.getHeight()))
+ .gt(BigStorageCage::getSlotHeight, Math.min(glassInfo.getWidth(), glassInfo.getHeight()))
+ .in(BigStorageCageDetails::getGlassId, glassIds)
.last("limit 1");
if (glassInfo.getTemperingLayoutId() == 0) {
wrapper.eq(BigStorageCageDetails::getFlowCardId, glassInfo.getFlowCardId())
.eq(BigStorageCageDetails::getLayer, glassInfo.getLayer());
// wrapper.eq(BigStorageCageDetails::getWidth, glassInfo.getWidth()).eq(BigStorageCageDetails::getHeight, glassInfo.getHeight());
} else {
- wrapper.eq(BigStorageCageDetails::getTemperingFeedSequence, glassInfo.getTemperingFeedSequence() + 1);
+ wrapper.eq(BigStorageCageDetails::getTemperingFeedSequence, glassInfo.getTemperingFeedSequence() - 1);
}
BigStorageCage bigStorageCage = bigStorageCageService.selectJoinOne(BigStorageCage.class, wrapper);
if (null != bigStorageCage) {
@@ -295,9 +331,10 @@
bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
.eq(BigStorageCage::getEnableState, Const.SLOT_ON)
.eq(BigStorageCage::getRemainWidth, slotWidth)
+ .lt(BigStorageCage::getSlotHeight, Math.min(glassInfo.getWidth(), glassInfo.getHeight()))
// .notInSql(BigStorageCage::getSlot, "select distinct slot from big_storage_cage_details where state = 0")
.inSql(BigStorageCage::getDeviceId,
- "select distinct device_id from big_storage_cage_details where engineer_id = '" + glassInfo.getEngineerId() + "' and tempering_layout_id = " + glassInfo.getTemperingLayoutId())
+ "select distinct device_id from big_storage_cage_details where state!=101 and engineer_id = '" + glassInfo.getEngineerId() + "' and tempering_layout_id = " + glassInfo.getTemperingLayoutId())
.last("limit 1"));
if (null != bigStorageCage) {
log.info("鏍规嵁鐗堝浘id鎵惧埌绗煎瓙鍐呯殑鐩爣鏍煎瓙锛歿},鐜荤拑id锛歿}", bigStorageCage.getSlot(), glassInfo.getGlassId());
@@ -309,30 +346,50 @@
}
//鑾峰彇鐜荤拑鐨勫帤搴︼細閲嶆柊閫夌瀛愰渶瑕佹寜鐓х瀛愬彲鏀剧幓鐠冨帤搴﹁繘琛岄�夋嫨 鍥犱负瀛愭煡璇㈡帓搴忓涓籹ql鏃犲奖鍝嶏紝鎵�浠ュ厛鎵ц瀛愭煡璇㈣幏鍙栭『搴忥紝鐒跺悗涓�娆″幓鏌ヨ
- List<Integer> deviceUsedList = bigStorageCageService.queryFreeDeviceByUsed(glassInfo.getThickness());
- List<Integer> deviceUseds = bigStorageCageService.queryFreeDeviceByUsed(glassInfo.getThickness());
+ List<Integer> deviceUsedList = bigStorageCageService.queryFreeDeviceByUsed(glassInfo.getThickness(), Math.min(glassInfo.getWidth(), glassInfo.getHeight()));
+ List<Integer> deviceUseds = bigStorageCageService.queryFreeDeviceByUsed(glassInfo.getThickness(), Math.min(glassInfo.getWidth(), glassInfo.getHeight()));
List<BigStorageCageDetails> engineerCount1 = baseMapper.selectList(
new LambdaQueryWrapper<BigStorageCageDetails>()
- .notIn(BigStorageCageDetails::getState, Const.GLASS_STATE_OUT,Const.GLASS_STATE_DAMAGE,Const.GLASS_STATE_TAKE)
+ .notIn(BigStorageCageDetails::getState, Const.GLASS_STATE_OUT, Const.GLASS_STATE_DAMAGE, Const.GLASS_STATE_TAKE)
.select(BigStorageCageDetails::getEngineerId)
.groupBy(BigStorageCageDetails::getEngineerId)
.between(BigStorageCageDetails::getDeviceId, 1, 5)
);
List<BigStorageCageDetails> engineerCount2 = baseMapper.selectList(
new LambdaQueryWrapper<BigStorageCageDetails>()
- .notIn(BigStorageCageDetails::getState, Const.GLASS_STATE_OUT,Const.GLASS_STATE_DAMAGE,Const.GLASS_STATE_TAKE)
+ .notIn(BigStorageCageDetails::getState, Const.GLASS_STATE_OUT, Const.GLASS_STATE_DAMAGE, Const.GLASS_STATE_TAKE)
.select(BigStorageCageDetails::getEngineerId)
.groupBy(BigStorageCageDetails::getEngineerId)
.between(BigStorageCageDetails::getDeviceId, 6, 8)
);
- if (engineerCount1.size() > engineerCount2.size()) {
- deviceUsedList.removeIf(device -> device < 6);
+ BigStorageCageDetails bigStorageCageDetails = baseMapper.selectOne(
+ new LambdaQueryWrapper<BigStorageCageDetails>()
+ .eq(BigStorageCageDetails::getEngineerId, glassInfo.getEngineerId())
+ .orderByAsc(BigStorageCageDetails::getSlot)
+ .last("limit 1")
+ );
+ if (bigStorageCageDetails == null) {
+ if (glassInfo.getThickness() == 8) {
+ deviceUsedList.removeIf(device -> device < 6);
+ } else {
+ if (engineerCount1.size() > engineerCount2.size()) {
+ deviceUsedList.removeIf(device -> device < 6);
+ } else {
+ deviceUsedList.removeIf(device -> device > 5);
+ }
+ }
} else {
- deviceUsedList.removeIf(device -> device > 5);
+ if (bigStorageCageDetails.getDeviceId() >= 1 && bigStorageCageDetails.getDeviceId() <= 5) {
+ deviceUsedList.removeIf(device -> device > 5);
+ } else {
+ deviceUsedList.removeIf(device -> device < 6);
+ }
}
+
if (CollectionUtils.isEmpty(deviceUsedList)) {
deviceUsedList = deviceUseds;
}
+
for (Integer item : deviceUsedList) {
bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
.eq(BigStorageCage::getRemainWidth, slotWidth)
@@ -392,7 +449,6 @@
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)
@@ -406,7 +462,7 @@
if (CollectionUtils.isNotEmpty(temperingGlassInfos)) {
if ("0".equals(temperingFeedSequence)) {
if (CollectionUtils.isNotEmpty(temperingGlassInfos)) {
- plcStorageCageTask.computeOutMoreGlassInfo(temperingGlassInfos, Boolean.FALSE, "");
+ plcStorageCageTask.computeOutMoreGlassInfo(temperingGlassInfos, Boolean.FALSE, 1);
}
} else {
temperingGlassInfoService.saveBatch(temperingGlassInfos);
@@ -439,4 +495,88 @@
public void appointEngineerId(String engineerId) {
redisUtil.setCacheObject("temperingengineerId", engineerId);
}
+
+ @Override
+ public long scheduleTime() {
+ //鎵ц鍐呴儴璋冨害浠诲姟
+ List<TemperingLayoutDTO> temperingOccupySlotList = bigStorageCageDetailsService.queryTemperingOccupySlot();
+ List<BigStorageCageOutTask> bigStorageCageOutTasks = new ArrayList<>();
+ if (CollectionUtils.isNotEmpty(temperingOccupySlotList)) {
+ for (TemperingLayoutDTO temperingOccupySlot : temperingOccupySlotList) {
+ List<GlassInfo> glassInfos = glassInfoService.list(
+ new LambdaQueryWrapper<GlassInfo>()
+ .eq(GlassInfo::getEngineerId, temperingOccupySlot.getEngineerId())
+ .eq(GlassInfo::getTemperingLayoutId, temperingOccupySlot.getTemperingLayoutId())
+ .notInSql(GlassInfo::getGlassId, "select glass_id from damage where type=8 and engineer_id='"
+ + temperingOccupySlot.getEngineerId() + "' and tempering_layout_id = '" + temperingOccupySlot.getTemperingLayoutId() + "'")
+ .orderBy(Boolean.TRUE, sequenceOrder, GlassInfo::getTemperingFeedSequence)
+ );
+ Map<Integer, List<GlassInfo>> listMap = glassInfos.stream().collect(Collectors.groupingBy(item -> item.getTargetSlot()));
+ for (Map.Entry<Integer, List<GlassInfo>> entry : listMap.entrySet()) {
+ List<GlassInfo> valueList = entry.getValue();
+ List<String> glassIds = valueList.stream().map(GlassInfo::getGlassId).collect(Collectors.toList());
+ List<BigStorageCageDetails> bigStorageCageDetailsList = bigStorageCageDetailsService.list(
+ new LambdaQueryWrapper<BigStorageCageDetails>()
+ .in(BigStorageCageDetails::getGlassId, glassIds)
+ .eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN)
+ .orderBy(Boolean.TRUE, sequenceOrder, BigStorageCageDetails::getTemperingFeedSequence)
+ );
+ //褰撲竴鏍肩幓鐠冮兘鍒伴綈鏃�
+ if (bigStorageCageDetailsList.size() == valueList.size()) {
+ long distinctSlotCount = bigStorageCageDetailsList.stream()
+ .map(BigStorageCageDetails::getSlot)
+ .distinct()
+ .count();
+ //褰撶幓鐠冧笉鍦ㄥ悓涓�鏍兼椂
+ if (distinctSlotCount > 1) {
+ BigStorageCageDetails maxSequenceDetail = bigStorageCageDetailsList.stream()
+ .max(Comparator.comparingInt(BigStorageCageDetails::getTemperingFeedSequence))
+ .orElse(null); // 濡傛灉娌℃湁鍏冪礌锛岃繑鍥� null
+ int maxSlot = maxSequenceDetail.getSlot();
+ int serialNumber = 1;
+ for (BigStorageCageDetails bigStorageCageDetails : bigStorageCageDetailsList
+ ) {
+ if (bigStorageCageDetails.getSlot() != maxSlot) {
+ bigStorageCageOutTasks.add(new BigStorageCageOutTask(bigStorageCageDetails.getGlassId(), bigStorageCageDetails.getSlot(), maxSlot,
+ bigStorageCageDetails.getWidth() * 10, bigStorageCageDetails.getHeight() * 10, 1, serialNumber++, Const.BIG_STORAGE_OUT_NEW, new Date()));
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ long startSlotCount = bigStorageCageOutTasks.stream().map(BigStorageCageOutTask::getStartSlot).distinct().count();
+ long endSlotCount = bigStorageCageOutTasks.stream().map(BigStorageCageOutTask::getEndSlot).distinct().count();
+ long time = (startSlotCount * 30 + endSlotCount * 20) / 60;
+ return time;
+ }
+
+ @Override
+ public void cancelOutTask() {
+ List<BigStorageCageOutTask> bigStorageCageOutTasks = bigStorageCageOutTaskService.list(
+ new LambdaQueryWrapper<BigStorageCageOutTask>()
+ .in(BigStorageCageOutTask::getEndSlot, Const.OUT_TARGET_POSITION_ALL)
+ .eq(BigStorageCageOutTask::getTaskState, Const.BIG_STORAGE_OUT_NEW)
+ );
+ 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