YiWuProject.git

			@@ -13,9 +13,9 @@
			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.List;
			import java.util.Map;

			@@ -31,9 +31,9 @@
			@Service
			public class EdgStorageCageServiceImpl extends MPJBaseServiceImpl<EdgStorageCageMapper, EdgStorageCage> implements EdgStorageCageService {

			@Autowired
			@Resource
			EdgStorageCageDetailsMapper edgStorageCageDetailsMapper;
			@Autowired
			@Resource
			UpPattenUsageMapper upPattenUsageMapper;

			@Override
			@@ -44,6 +44,7 @@
			.eq(EdgStorageCageDetails::getSlot, EdgStorageCage::getSlot)
			.eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN))
			.isNull(EdgStorageCageDetails::getSlot)
			.eq(EdgStorageCage::getEnableState, Const.SLOT_ON)
			.last("order by abs(t.slot - " + currentSlot + ") asc limit 2")
			);
			if (flag && CollectionUtil.isNotEmpty(emptyList)) {
			@@ -53,23 +54,6 @@
			return null;
			}
			return emptyList.get(0);
			}

			/**
			* 查询笼内空格
			*
			* @return
			*/
			@Override
			public List<EdgStorageCage> selectCacheEmpty() {
			return baseMapper.selectJoinList(EdgStorageCage.class, new MPJLambdaWrapper<EdgStorageCage>()
			.selectAll(EdgStorageCage.class)
			.leftJoin(EdgStorageCageDetails.class, on -> on
			.eq(EdgStorageCageDetails::getSlot, EdgStorageCage::getSlot)
			.eq(EdgStorageCageDetails::getState, "100"))
			.isNull(EdgStorageCageDetails::getSlot)
			.last("order by abs(t.slot - 4) asc")
			);
			}

			/**