YiWuProject.git

			@@ -73,12 +73,13 @@
			log.info("任务表基础数据录入失败，请检查数据是否录入成功");
			return;
			}
			int request = task.getTaskState();
			int request = Integer.parseInt("" + value);
			log.info("开始执行任务，任务请信息为{}", task);
			if (request == 0) {
			log.info("未收到任务请求，结束本次任务");
			} else if (request == 1) {
			//进片任务
			log.info("进片任务：进片玻璃id为：{}", task.getGlassIdIn());
			intoTask(task, tableName);
			} else if (request == 2) {
			//出片任务
			@@ -247,6 +248,7 @@
			.eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN)
			.eq(EdgStorageCageDetails::getSlot, task.getCurrentCell()).eq(EdgStorageCageDetails::getWidth, edgStorageCageDetails.getWidth())
			.eq(EdgStorageCageDetails::getHeight, edgStorageCageDetails.getHeight()).eq(EdgStorageCageDetails::getThickness, edgStorageCageDetails.getThickness())
			.orderByAsc(EdgStorageCageDetails::getId).last("limit 1")
			);
			if (null != currentGlass) {
			edgStorageCageDetails = currentGlass;
			@@ -297,20 +299,16 @@
			Integer cell = task.getStartCell();
			Integer state = task.getTaskState();
			task.setTaskRunning(Const.GLASS_CACHE_TYPE_EMPTY);
			// task.setTaskState(Const.GLASS_CACHE_TYPE_EMPTY);
			task.setGlassIdOut("");
			task.setStartCell(0);
			// task.setWidth(0);
			// task.setHeight(0);
			// task.setThickness(0);
			// task.setFilmRemove(0);
			edgStorageDeviceTaskService.updateTaskMessage(tableName, task);
			edgStorageDeviceTaskHistoryService.update(new LambdaUpdateWrapper<EdgStorageDeviceTaskHistory>()
			.eq(EdgStorageDeviceTaskHistory::getTaskState, Const.RAW_GLASS_TASK_NEW)
			.set(EdgStorageDeviceTaskHistory::getTaskState,
			Const.GLASS_CACHE_TYPE_FINISH.equals(state) ? Const.RAW_GLASS_TASK_SUCCESS : Const.RAW_GLASS_TASK_FAILURE)
			);
			updateCellRemainWidth(cell);
			int device = tableName.equals("edg_storage_device_one_task") ? 1 : 2;
			updateCellRemainWidth(cell, device);
			return Boolean.TRUE;
			}

			@@ -426,7 +424,7 @@
			return Boolean.TRUE;
			}

			private boolean updateCellRemainWidth(int slot) {
			private boolean updateCellRemainWidth(int slot, int device) {
			List<EdgStorageCageDetails> list = edgStorageCageDetailsService.list(new LambdaQueryWrapper<EdgStorageCageDetails>().eq(EdgStorageCageDetails::getSlot, slot)
			.eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN));
			int remainWidth = cellLength;
			@@ -435,7 +433,7 @@
			remainWidth = cellLength - widthTotal >= 0 ? cellLength - widthTotal : 0;
			}
			edgStorageCageService.update(new LambdaUpdateWrapper<EdgStorageCage>().
			set(EdgStorageCage::getRemainWidth, remainWidth).eq(EdgStorageCage::getSlot, slot));
			set(EdgStorageCage::getRemainWidth, remainWidth).eq(EdgStorageCage::getSlot, slot).eq(EdgStorageCage::getDeviceId, device));
			return Boolean.TRUE;
			}
			}