YiWuProject.git

			@@ -1,10 +1,10 @@
			package com.mes.edgstoragecage.service.impl;

			import cn.hutool.core.lang.Assert;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
			import com.github.yulichang.base.MPJBaseServiceImpl;
			import com.github.yulichang.query.MPJLambdaQueryWrapper;
			import com.github.yulichang.query.MPJQueryWrapper;
			import com.github.yulichang.toolkit.JoinWrappers;
			import com.github.yulichang.wrapper.MPJLambdaWrapper;
			import com.mes.edgstoragecage.entity.EdgStorageCage;
			@@ -16,13 +16,18 @@
			import com.mes.pp.entity.OptimizeLayout;
			import com.mes.pp.mapper.OptimizeDetailMapper;
			import com.mes.taskcache.entity.TaskCache;
			import com.mes.taskcache.service.TaskCacheService;
			import com.mes.uppattenusage.entity.UpPattenUsage;
			import com.mes.uppattenusage.mapper.UpPattenUsageMapper;
			import lombok.extern.slf4j.Slf4j;
			import org.apache.commons.lang.StringUtils;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;

			import javax.annotation.Resource;
			import java.util.List;
			import java.util.Map;
			import java.util.Objects;
			import java.util.stream.Collectors;

			/**
			* <p>
			@@ -33,22 +38,30 @@
			* @since 2024-04-07
			*/
			@Service
			@Slf4j
			public class EdgStorageCageDetailsServiceImpl extends MPJBaseServiceImpl<EdgStorageCageDetailsMapper, EdgStorageCageDetails> implements EdgStorageCageDetailsService {

			@Autowired
			@Resource
			UpPattenUsageMapper upPattenUsageMapper;

			@Autowired
			OptimizeDetailMapper optimizeDetailMapper;

			@Autowired
			@Resource
			EdgStorageCageMapper edgStorageCageMapper;

			@Autowired
			TaskCacheService taskCacheService;


			/**
			* 识别拿走:200/破损:201
			*
			* @param glassId
			* @param ControlsId
			* @return
			*/
			@Override
			public boolean identWorn(String glassId, int ControlsId) {
			List<EdgStorageCageDetails> edgStorageCageDetails = baseMapper.selectList(new MPJLambdaQueryWrapper<EdgStorageCageDetails>().selectAll(EdgStorageCageDetails.class).eq(EdgStorageCageDetails::getGlassId,glassId));
			if (edgStorageCageDetails.size() == 1) {
			@@ -70,6 +83,7 @@

			/**
			* 获取切割当前版图
			*
			* @return
			*/
			@Override
			@@ -104,6 +118,7 @@

			/**
			* 获取工程下的当前版图
			*
			* @param current
			* @return
			*/
			@@ -129,6 +144,7 @@

			/**
			* 查询笼内版图差值范围内的此尺寸玻璃如无则按照钢化版图序号以及玻璃序号
			*
			* @param glassId
			* @param poor
			* @return
			@@ -138,45 +154,61 @@
			//1.去笼内查询此尺寸的玻璃目前版图差值内的玻璃是否有同尺寸的
			//1.1 有同尺寸的则生成同尺寸的任务
			//1.2 无同尺寸的则生成版图顺序最小的出片
			EdgStorageCageDetails edgStorageCageDetails= baseMapper.selectOne(new MPJLambdaQueryWrapper<EdgStorageCageDetails>()
			log.info("按照玻璃id：{}获取玻璃信息", glassId);
			EdgStorageCageDetails oldEdgStorageCageDetails = null;
			if (StringUtils.isNotEmpty(glassId)) {
			oldEdgStorageCageDetails = baseMapper.selectOne(new MPJLambdaQueryWrapper<EdgStorageCageDetails>()
			.selectAll(EdgStorageCageDetails.class)
			.eq(EdgStorageCageDetails::getGlassId,glassId)
			);
			List<EdgStorageCageDetails> listEdgStorageCageDetails= baseMapper.selectList(new LambdaQueryWrapper<EdgStorageCageDetails>()
			.lt(EdgStorageCageDetails::getState,200)
			.orderByAsc(EdgStorageCageDetails::getTemperingLayoutId,EdgStorageCageDetails::getTemperingFeedSequence)
			);
			EdgStorageCageDetails minTemperingLayoutId=new EdgStorageCageDetails();
			if(!listEdgStorageCageDetails.isEmpty()){
			minTemperingLayoutId=listEdgStorageCageDetails.get(0);
			.eq(EdgStorageCageDetails::getGlassId, glassId));
			}
			EdgStorageCageDetails result=new EdgStorageCageDetails();
			if(edgStorageCageDetails!=null&&minTemperingLayoutId!=null){
			result=edgStorageCageMapper.selectJoinOne(EdgStorageCageDetails.class,new MPJLambdaWrapper<EdgStorageCage>()

			LambdaQueryWrapper<TaskCache> wrapper = new LambdaQueryWrapper<TaskCache>().select(TaskCache::getGlassId).eq(TaskCache::getTaskType, "2");
			List<TaskCache> taskCacheList = taskCacheService.list(wrapper);
			List<String> glassIds = taskCacheList.stream().map(TaskCache::getGlassId).collect(Collectors.toList());
			log.info("获取笼内所有已出片的玻璃id信息:{}", glassIds);

			EdgStorageCageDetails minTemperingLayoutId = baseMapper.selectOne(new LambdaQueryWrapper<EdgStorageCageDetails>()
			.eq(EdgStorageCageDetails::getState, 100)
			.notIn(CollectionUtils.isNotEmpty(glassIds), EdgStorageCageDetails::getGlassId, glassIds)
			.orderByAsc(EdgStorageCageDetails::getTemperingLayoutId, EdgStorageCageDetails::getTemperingFeedSequence)
			.last("limit 1"));
			Assert.isTrue(minTemperingLayoutId != null, "笼内无符合要求的玻璃");
			log.info("获取笼内最小版图id{}及版序为{}的玻璃信息{}", minTemperingLayoutId.getTemperingLayoutId(),
			minTemperingLayoutId.getTemperingFeedSequence(), minTemperingLayoutId);

			EdgStorageCageDetails outEdgStorageCageDetails = null;
			if (oldEdgStorageCageDetails != null && minTemperingLayoutId != null) {
			log.info("按照上一片已出玻璃宽度{}，高度{}，及版图id区间{}到{}获取出片任务玻璃信息", oldEdgStorageCageDetails.getWidth()
			, oldEdgStorageCageDetails.getHeight(), minTemperingLayoutId.getTemperingLayoutId(), minTemperingLayoutId.getTemperingLayoutId() + poor);
			outEdgStorageCageDetails = edgStorageCageMapper.selectJoinOne(EdgStorageCageDetails.class, new MPJLambdaWrapper<EdgStorageCage>()
			.selectAll(EdgStorageCageDetails.class)
			.leftJoin(EdgStorageCageDetails.class,on->on
			.eq(EdgStorageCageDetails::getDeviceId,EdgStorageCage::getDeviceId)
			.eq(EdgStorageCageDetails::getSlot,EdgStorageCage::getSlot))
			.isNotNull(EdgStorageCageDetails::getSlot)
			.eq(EdgStorageCageDetails::getWidth,edgStorageCageDetails.getWidth())
			.eq(EdgStorageCageDetails::getHeight,edgStorageCageDetails.getHeight())
			.eq(EdgStorageCageDetails::getWidth, oldEdgStorageCageDetails.getWidth())
			.eq(EdgStorageCageDetails::getHeight, oldEdgStorageCageDetails.getHeight())
			.ge(EdgStorageCageDetails::getTemperingLayoutId,minTemperingLayoutId.getTemperingLayoutId())
			.le(EdgStorageCageDetails::getTemperingLayoutId,minTemperingLayoutId.getTemperingLayoutId()+poor)
			.orderByAsc(EdgStorageCageDetails::getTemperingLayoutId,EdgStorageCageDetails::getTemperingFeedSequence)
			.last("limit 1")
			);
			log.info("出片任务的玻璃信息：{}", outEdgStorageCageDetails);
			}

			if (result==null){
			result=edgStorageCageMapper.selectJoinOne(EdgStorageCageDetails.class,new MPJLambdaWrapper<EdgStorageCage>()
			.selectAll(EdgStorageCageDetails.class)
			.leftJoin(EdgStorageCageDetails.class,on->on
			.eq(EdgStorageCageDetails::getDeviceId,EdgStorageCage::getDeviceId)
			.eq(EdgStorageCageDetails::getSlot,EdgStorageCage::getSlot))
			.isNotNull(EdgStorageCageDetails::getSlot)
			.orderByAsc(EdgStorageCageDetails::getTemperingLayoutId,EdgStorageCageDetails::getTemperingFeedSequence)
			);
			if (outEdgStorageCageDetails == null) {
			outEdgStorageCageDetails = minTemperingLayoutId;
			// outEdgStorageCageDetails = edgStorageCageMapper.selectJoinOne(EdgStorageCageDetails.class, new MPJLambdaWrapper<EdgStorageCage>()
			// .selectAll(EdgStorageCageDetails.class)
			// .leftJoin(EdgStorageCageDetails.class, on -> on
			// .eq(EdgStorageCageDetails::getDeviceId, EdgStorageCage::getDeviceId)
			// .eq(EdgStorageCageDetails::getSlot, EdgStorageCage::getSlot))
			// .isNotNull(EdgStorageCageDetails::getSlot)
			// .orderByAsc(EdgStorageCageDetails::getTemperingLayoutId, EdgStorageCageDetails::getTemperingFeedSequence)
			// .last("limit 1")
			// );
			}
			return result;
			return outEdgStorageCageDetails;
			}

			}