HangZhouMes.git

			@@ -3,6 +3,7 @@
			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.edgstoragecage.entity.EdgStorageCage;
			import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
			import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper;
			@@ -34,8 +35,21 @@
			@Autowired
			UpPattenUsageMapper upPattenUsageMapper;

			@Override
			public EdgStorageCage selectNearestEmpty(int currentSlot) {
			return this.selectJoinOne(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(t.slot - " + currentSlot + ") asc limit 1")
			);
			}

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

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

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

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

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