YiWuProject.git

			@@ -1,5 +1,6 @@
			package com.mes.edgstoragecage.service.impl;

			import cn.hutool.core.collection.CollectionUtil;
			import com.github.yulichang.base.MPJBaseServiceImpl;
			import com.github.yulichang.toolkit.JoinWrappers;
			import com.github.yulichang.wrapper.MPJLambdaWrapper;
			@@ -37,18 +38,23 @@

			@Override
			public EdgStorageCage selectNearestEmpty(int currentSlot) {
			return this.selectJoinOne(EdgStorageCage.class,new MPJLambdaWrapper<EdgStorageCage>()
			List<EdgStorageCage> emptyList = this.selectJoinList(EdgStorageCage.class, new MPJLambdaWrapper<EdgStorageCage>()
			.selectAll(EdgStorageCage.class)
			.leftJoin(EdgStorageCageDetails.class,on->on
			.eq(EdgStorageCageDetails::getSlot,EdgStorageCage::getSlot)
			.eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN))
			.isNull(EdgStorageCageDetails::getSlot)
			.last("order by abs(slot - 4) asc limit 1")
			.last("order by abs(t.slot - " + currentSlot + ") asc limit 2")
			);
			if (CollectionUtil.isEmpty(emptyList) \|\| emptyList.size() < 2) {
			return null;
			}
			return emptyList.get(0);
			}

			/**
			* 查询笼内空格
			*
			* @return
			*/
			@Override
			@@ -59,12 +65,13 @@
			.eq(EdgStorageCageDetails::getSlot,EdgStorageCage::getSlot)
			.eq(EdgStorageCageDetails::getState,"100"))
			.isNull(EdgStorageCageDetails::getSlot)
			.last("order by abs(slot - 4) asc")
			.last("order by abs(t.slot - 4) asc")
			);
			}

			/**
			* 查询笼内出片任务按钢化版图号+版图内序号
			*
			* @return
			*/
			@Override
			@@ -87,6 +94,7 @@

			/**
			* 理片缓存详情
			*
			* @return
			*/
			@Override
			@@ -107,6 +115,7 @@

			/**
			* 修改理片笼信息功能：对笼内栅格玻璃【启用/禁用】
			*
			* @param edgStorageCage
			* @return
			*/
			@@ -120,6 +129,7 @@

			/**
			*修改理片笼信息功能：对笼内栅格玻璃【添加/删除/更换】
			*
			* @param edgStorageCageId
			* @param edgStorageCageDetails
			* @return