~admin/HangZhouMes.git

			@@ -2,7 +2,6 @@

			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.toolkit.JoinWrappers;
			@@ -21,7 +20,6 @@
			import com.mes.bigstoragetask.mapper.BigStorageCageFeedTaskMapper;
			import com.mes.bigstoragetask.mapper.BigStorageCageOutTaskMapper;
			import com.mes.common.config.Const;
			import com.mes.common.utils.RedisUtil;
			import com.mes.damage.entity.Damage;
			import com.mes.damage.service.DamageService;
			import com.mes.glassinfo.entity.GlassInfo;
			@@ -31,13 +29,17 @@
			import com.mes.temperingglass.entity.TemperingGlassInfo;
			import com.mes.temperingglass.mapper.TemperingGlassInfoMapper;
			import com.mes.temperingglass.service.TemperingGlassInfoService;
			import com.mes.utils.RedisUtil;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.beans.BeanUtils;
			import org.springframework.beans.factory.annotation.Value;
			import org.springframework.stereotype.Service;

			import javax.annotation.Resource;
			import java.util.*;
			import java.util.ArrayList;
			import java.util.Iterator;
			import java.util.List;
			import java.util.Map;
			import java.util.stream.Collectors;

			/**
			@@ -310,6 +312,29 @@

			//获取玻璃的厚度：重新选笼子需要按照笼子可放玻璃厚度进行选择因为子查询排序对主sql无影响，所以先执行子查询获取顺序，然后一次去查询
			List<Integer> deviceUsedList = bigStorageCageService.queryFreeDeviceByUsed(glassInfo.getThickness());
			List<Integer> deviceUseds = bigStorageCageService.queryFreeDeviceByUsed(glassInfo.getThickness());
			List<BigStorageCageDetails> engineerCount1 = baseMapper.selectList(
			new LambdaQueryWrapper<BigStorageCageDetails>()
			.notIn(BigStorageCageDetails::getState, Const.GLASS_STATE_OUT,Const.GLASS_STATE_DAMAGE,Const.GLASS_STATE_TAKE)
			.select(BigStorageCageDetails::getEngineerId)
			.groupBy(BigStorageCageDetails::getEngineerId)
			.between(BigStorageCageDetails::getDeviceId, 1, 5)
			);
			List<BigStorageCageDetails> engineerCount2 = baseMapper.selectList(
			new LambdaQueryWrapper<BigStorageCageDetails>()
			.notIn(BigStorageCageDetails::getState, Const.GLASS_STATE_OUT,Const.GLASS_STATE_DAMAGE,Const.GLASS_STATE_TAKE)
			.select(BigStorageCageDetails::getEngineerId)
			.groupBy(BigStorageCageDetails::getEngineerId)
			.between(BigStorageCageDetails::getDeviceId, 6, 8)
			);
			if (engineerCount1.size() > engineerCount2.size()) {
			deviceUsedList.removeIf(device -> device < 6);
			} else {
			deviceUsedList.removeIf(device -> device > 5);
			}
			if (CollectionUtils.isEmpty(deviceUsedList)) {
			deviceUsedList = deviceUseds;
			}
			for (Integer item : deviceUsedList) {
			bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
			.eq(BigStorageCage::getRemainWidth, slotWidth)
			@@ -381,17 +406,17 @@
			.in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN)
			.orderBy(Boolean.TRUE, sequenceOrder, GlassInfo::getTemperingFeedSequence));
			if (CollectionUtils.isNotEmpty(temperingGlassInfos)) {
			if ("0".equals(temperingFeedSequence)){
			if ("0".equals(temperingFeedSequence)) {
			if (CollectionUtils.isNotEmpty(temperingGlassInfos)) {
			plcStorageCageTask.computeOutMoreGlassInfo(temperingGlassInfos, Boolean.FALSE, "");
			}
			}else{
			} else {
			temperingGlassInfoService.saveBatch(temperingGlassInfos);
			}
			return true;
			}
			}
			return false;
			return false;
			}