From 5ed955abeec76c4b12f1d0a066780f2039c24c9e Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 03 十二月 2025 14:47:19 +0800
Subject: [PATCH] 1、英文补充
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 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 b233b36..9905baf 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);
@@ -580,6 +586,16 @@
}
@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);
@@ -589,7 +605,7 @@
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();
@@ -606,4 +622,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