YiWuProject.git

			@@ -221,12 +221,12 @@
			LambdaQueryWrapper<BigStorageCageDetails> bigStorageCageDetailsWrapper = new LambdaQueryWrapper();
			bigStorageCageDetailsWrapper
			.eq(BigStorageCageDetails::getSlot, slot)
			.in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN, Const.GLASS_STATE_ARTIFICIAL);
			.in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL);

			List<BigStorageCageDetails> bigStorageCageDetailsList = bigStorageCageDetailsMapper.selectList(bigStorageCageDetailsWrapper);
			for (BigStorageCageDetails bigStorageCageDetails : bigStorageCageDetailsList
			) {
			double widths = bigStorageCageDetails.getWidth();
			double widths = Math.max(bigStorageCageDetails.getWidth(),bigStorageCageDetails.getHeight()) ;
			width = width - widths - glassGap;
			}
			//修改格子剩余宽度
			@@ -266,7 +266,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) 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 = 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")

			.groupBy("device_id");
			List<Map<String, Object>> bigStorageCageUsages = baseMapper.selectMaps(wrapper);
			@@ -283,4 +283,14 @@
			bigStorageCageWrapper.eq(BigStorageCage::getSlot, slot);
			baseMapper.update(bigStorageCage, bigStorageCageWrapper);
			}

			@Override
			public List<Integer> queryFreeDeviceByUsed(double thickness) {
			return baseMapper.queryFreeDeviceByUsed(thickness);
			}

			// @Override
			// public List<Integer> queryFreeDeviceByNotUsed(double thickness) {
			// return baseMapper.queryFreeDeviceByNotUsed(thickness);
			// }
			}