From 1195e51e67436cf2b9513678b5e9d3f27a043de4 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 22 十二月 2025 08:29:40 +0800
Subject: [PATCH] 1、中空选中除膜改为多选 2、流程卡报工情况查询添加工程号条件，添加线路，备注显示
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java | 65 ++++++++++++++++++++++++++++++--
1 files changed, 61 insertions(+), 4 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 d412b1d..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;
@@ -29,6 +31,8 @@
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.mapper.GlassInfoMapper;
import com.mes.glassinfo.service.GlassInfoService;
+import com.mes.pp.entity.OptimizeProject;
+import com.mes.pp.service.OptimizeProjectService;
import com.mes.sysconfig.entity.SysConfig;
import com.mes.sysconfig.service.SysConfigService;
import com.mes.temperingglass.entity.TemperingGlassInfo;
@@ -41,6 +45,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.*;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -69,6 +74,8 @@
private BigStorageCageService bigStorageCageService;
@Resource
private GlassInfoMapper glassInfoMapper;
+ @Resource
+ private OptimizeProjectService optimizeProjectService;
@Resource
private GlassInfoService glassInfoService;
@@ -283,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);
@@ -459,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)
@@ -518,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
@@ -587,4 +602,46 @@
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);
+ }});
+ Set<String> projectNoSet = projectList.stream()
+ .map(OptimizeProject::getProjectNo)
+ .collect(Collectors.toSet());
+ 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());
+ project.setGlassTotal(dto.getTotalCount());
+ project.setGlassTotalArea(dto.getRealCount());
+ resultList.add(project);
+ }
+ }
+ 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