YiWuProject.git

			@@ -4,7 +4,6 @@
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
			import com.baomidou.mybatisplus.core.toolkit.Wrappers;
			import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			import com.github.yulichang.base.MPJBaseServiceImpl;
			import com.github.yulichang.wrapper.MPJLambdaWrapper;
			import com.mes.bigstorage.entity.BigStorageCage;
			@@ -12,18 +11,16 @@
			import com.mes.bigstorage.mapper.BigStorageCageDetailsMapper;
			import com.mes.bigstorage.mapper.BigStorageCageMapper;
			import com.mes.bigstorage.service.BigStorageCageService;
			import com.mes.common.config.Const;
			import com.mes.glassinfo.entity.GlassInfo;
			import com.mes.glassinfo.service.GlassInfoService;
			import com.mes.temperingglass.entity.TemperingGlassInfo;
			import com.mes.temperingglass.service.TemperingGlassInfoService;
			import lombok.extern.slf4j.Slf4j;
			import com.mes.glassinfo.entity.GlassInfo;
			import org.springframework.beans.BeanUtils;
			import org.springframework.stereotype.Service;

			import javax.annotation.Resource;
			import java.util.ArrayList;
			import java.util.Collections;
			import java.util.List;
			import java.util.Map;
			import java.util.stream.Collectors;
			@@ -142,7 +139,6 @@
			}



			if (bigStorageCageDetails.getSlot() != null) {
			log.info("6、当找到合适的格子时添加玻璃到笼子表");
			bigStorageCageDetails.setState(0);
			@@ -217,17 +213,25 @@
			@Override
			public void updateRemainWidth(int slot) {
			log.info("获取该格子内玻璃信息，计算格子剩余宽度");
			Integer width = 5000;
			List<BigStorageCageDetails> bigStorageCageDetailsList = Collections.singletonList(bigStorageCageDetailsMapper.selectById(slot));
			double width = 5000;
			LambdaQueryWrapper<BigStorageCageDetails> bigStorageCageDetailsWrapper = new LambdaQueryWrapper();
			bigStorageCageDetailsWrapper
			.eq(BigStorageCageDetails::getSlot, slot)
			.eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN)
			.eq(BigStorageCageDetails::getState, Const.GLASS_STATE_ARTIFICIAL);

			List<BigStorageCageDetails> bigStorageCageDetailsList = bigStorageCageDetailsMapper.selectList(bigStorageCageDetailsWrapper);
			for (BigStorageCageDetails bigStorageCageDetails : bigStorageCageDetailsList
			) {
			width -= Integer.parseInt(bigStorageCageDetails.getWidth().toString()) + bigStorageCageDetails.getGap();
			double widths = bigStorageCageDetails.getWidth();
			double gap = bigStorageCageDetails.getGap();
			width -= widths + gap;
			}
			//修改格子剩余宽度
			BigStorageCage bigStorageCage = new BigStorageCage();
			bigStorageCage.setRemainWidth(width);
			bigStorageCage.setRemainWidth((int) width);
			UpdateWrapper<BigStorageCage> bigStorageCageWrapper = new UpdateWrapper<>();
			bigStorageCageWrapper.eq("remain_width", width);
			bigStorageCageWrapper.eq("slot", slot);
			bigStorageCageMapper.update(bigStorageCage, bigStorageCageWrapper);
			}

			@@ -236,6 +240,10 @@
			public List<BigStorageCage> querybigStorageCageDetail(int deviceId) {
			LambdaQueryWrapper<BigStorageCage> bigStorageCageWrapper =new LambdaQueryWrapper<>();
			LambdaQueryWrapper<BigStorageCageDetails> bigStorageCageDetailsWrapper =new LambdaQueryWrapper<>();
			bigStorageCageDetailsWrapper
			.eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN)
			.or()
			.eq(BigStorageCageDetails::getState, Const.GLASS_STATE_ARTIFICIAL);
			if(deviceId!=0){
			bigStorageCageWrapper.eq(BigStorageCage::getDeviceId,deviceId);
			bigStorageCageDetailsWrapper.eq(BigStorageCageDetails::getDeviceId,deviceId);
			@@ -254,6 +262,19 @@
			return bigStorageCages;
			}

			//查询大理片信息，前端展示用
			@Override
			public Map<Integer, List<BigStorageCage>> querybigStorageCageDetail() {

			MPJLambdaWrapper<BigStorageCage> wrapper = new MPJLambdaWrapper<>();
			wrapper.selectAll(BigStorageCage.class).selectCollection(BigStorageCageDetails.class, BigStorageCage::getBigStorageCageDetails)
			.leftJoin(BigStorageCageDetails.class, on -> on.eq(BigStorageCageDetails::getSlot, BigStorageCage::getSlot)
			.in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN, Const.GLASS_STATE_ARTIFICIAL));
			List<BigStorageCage> bigStorageCages = bigStorageCageMapper.selectJoinList(BigStorageCage.class, wrapper);
			Map<Integer, List<BigStorageCage>> listMap = bigStorageCages.stream().collect(Collectors.groupingBy(item -> item.getDeviceId()));
			return listMap;
			}

			//笼子使用情况，界面展示用
			@Override
			public List<Map<String, Object>> selectBigStorageCageUsage() {