YiWuProject.git

			@@ -48,7 +48,7 @@
			private DownStorageCageDetailsMapper downStorageCageDetailsMapper;

			@Override
			public DownGlassTask createDownGlassTask(GlassInfo glassInfo, Integer startCell, Integer endCell, String taskType) {
			public DownGlassTask createDownGlassTask(GlassInfo glassInfo, Integer startCell, Integer endCell, Integer taskType) {
			DownGlassTask downGlassTask = new DownGlassTask();

			BeanUtils.copyProperties(glassInfo, downGlassTask);
			@@ -60,7 +60,7 @@
			}

			@Override
			public DownGlassTask createDownGlassTask(DownStorageCageDetails glassInfo, Integer startCell, Integer endCell, String taskType) {
			public DownGlassTask createDownGlassTask(DownStorageCageDetails glassInfo, Integer startCell, Integer endCell, Integer taskType) {
			DownGlassTask downGlassTask = new DownGlassTask();

			BeanUtils.copyProperties(glassInfo, downGlassTask);
			@@ -92,10 +92,10 @@
			JoinWrappers.lambda(DownStorageCage.class)
			.selectAll(DownStorageCage.class)
			.leftJoin(DownStorageCageDetails.class, on -> on
			.eq(DownStorageCageDetails::getDeviceId, DownStorageCage::getDeviceId)
			.eq(DownStorageCageDetails::getSlot, DownStorageCage::getSlot)
			.eq(DownStorageCageDetails::getState, Const.GLASS_STATE_IN))
			.isNull(DownStorageCageDetails::getSlot)
			.eq(DownStorageCage::getEnableState, Const.SLOT_ON)
			.last("order by abs(t.slot - " + currentSlot + ") asc limit 2")
			);
			if (flag && CollectionUtil.isNotEmpty(emptyList)) {
			@@ -106,6 +106,7 @@
			}
			return emptyList.get(0);
			}


			@Override
			public List<DownStorageCageDetails> selectCacheMax() {
			@@ -127,6 +128,7 @@
			}



			@Override
			public List<Map<String, Object>> selectDownStorageCages() {
			return baseMapper.selectJoinMaps(JoinWrappers.lambda(DownStorageCage.class)