YiWuProject.git

			@@ -3,11 +3,14 @@
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
			import com.baomidou.mybatisplus.core.toolkit.StringUtils;
			import com.baomidou.mybatisplus.core.toolkit.Wrappers;
			import com.github.yulichang.base.MPJBaseServiceImpl;
			import com.github.yulichang.wrapper.MPJLambdaWrapper;
			import com.mes.bigstorage.entity.BigStorageCage;
			import com.mes.bigstorage.entity.BigStorageCageDetails;
			import com.mes.bigstorage.entity.dto.BigStorageAndDetailsDTO;
			import com.mes.bigstorage.entity.vo.BigStorageDetailsQueryVO;
			import com.mes.bigstorage.mapper.BigStorageCageDetailsMapper;
			import com.mes.bigstorage.mapper.BigStorageCageMapper;
			import com.mes.bigstorage.service.BigStorageCageService;
			@@ -52,6 +55,9 @@

			@Value("${mes.glassGap}")
			private Integer glassGap;

			@Value("${mes.slotWidth}")
			private Integer slotWidth;

			//进片逻辑
			@Override
			@@ -194,13 +200,10 @@
			.orderByDesc(GlassInfo::getTemperingFeedSequence);
			List<GlassInfo> glassInfoList = glassInfoService.list(glassInfoWrapper);
			if (glassInfoList.size() == Integer.parseInt(temperingNo.toString())) {
			for (GlassInfo glassInfo : glassInfoList
			) {

			for (GlassInfo glassInfo : glassInfoList) {
			TemperingGlassInfo temperingGlassInfo = new TemperingGlassInfo();
			BeanUtils.copyProperties(glassInfo, temperingGlassInfo);
			temperingGlassInfoService.save(temperingGlassInfo);

			}
			key = true;
			}
			@@ -211,6 +214,20 @@
			}
			}
			return false;
			}

			@Override
			public List<BigStorageAndDetailsDTO> querybigStorageCageDetail(BigStorageDetailsQueryVO query) {
			MPJLambdaWrapper<BigStorageCage> wrapper = new MPJLambdaWrapper<>();
			wrapper.selectAll(BigStorageCage.class).selectCollection(BigStorageCageDetails.class, BigStorageCage::getBigStorageCageDetails)
			.leftJoin(BigStorageCageDetails.class, on -> on.eq(BigStorageCageDetails::getSlot, BigStorageCage::getSlot)
			.like(StringUtils.isNotBlank(query.getFilmsId()), BigStorageCageDetails::getFilmsId, query.getFilmsId())
			.like(StringUtils.isNotBlank(query.getFlowCardId()), BigStorageCageDetails::getFlowCardId, query.getFlowCardId())
			.in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN, Const.GLASS_STATE_ARTIFICIAL, Const.GLASS_STATE_OUT_ING))
			.eq(BigStorageCage::getDeviceId, query.getDeviceId())
			.orderByAsc(BigStorageCage::getDeviceId)
			.orderByAsc(BigStorageCage::getSlot);
			return bigStorageCageMapper.selectJoinList(BigStorageAndDetailsDTO.class, wrapper);
			}

			//计算格子剩余宽度
			@@ -226,7 +243,7 @@
			List<BigStorageCageDetails> bigStorageCageDetailsList = bigStorageCageDetailsMapper.selectList(bigStorageCageDetailsWrapper);
			for (BigStorageCageDetails bigStorageCageDetails : bigStorageCageDetailsList
			) {
			double widths = Math.max(bigStorageCageDetails.getWidth(),bigStorageCageDetails.getHeight()) ;
			double widths = Math.max(bigStorageCageDetails.getWidth(), bigStorageCageDetails.getHeight());
			width = width - widths - glassGap;
			}
			//修改格子剩余宽度
			@@ -243,9 +260,9 @@
			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,Const.GLASS_STATE_OUT_ING))
			.orderByAsc(BigStorageCage::getDeviceId)
			.orderByAsc(BigStorageCage::getSlot);
			.in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN, Const.GLASS_STATE_ARTIFICIAL, Const.GLASS_STATE_OUT_ING))
			.orderByAsc(BigStorageCage::getDeviceId)
			.orderByAsc(BigStorageCage::getSlot);
			return bigStorageCageMapper.selectJoinList(BigStorageCage.class, wrapper);
			}

			@@ -256,7 +273,7 @@
			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,Const.GLASS_STATE_OUT_ING));
			.in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL).orderByAsc(BigStorageCageDetails::getUpdateTime));
			List<BigStorageCage> bigStorageCages = bigStorageCageMapper.selectJoinList(BigStorageCage.class, wrapper);
			Map<Integer, List<BigStorageCage>> listMap = bigStorageCages.stream().collect(Collectors.groupingBy(item -> item.getDeviceId()));
			return listMap;
			@@ -266,8 +283,7 @@
			@Override
			public List<Map<String, Object>> selectBigStorageCageUsage() {
			QueryWrapper<BigStorageCage> wrapper = new QueryWrapper<>();
			wrapper.select("device_id,ROUND(1 - SUM(CASE WHEN remain_width = 5000 THEN 1 ELSE 0 END) / COUNT(device_id), 2)*100 AS percentage,SUM(CASE WHEN remain_width = 5000 THEN 1 ELSE 0 END) AS count")

			wrapper.select("device_id,ROUND(1 - SUM(CASE WHEN remain_width = " + slotWidth + " THEN 1 ELSE 0 END) / COUNT(device_id), 2)*100 AS percentage,SUM(CASE WHEN remain_width = " + slotWidth + " THEN 1 ELSE 0 END) AS count")
			.groupBy("device_id");
			List<Map<String, Object>> bigStorageCageUsages = baseMapper.selectMaps(wrapper);