~admin/HangZhouMes.git

			@@ -7,6 +7,8 @@
			import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
			import com.kangaroohy.milo.runner.subscription.SubscriptionCallback;
			import com.mes.common.config.Const;
			import com.mes.edgglasstaskqueueinfo.entity.EdgGlassTaskQueueInfo;
			import com.mes.edgglasstaskqueueinfo.service.EdgGlassTaskQueueInfoService;
			import com.mes.edgstoragecage.entity.EdgStorageCage;
			import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
			import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;
			@@ -24,6 +26,7 @@
			import org.springframework.stereotype.Service;

			import javax.annotation.Resource;
			import java.util.Date;
			import java.util.List;

			/**
			@@ -50,6 +53,9 @@
			@Resource
			EdgStorageDeviceTaskHistoryService edgStorageDeviceTaskHistoryService;

			@Resource
			EdgGlassTaskQueueInfoService edgGlassTaskQueueInfoService;

			@Value("${mes.glassGap}")
			private int glassGap;
			@Value("${mes.threshold}")
			@@ -59,6 +65,7 @@

			@Override
			public void onSubscribe(String identifier, Object value) {
			log.info("当前正在执行的任务为{}", value);
			String tableName = identifier.contains("edg_storage_device_one_task") ? EDG_STORAGE_DEVICE_ONE_TASK : EDG_STORAGE_DEVICE_TWO_TASK;
			EdgStorageDeviceTask task = edgStorageDeviceTaskService.queryTaskMessage(tableName);
			try {
			@@ -66,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) {
			//出片任务
			@@ -83,7 +91,7 @@
			}
			} else if (request == 4) {
			log.info("将启动子改为0");
			task.setTaskRunning(Const.GLASS_CACHE_TYPE_EMPTY);
			task.setTaskRunning(Const.GLASS_CACHE_TYPE_RUNNING);
			edgStorageDeviceTaskService.updateTaskMessage(tableName, task);
			} else {
			finishTask(task, tableName);
			@@ -240,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;
			@@ -263,20 +272,26 @@
			task.setGlassIdOut(edgStorageCageDetails.getGlassId());
			task.setStartCell(edgStorageCageDetails.getSlot());
			task.setTaskRunning(taskType);
			task.setWidth((int) edgStorageCageDetails.getWidth() * 10);
			task.setHeight((int) edgStorageCageDetails.getHeight() * 10);
			task.setThickness((int) edgStorageCageDetails.getThickness() * 10);
			task.setFilmRemove(0);
			// task.setWidth((int) edgStorageCageDetails.getWidth() * 10);
			// task.setHeight((int) edgStorageCageDetails.getHeight() * 10);
			// task.setThickness((int) edgStorageCageDetails.getThickness() * 10);
			// task.setFilmRemove(0);
			edgStorageDeviceTaskService.updateTaskMessage(tableName, task);
			saveHistoryTask(task);
			//更新详情表任务出片中
			edgStorageCageDetailsService.update(new LambdaUpdateWrapper<EdgStorageCageDetails>()
			.set(EdgStorageCageDetails::getState, Const.GLASS_STATE_OUT)
			.eq(EdgStorageCageDetails::getGlassId, edgStorageCageDetails.getGlassId()));
			//todo:磨边对列表新增一条数据
			EdgGlassTaskQueueInfo edgInfo = new EdgGlassTaskQueueInfo();
			BeanUtils.copyProperties(task, edgInfo);
			edgInfo.setState(Const.GLASS_STATE_NEW);
			edgGlassTaskQueueInfoService.save(edgInfo);
			return Boolean.TRUE;
			}

			private boolean finishTask(EdgStorageDeviceTask task, String tableName) {
			log.info("当前任务信息为：{}", task);
			if (task.getTaskState() <= 4) {
			log.info("有正在执行的任务，结束");
			return Boolean.FALSE;
			@@ -284,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;
			}

			@@ -407,12 +418,13 @@
			EdgStorageDeviceTaskHistory taskHistory = new EdgStorageDeviceTaskHistory();
			BeanUtils.copyProperties(task, taskHistory);
			taskHistory.setTaskType(task.getTaskRunning());
			taskHistory.setCreateTime(new Date());
			taskHistory.setTaskState(Const.RAW_GLASS_TASK_NEW);
			edgStorageDeviceTaskHistoryService.save(taskHistory);
			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;
			@@ -421,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;
			}
			}