~admin/HangZhouMes.git

			@@ -91,7 +91,7 @@
			public List<BigStorageCageDetails> selectFeedTask(){
			//进片任务数据
			LambdaQueryWrapper<BigStorageCageDetails> feedWrapper = new LambdaQueryWrapper<>();
			feedWrapper.eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN);
			feedWrapper.eq(BigStorageCageDetails::getState, Const.GLASS_STATE_NEW);
			List<BigStorageCageDetails> bigStorageCageDetailsList = baseMapper.selectList(feedWrapper);

			LambdaQueryWrapper<BigStorageCageFeedTask> feedTaskWrapper = new LambdaQueryWrapper<>();
			@@ -113,9 +113,8 @@
			@Override
			public List<BigStorageCageDetails> selectOutTask(){
			LambdaQueryWrapper<BigStorageCageDetails> outWrapper = new LambdaQueryWrapper<>();
			outWrapper.eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN);
			outWrapper.in(BigStorageCageDetails::getState, Const.GLASS_STATE_OUT_ING,Const.GLASS_STATE_SCHEDULE_ING);
			List<BigStorageCageDetails> bigStorageCageDetailsList = baseMapper.selectList(outWrapper);

			LambdaQueryWrapper<BigStorageCageOutTask> outTaskWrapper = new LambdaQueryWrapper<>();
			outTaskWrapper.lt(BigStorageCageOutTask::getTaskState, Const.BIG_STORAGE_OUT_SUCCESS);
			List<BigStorageCageOutTask> bigStorageCageOutTaskList = bigStorageCageOutTaskMapper.selectList(outTaskWrapper);
			@@ -134,7 +133,7 @@
			}
			return bigStorageCageDetailsList;
			}
			}


			/**
			* 判断当前玻璃是否能上车
			@@ -267,6 +266,7 @@
			.selectAll(BigStorageCage.class)
			.leftJoin(BigStorageCageDetails.class, BigStorageCageDetails::getSlot, BigStorageCage::getSlot)
			.eq(BigStorageCage::getEnableState, Const.SLOT_ON)
			.eq(BigStorageCageDetails::getEngineerId,glassInfo.getEngineerId())
			.eq(BigStorageCageDetails::getTemperingLayoutId, glassInfo.getTemperingLayoutId())
			.gt(BigStorageCage::getRemainWidth, Math.max(glassInfo.getWidth(), glassInfo.getHeight()))
			.last("limit 1");
			@@ -288,7 +288,7 @@
			.eq(BigStorageCage::getRemainWidth, slotWidth)
			.notInSql(BigStorageCage::getSlot, "select distinct slot from big_storage_cage_details where state = 0")
			.inSql(BigStorageCage::getDeviceId,
			"select distinct device_id from big_storage_cage_details where tempering_layout_id = " + glassInfo.getTemperingLayoutId())
			"select distinct device_id from big_storage_cage_details where engineer_id = "+glassInfo.getEngineerId()+" and tempering_layout_id = " + glassInfo.getTemperingLayoutId())
			.last("limit 1"));
			if (null != bigStorageCage) {
			bigStorageDTO = new BigStorageDTO();