~admin/HangZhouMes.git

			@@ -37,7 +37,7 @@
			UpPattenUsageMapper upPattenUsageMapper;

			@Override
			public EdgStorageCage selectNearestEmpty(int currentSlot) {
			public EdgStorageCage selectNearestEmpty(int currentSlot, boolean flag) {
			List<EdgStorageCage> emptyList = this.selectJoinList(EdgStorageCage.class, new MPJLambdaWrapper<EdgStorageCage>()
			.selectAll(EdgStorageCage.class)
			.leftJoin(EdgStorageCageDetails.class, on -> on
			@@ -46,7 +46,10 @@
			.isNull(EdgStorageCageDetails::getSlot)
			.last("order by abs(t.slot - " + currentSlot + ") asc limit 2")
			);
			if (CollectionUtil.isEmpty(emptyList) \|\| emptyList.size() < 2) {
			if (flag && CollectionUtil.isNotEmpty(emptyList)) {
			return emptyList.get(0);
			}
			if (CollectionUtil.isEmpty(emptyList) \|\| emptyList.size() == 1) {
			return null;
			}
			return emptyList.get(0);
			@@ -105,12 +108,9 @@
			.select(EdgStorageCageDetails::getGlassId, EdgStorageCageDetails::getWidth, EdgStorageCageDetails::getHeight, EdgStorageCageDetails::getId)
			.leftJoin(EdgStorageCageDetails.class, on -> on
			.eq(EdgStorageCageDetails::getDeviceId, EdgStorageCage::getDeviceId)
			.eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN)
			.eq(EdgStorageCageDetails::getSlot, EdgStorageCage::getSlot))
			);
			// return baseMapper.selectJoinMaps(new MPJQueryWrapper<EdgStorageCage>().selectAll(EdgStorageCage.class)
			// .select("escd.glass_id","escd.flow_card_id","escd.width","escd.height")
			// .leftJoin("edg_storage_cage_details escd on t.device_id=escd.device_id and t.slot=escd.slot")
			// );
			}

			/**
			@@ -122,9 +122,14 @@
			@Override
			public boolean updateEdgStorageCage(EdgStorageCage edgStorageCage) {
			EdgStorageCage edgItem = baseMapper.selectById(edgStorageCage.getId());
			edgItem.setEnableState(edgStorageCage.getEnableState());
			baseMapper.updateById(edgItem);
			return true;
			if(edgItem!=null){
			edgItem.setEnableState(edgStorageCage.getEnableState());
			baseMapper.updateById(edgItem);
			log.info("卧室缓存：【启用/禁用】参数:{} 结果:成功",edgStorageCage);
			return true;
			}
			log.info("卧室缓存：【启用/禁用】参数:{} 结果:失败",edgStorageCage);
			return false;
			}

			/**
			@@ -140,10 +145,11 @@
			log.info("正常" + edgItem);
			EdgStorageCageDetails edgDItem = edgStorageCageDetailsMapper.selectById(edgStorageCageDetails.getId());
			if (edgItem != null) {
			//移除
			//移除（破损,目前两个概念混合在一起,建议拆开）
			EdgStorageCageDetails result = edgStorageCageDetailsMapper.selectOne(new MPJLambdaWrapper<EdgStorageCageDetails>().eq(EdgStorageCageDetails::getSlot, edgStorageCageId));
			if (result != null) {
			result.setSlot(0);
			result.setState(201);
			edgStorageCageDetailsMapper.updateById(result);
			}
			//添加