From 36c8b97ef1d250e724696cae846a754d48a92512 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 04 六月 2024 12:33:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java |   54 ++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 46 insertions(+), 8 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 35fd2c9..3b56659 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
@@ -1,21 +1,22 @@
 package com.mes.taskcache.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.yulichang.query.MPJLambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mes.taskcache.mapper.TaskCacheMapper;
 import com.mes.taskcache.service.TaskCacheService;
-import com.mes.uppattenusage.entity.UpPattenUsage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -28,7 +29,11 @@
 @Service
 public class TaskCacheServiceImpl extends ServiceImpl<TaskCacheMapper, TaskCache> implements TaskCacheService {
 
+    @Autowired
+    EdgStorageCageDetailsMapper edgStorageCageDetailsMapper;
 
+    @Autowired
+    GlassInfoMapper glassInfoMapper;
     /**
      * 娣诲姞鐞嗙墖绗间换鍔�
      * @param taskCache
@@ -46,9 +51,42 @@
      * @return
      */
     @Override
-    public List<TaskCache> selectEdgInfo(String line) {
-        return baseMapper.selectList(new MPJLambdaWrapper<TaskCache>().selectAll(TaskCache.class).eq(TaskCache::getEndCell,line));
+    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)
+                .orderByAsc(TaskCache::getCreateTime));
+        List<Map<String,Object>> result=new ArrayList<>();
+        int serialNumber=1;
+        for(TaskCache taskCache1:taskCache){
+            Map<String,Object> map=new HashMap<>();
+            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;
 //        return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("end_cell",line));
+    }
+
+    @Override
+    public TaskCache queryGlassByTaskCache(int line, List<Integer> taskTypes) {
+        return baseMapper.queryGlassByTaskCache(line, taskTypes);
     }
 
     /**
@@ -97,8 +135,8 @@
      * @return
      */
     @Override
-    public List<TaskCache> selectLastOutCacheInfos(String line){
-        return baseMapper.selectList(new MPJLambdaWrapper<TaskCache>().selectAll(TaskCache.class).eq(TaskCache::getEndCell,line).eq(TaskCache::getTaskStatus,1).orderByDesc(TaskCache::getGlassId));
+    public List<TaskCache> selectLastOutCacheInfos(int line){
+        return baseMapper.selectList(new MPJLambdaWrapper<TaskCache>().selectAll(TaskCache.class).eq(TaskCache::getEndCell,line).eq(TaskCache::getTaskStatus,1).orderByDesc(TaskCache::getCreateTime));
 //        return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("end_cell",line).eq("task_status",1).orderByDesc("ID"));
     }
 
@@ -109,7 +147,7 @@
      */
     @Override
     public TaskCache selectLastOutCacheInfo(int line){
-        return baseMapper.selectOne(new MPJLambdaWrapper<TaskCache>().selectAll(TaskCache.class).eq(TaskCache::getEndCell,line).eq(TaskCache::getTaskStatus,1).orderByDesc(TaskCache::getGlassId));
+        return baseMapper.selectOne(new MPJLambdaWrapper<TaskCache>().selectAll(TaskCache.class).eq(TaskCache::getEndCell,line).eq(TaskCache::getTaskStatus,1).orderByDesc(TaskCache::getCreateTime));
     }
 
 

--
Gitblit v1.8.0