From b804d88d626d1df675a3278c859b37758c55432b Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 18 十二月 2025 13:42:06 +0800
Subject: [PATCH] 1、增加流程卡进度查询，可根据工程号，流程卡号，玻璃id查看进度情况 2、钢化界面增加颜色对应注释，版图增加落架顺序 3、两个大理片界面笼子上色块显示修改为根据玻璃宽度显示 4、中空大理片右侧缺片情况显示优化 5、是否除膜从领取工程取消，在中空领取任务时选择除膜膜系（不除膜时不选择膜系），当配方中是需要除膜时并且选择的膜系与小片膜系一样时发送除膜信息 6、中空领取任务界面流程卡数量不等于已配对数量时高亮显示 7、磨边队列当后面玻璃磨边完成扫码但前面玻璃还未扫到码时高亮显示
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java | 52 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 47 insertions(+), 5 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 ee1bfc4..0f9bf92 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,7 +11,9 @@
import com.mes.bigstorage.entity.BigStorageCage;
import com.mes.bigstorage.entity.BigStorageCageDetails;
import com.mes.bigstorage.entity.dto.*;
+import com.mes.bigstorage.entity.request.BigCageDetailsRequest;
import com.mes.bigstorage.entity.vo.BigStorageQueryVO;
+import com.mes.bigstorage.entity.vo.BigCageDetailsVO;
import com.mes.bigstorage.mapper.BigStorageCageDetailsMapper;
import com.mes.bigstorage.service.BigStorageCageDetailsService;
import com.mes.bigstorage.service.BigStorageCageService;
@@ -44,6 +46,10 @@
import javax.annotation.Resource;
import java.util.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -284,7 +290,7 @@
.eq(BigStorageCage::getEnableState, Const.SLOT_ON)
.eq(BigStorageCage::getRemainWidth, slotWidth).orderByAsc(BigStorageCage::getSlot)
.inSql(BigStorageCage::getDeviceId,
- "select distinct device_id from big_storage_cage_details where engineer_id = '" + EngineerId + "'")
+ "select distinct device_id from big_storage_cage_details where engineer_id = '" + EngineerId + "' and device_id not in (5,6)")
.last("limit 1"));
if (null != bigStorageCage) {
log.info("鏍规嵁鐗堝浘id鎵惧埌绗煎瓙鍐呯殑鐩爣鏍煎瓙锛歿},鐜荤拑id锛歿}", bigStorageCage.getSlot(), glassId);
@@ -460,7 +466,7 @@
if (temperingGlassInfoList.size() == 0) {
MPJLambdaWrapper<GlassInfo> wrapper = JoinWrappers.lambda(GlassInfo.class)
- .select("-1 as state,t.filmsid as films_id,t.glass_id,t.flow_card_id,t.glass_type,t.width,t.height" +
+ .select("-1 as state,t.filmsid as films_id,t.glass_id,t.flow_card_id,t.layer,t.glass_type,t.width,t.height" +
",t.thickness,t.ishorizontal,t.tempering_layout_id,t.tempering_feed_sequence,t.x_coordinate,t.y_coordinate," +
"t.angle,t1.slot,t.engineer_id")
.innerJoin(BigStorageCageDetails.class, BigStorageCageDetails::getGlassId, GlassInfo::getGlassId)
@@ -519,9 +525,17 @@
}
@Override
- public Map<Integer, List<BigStorageVO>> querybigStorageCageDetail() {
+ public Map<Object, Map<Integer, List<BigStorageVO>>> querybigStorageCageDetail() {
List<BigStorageVO> bigStorageCages = baseMapper.querybigStorageCageDetail();
- return bigStorageCages.stream().collect(Collectors.groupingBy(item -> item.getDeviceId()));
+ // 宓屽鍒嗙粍锛氬厛鎸塻lot鍒嗙粍锛屽啀鎸塪eviceId鍒嗙粍
+
+ return bigStorageCages.stream()
+ // 绗竴灞傚垎缁勶細key=slot鍊硷紝value=璇lot涓嬬殑鎵�鏈塀igStorageVO
+ .collect(Collectors.groupingBy(
+ BigStorageVO::getDeviceId, // 绗竴灞傚垎缁勪緷鎹細slot
+ // 绗簩灞傚垎缁勶細瀵圭涓�灞傜殑value缁х画鎸塪eviceId鍒嗙粍
+ Collectors.groupingBy(BigStorageVO::getSlot)
+ ));
}
@Override
@@ -580,7 +594,18 @@
}
@Override
+ public List<BigStorageCageDetails> queryNeedDispatch() {
+ return baseMapper.queryNeedDispatch();
+ }
+
+ @Override
+ public BigStorageSlotDTO queryNeedDispatchSlotBySequence() {
+ return baseMapper.queryNeedDispatchSlotBySequence();
+ }
+
+ @Override
public List<OptimizeProject> queryTemperingOrder() {
+ String temperingengineerId = redisUtil.getCacheObject("temperingEngineerId");
List<TemperingGlassCountDTO> temperingGlassCountDTOS = baseMapper.queryTemperingGlassCountSummary(1);
List<OptimizeProject> projectList = optimizeProjectService.engineerScheduling(new OptimizeProject() {{
setType(3);
@@ -588,10 +613,13 @@
Set<String> projectNoSet = projectList.stream()
.map(OptimizeProject::getProjectNo)
.collect(Collectors.toSet());
- List<OptimizeProject> resultList= new ArrayList<>();
+ List<OptimizeProject> resultList = new ArrayList<>();
for (TemperingGlassCountDTO dto : temperingGlassCountDTOS) {
if (projectNoSet.contains(dto.getEngineerId())) {
OptimizeProject project = new OptimizeProject();
+ if (Objects.equals(dto.getEngineerId(), temperingengineerId)) {
+ project.setState(1);
+ }
project.setProjectNo(dto.getEngineerId());
project.setGlassType(dto.getFilmsId());
project.setGlassThickness(dto.getThickness().intValue());
@@ -602,4 +630,18 @@
}
return resultList;
}
+
+ @Override
+ public List<BigCageDetailsVO> queryVerticalSheetCageDetailsList(BigCageDetailsRequest request) {
+ List<BigCageDetailsVO> cageDetails = baseMapper.queryVerticalSheetCageDetailsList(request);
+ if (!(com.baomidou.mybatisplus.core.toolkit.StringUtils.isBlank(request.getFlowCardId()) &&
+ com.baomidou.mybatisplus.core.toolkit.StringUtils.isBlank(request.getFilmsId()) &&
+ com.baomidou.mybatisplus.core.toolkit.StringUtils.isBlank(request.getEngineerId()) &&
+ com.baomidou.mybatisplus.core.toolkit.StringUtils.isBlank(request.getGlassId()))) {
+ cageDetails = cageDetails.stream()
+ .filter(detail -> detail.getGlassId() != null)
+ .collect(Collectors.toList());
+ }
+ return cageDetails;
+ }
}
--
Gitblit v1.8.0