~zhoushihao/YiWuProject.git

			@@ -10,6 +10,7 @@
			import com.mes.damage.service.DamageService;
			import com.mes.edgstoragecage.entity.EdgStorageCage;
			import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
			import com.mes.edgstoragecage.entity.vo.EdgSlotRemainVO;
			import com.mes.edgstoragecage.entity.vo.EdgStorageCageVO;
			import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper;
			import com.mes.edgstoragecage.mapper.EdgStorageCageMapper;
			@@ -72,12 +73,15 @@
			public List<EdgStorageCageVO> selectEdgStorageCagesByDeviceId(int deviceId) {
			List<EdgStorageCageVO> storageCageVOS = this.selectJoinList(EdgStorageCageVO.class, new MPJLambdaWrapper<EdgStorageCage>()
			.selectAll(EdgStorageCage.class)
			.selectCollection(EdgStorageCageDetails.class,EdgStorageCageVO::getDetails)
			.selectCollection(EdgStorageCageDetails.class, EdgStorageCageVO::getDetails)
			.leftJoin(EdgStorageCageDetails.class, on -> on
			.eq(EdgStorageCageDetails::getDeviceId, EdgStorageCage::getDeviceId)
			.eq(EdgStorageCageDetails::getSlot, EdgStorageCage::getSlot)
			.eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN))
			.eq(EdgStorageCage::getDeviceId, deviceId));
			.eq(EdgStorageCageDetails::getDeviceId, EdgStorageCage::getDeviceId)
			.eq(EdgStorageCageDetails::getSlot, EdgStorageCage::getSlot)
			.eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN))
			.eq(EdgStorageCage::getDeviceId, deviceId)
			.orderByAsc(EdgStorageCage::getSlot)
			.orderByAsc(EdgStorageCageDetails::getId)
			);
			return storageCageVOS;
			}

			@@ -148,5 +152,8 @@
			return baseMapper.getEdgStorageCageBySize(deviceId, width, height, slot);
			}


			@Override
			public void resetSlotRemainWidth(List<EdgSlotRemainVO> edgSlotRemainVOS) {
			baseMapper.resetSlotRemainWidth(edgSlotRemainVOS);
			}
			}