YiWuProject.git

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

			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			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;
			import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
			import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper;
			import com.mes.edgstoragecage.mapper.EdgStorageCageMapper;
			import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;
			import com.mes.pp.entity.OptimizeDetail;
			import com.mes.pp.entity.OptimizeLayout;
			import com.mes.pp.mapper.OptimizeDetailMapper;
			import com.mes.taskcache.entity.TaskCache;
			import com.mes.uppattenusage.entity.UpPattenUsage;
			import com.mes.uppattenusage.mapper.UpPattenUsageMapper;
			import org.springframework.beans.factory.annotation.Autowired;
			@@ -35,6 +39,9 @@
			UpPattenUsageMapper upPattenUsageMapper;
			@Autowired
			OptimizeDetailMapper optimizeDetailMapper;

			@Autowired
			EdgStorageCageMapper edgStorageCageMapper;

			/**
			* 识别拿走:200/破损:201
			@@ -120,4 +127,56 @@
			// );
			}

			/**
			* 查询笼内版图差值范围内的此尺寸玻璃如无则按照钢化版图序号以及玻璃序号
			* @param glassId
			* @param poor
			* @return
			*/
			@Override
			public EdgStorageCageDetails selectConformGlass(String glassId, int poor){
			//1.去笼内查询此尺寸的玻璃目前版图差值内的玻璃是否有同尺寸的
			//1.1 有同尺寸的则生成同尺寸的任务
			//1.2 无同尺寸的则生成版图顺序最小的出片
			EdgStorageCageDetails edgStorageCageDetails= 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);
			}
			EdgStorageCageDetails result=new EdgStorageCageDetails();
			if(edgStorageCageDetails!=null&&minTemperingLayoutId!=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)
			.eq(EdgStorageCageDetails::getWidth,edgStorageCageDetails.getWidth())
			.eq(EdgStorageCageDetails::getHeight,edgStorageCageDetails.getHeight())
			.ge(EdgStorageCageDetails::getTemperingLayoutId,minTemperingLayoutId.getTemperingLayoutId())
			.le(EdgStorageCageDetails::getTemperingLayoutId,minTemperingLayoutId.getTemperingLayoutId()+poor)
			.orderByAsc(EdgStorageCageDetails::getTemperingLayoutId,EdgStorageCageDetails::getTemperingFeedSequence)
			);
			}

			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)
			);
			}
			return result;
			}

			}