YiWuProject.git

			@@ -1,16 +1,22 @@
			package com.mes.taskcache.service.impl;

			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			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 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>
			@@ -23,6 +29,11 @@
			@Service
			public class TaskCacheServiceImpl extends ServiceImpl<TaskCacheMapper, TaskCache> implements TaskCacheService {

			@Autowired
			EdgStorageCageDetailsMapper edgStorageCageDetailsMapper;

			@Autowired
			GlassInfoMapper glassInfoMapper;
			/**
			* 添加理片笼任务
			* @param taskCache
			@@ -40,8 +51,42 @@
			* @return
			*/
			@Override
			public List<TaskCache> selectEdgInfo(String line) {
			return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("end_cell",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);
			}

			/**
			@@ -50,7 +95,8 @@
			*/
			@Override
			public List<TaskCache> selectCacheInfo(){
			return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("task_status",0));
			return baseMapper.selectList(new MPJLambdaWrapper<TaskCache>().selectAll(TaskCache.class).eq(TaskCache::getTaskStatus,0));
			// return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("task_status",0));
			}

			/**
			@@ -68,7 +114,9 @@
			*/
			@Override
			public List<TaskCache> selectInputTaskCache(){
			return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("task_status",0).eq("task_type",1));
			return baseMapper.selectList(new MPJLambdaWrapper<TaskCache>().selectAll(TaskCache.class).eq(TaskCache::getTaskStatus,0).eq(TaskCache::getTaskType,1));

			// return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("task_status",0).eq("task_type",1));
			}

			/**
			@@ -77,7 +125,8 @@
			*/
			@Override
			public List<TaskCache> selectOutTaskCache(){
			return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("task_status",0).eq("task_type",2));
			return baseMapper.selectList(new MPJLambdaWrapper<TaskCache>().selectAll(TaskCache.class).eq(TaskCache::getTaskStatus,0).eq(TaskCache::getTaskType,2));
			// return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("task_status",0).eq("task_type",2));
			}

			/**
			@@ -86,7 +135,20 @@
			* @return
			*/
			@Override
			public List<TaskCache> selectLastOutCacheInfo(String line){
			return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("end_xxxxcell",line).eq("task_status",1).orderByDesc("ID"));
			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"));
			}

			/**
			* 查询 A09 或 A10 最新的一片出片任务
			* @param line
			* @return
			*/
			@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::getCreateTime));
			}


			}