YiWuProject.git

			@@ -1,9 +1,7 @@
			package com.mes.edgstoragecage.service.impl;

			import cn.hutool.core.collection.CollectionUtil;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.github.yulichang.base.MPJBaseServiceImpl;
			import com.github.yulichang.toolkit.JoinWrappers;
			import com.github.yulichang.wrapper.MPJLambdaWrapper;
			import com.mes.common.config.Const;
			import com.mes.damage.entity.Damage;
			@@ -14,18 +12,13 @@
			import com.mes.edgstoragecage.entity.vo.EdgStorageCageVO;
			import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper;
			import com.mes.edgstoragecage.mapper.EdgStorageCageMapper;
			import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;
			import com.mes.edgstoragecage.service.EdgStorageCageService;
			import com.mes.uppattenusage.entity.UpPattenUsage;
			import com.mes.uppattenusage.mapper.UpPattenUsageMapper;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;

			import javax.annotation.Resource;
			import java.util.HashMap;
			import java.util.List;
			import java.util.Map;

			/**
			* <p>
			@@ -45,7 +38,7 @@
			DamageService damageService;

			@Override
			public EdgStorageCage selectNearestEmpty(int currentSlot, boolean flag) {
			public EdgStorageCage selectNearestEmpty(Integer currentSlot, int deviceId, boolean flag) {
			List<EdgStorageCage> emptyList = this.selectJoinList(EdgStorageCage.class, new MPJLambdaWrapper<EdgStorageCage>()
			.selectAll(EdgStorageCage.class)
			.leftJoin(EdgStorageCageDetails.class, on -> on
			@@ -53,6 +46,7 @@
			.eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN))
			.isNull(EdgStorageCageDetails::getSlot)
			.eq(EdgStorageCage::getEnableState, Const.SLOT_ON)
			.eq(EdgStorageCage::getDeviceId, deviceId)
			.last("order by abs(t.slot - " + currentSlot + ") asc limit 2")
			);
			if (flag && CollectionUtil.isNotEmpty(emptyList)) {