HangZhouMes.git

			@@ -125,7 +125,8 @@
			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);
			outTaskWrapper.lt(BigStorageCageOutTask::getTaskState, Const.BIG_STORAGE_OUT_SUCCESS)
			.orderByAsc(BigStorageCageOutTask::getId);
			List<BigStorageCageOutTask> bigStorageCageOutTaskList = bigStorageCageOutTaskMapper.selectList(outTaskWrapper);

			Map<String, BigStorageCageOutTask> listMap = bigStorageCageOutTaskList.stream()
			@@ -288,6 +289,7 @@
			.eq(BigStorageCageDetails::getEngineerId, glassInfo.getEngineerId())
			.eq(BigStorageCageDetails::getTemperingLayoutId, glassInfo.getTemperingLayoutId())
			.gt(BigStorageCage::getRemainWidth, Math.max(glassInfo.getWidth(), glassInfo.getHeight()))
			.lt(BigStorageCage::getSlotHeight, Math.min(glassInfo.getWidth(), glassInfo.getHeight()))
			.in(BigStorageCageDetails::getGlassId, glassIds)
			.last("limit 1");
			if (glassInfo.getTemperingLayoutId() == 0) {
			@@ -309,9 +311,10 @@
			bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
			.eq(BigStorageCage::getEnableState, Const.SLOT_ON)
			.eq(BigStorageCage::getRemainWidth, slotWidth)
			.lt(BigStorageCage::getSlotHeight, Math.min(glassInfo.getWidth(), glassInfo.getHeight()))
			// .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 engineer_id = '" + glassInfo.getEngineerId() + "' and tempering_layout_id = " + glassInfo.getTemperingLayoutId())
			"select distinct device_id from big_storage_cage_details where state!=101 and engineer_id = '" + glassInfo.getEngineerId() + "' and tempering_layout_id = " + glassInfo.getTemperingLayoutId())
			.last("limit 1"));
			if (null != bigStorageCage) {
			log.info("根据版图id找到笼子内的目标格子：{},玻璃id：{}", bigStorageCage.getSlot(), glassInfo.getGlassId());
			@@ -323,8 +326,8 @@
			}

			//获取玻璃的厚度：重新选笼子需要按照笼子可放玻璃厚度进行选择因为子查询排序对主sql无影响，所以先执行子查询获取顺序，然后一次去查询
			List<Integer> deviceUsedList = bigStorageCageService.queryFreeDeviceByUsed(glassInfo.getThickness());
			List<Integer> deviceUseds = bigStorageCageService.queryFreeDeviceByUsed(glassInfo.getThickness());
			List<Integer> deviceUsedList = bigStorageCageService.queryFreeDeviceByUsed(glassInfo.getThickness(),Math.min(glassInfo.getWidth(),glassInfo.getHeight()));
			List<Integer> deviceUseds = bigStorageCageService.queryFreeDeviceByUsed(glassInfo.getThickness(),Math.min(glassInfo.getWidth(),glassInfo.getHeight()));
			List<BigStorageCageDetails> engineerCount1 = baseMapper.selectList(
			new LambdaQueryWrapper<BigStorageCageDetails>()
			.notIn(BigStorageCageDetails::getState, Const.GLASS_STATE_OUT, Const.GLASS_STATE_DAMAGE, Const.GLASS_STATE_TAKE)
			@@ -366,6 +369,7 @@
			if (CollectionUtils.isEmpty(deviceUsedList)) {
			deviceUsedList = deviceUseds;
			}

			for (Integer item : deviceUsedList) {
			bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
			.eq(BigStorageCage::getRemainWidth, slotWidth)
			@@ -524,7 +528,7 @@
			}
			long startSlotCount = bigStorageCageOutTasks.stream().map(BigStorageCageOutTask::getStartSlot).distinct().count();
			long endSlotCount = bigStorageCageOutTasks.stream().map(BigStorageCageOutTask::getEndSlot).distinct().count();
			long time = (startSlotCount * 10 + endSlotCount * 20) / 60;
			long time = (startSlotCount * 20 + endSlotCount * 20) / 60;
			return time;
			}
			}