From a26b51820af00beb5ee73c821907598e2eae7178 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期三, 22 五月 2024 10:19:47 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java | 38 ++++++++++++++++++++++++--------------
1 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java
index 7ade4e5..7def8da 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java
@@ -5,6 +5,8 @@
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper;
+import com.mes.glassinfo.entity.GlassInfo;
+import com.mes.glassinfo.mapper.GlassInfoMapper;
import com.mes.taskcache.entity.TaskCache;
import com.mes.taskcache.mapper.TaskCacheMapper;
import com.mes.taskcache.service.TaskCacheService;
@@ -29,6 +31,9 @@
@Autowired
EdgStorageCageDetailsMapper edgStorageCageDetailsMapper;
+
+ @Autowired
+ GlassInfoMapper glassInfoMapper;
/**
* 娣诲姞鐞嗙墖绗间换鍔�
* @param taskCache
@@ -49,25 +54,30 @@
public List<Map<String,Object>> selectEdgInfo(String line) {
List<TaskCache> taskCache=baseMapper.selectList(new MPJLambdaWrapper<TaskCache>()
.selectAll(TaskCache.class)
- .eq(TaskCache::getEndCell,line)
- .eq(TaskCache::getTaskStatus,1));
+ .eq(TaskCache::getEndCell, line)
+ .eq(TaskCache::getTaskStatus,1)
+ .orderByAsc(TaskCache::getCreateTime));
List<Map<String,Object>> result=new ArrayList<>();
+ int serialNumber=1;
for(TaskCache taskCache1:taskCache){
Map<String,Object> map=new HashMap<>();
- EdgStorageCageDetails edgStorageCageDetails=edgStorageCageDetailsMapper.selectOne(new MPJLambdaWrapper<EdgStorageCageDetails>()
- .selectAll(EdgStorageCageDetails.class)
- .eq(EdgStorageCageDetails::getGlassId,taskCache1.getGlassId()));
- if(edgStorageCageDetails!=null){
- map.put("Line",line);
- map.put("Width",edgStorageCageDetails.getWidth());
- map.put("Height",edgStorageCageDetails.getHeight());
- map.put("Thickness",edgStorageCageDetails.getThickness());
- map.put("GlassId",edgStorageCageDetails.getGlassId());
- map.put("FlowCardId",edgStorageCageDetails.getFlowCardId());
- map.put("TemperingLayoutId",edgStorageCageDetails.getTemperingLayoutId());
- map.put("TemperingFeedSequence",edgStorageCageDetails.getTemperingFeedSequence());
+ GlassInfo glassInfo=glassInfoMapper.selectOne(new MPJLambdaWrapper<GlassInfo>()
+ .selectAll(GlassInfo.class)
+ .eq(GlassInfo::getGlassId,taskCache1.getGlassId()));
+ if(glassInfo!=null){
+ map.put("Line",line);//绾胯矾 2001 1绾匡紝 2002 2绾�
+ map.put("Width",glassInfo.getWidth());//瀹�
+ map.put("Height",glassInfo.getHeight());//楂�
+ map.put("Thickness",glassInfo.getThickness());//鍘�
+ map.put("GlassId",glassInfo.getGlassId());//鐜荤拑ID
+ map.put("FlowCardId",glassInfo.getFlowCardId());//娴佺▼鍗″彿
+ map.put("TemperingLayoutId",glassInfo.getTemperingLayoutId());// 鏆備笉鏄剧ず 閽㈠寲鐗堝浘ID
+ map.put("TemperingFeedSequence",glassInfo.getTemperingFeedSequence());// 鏆備笉鏄剧ず 閽㈠寲鐗堝浘ID鍐呯殑搴忓彿
+ map.put("FilmsId",glassInfo.getFilmsid());//鑶滅郴
+ map.put("SerialNumber",serialNumber);//鍑虹墖椤哄簭
result.add(map);
}
+ serialNumber++;
}
return result;
--
Gitblit v1.8.0