~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;

			/**