From c1ad529b3d450a1762cb957d81b80d57e475a7dd Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期六, 28 十二月 2024 14:49:36 +0800
Subject: [PATCH] 1、卧式理片笼新增重置接口，供前端使用 2、与电气交互新增状态6用于电气手动汇报后将任务重置，避免任务无法重置导致车间无法生产
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/impl/EdgStorageDeviceTaskServiceImpl.java | 65 +++++++++++++++++++++++++++++++-
1 files changed, 62 insertions(+), 3 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/impl/EdgStorageDeviceTaskServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/impl/EdgStorageDeviceTaskServiceImpl.java
index 46691ce..4e13ea7 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/impl/EdgStorageDeviceTaskServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/impl/EdgStorageDeviceTaskServiceImpl.java
@@ -1,7 +1,15 @@
package com.mes.opctask.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.mes.common.config.Const;
+import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
+import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;
+import com.mes.job.OpcCacheGlassTask;
import com.mes.opctask.entity.EdgStorageDeviceTask;
+import com.mes.opctask.entity.EdgStorageDeviceTaskHistory;
import com.mes.opctask.mapper.EdgStorageDeviceTaskMapper;
+import com.mes.opctask.service.EdgStorageDeviceTaskHistoryService;
import com.mes.opctask.service.EdgStorageDeviceTaskService;
import org.springframework.stereotype.Service;
@@ -14,12 +22,20 @@
*/
@Service
public class EdgStorageDeviceTaskServiceImpl implements EdgStorageDeviceTaskService {
-// @Override
-// public void updateTaskMessage(Integer slot, Integer taskRunning, String glassIdOut) {
- // }
+
+ private static final String EDG_STORAGE_DEVICE_ONE_TASK = "edg_storage_device_one_task";
+
+ private static final String EDG_STORAGE_DEVICE_TWO_TASK = "edg_storage_device_two_task";
+
+ @Resource
+ private EdgStorageDeviceTaskHistoryService edgStorageDeviceTaskHistoryService;
+ @Resource
+ private EdgStorageCageDetailsService edgStorageCageDetailsService;
@Resource
EdgStorageDeviceTaskMapper edgStorageDeviceTaskMapper;
+ @Resource
+ OpcCacheGlassTask opcCacheGlassTask;
@Override
public EdgStorageDeviceTask queryTaskMessage(String tableName) {
@@ -30,4 +46,47 @@
public boolean updateTaskMessage(String tableName, EdgStorageDeviceTask edgStorageDeviceTask) {
return edgStorageDeviceTaskMapper.updateTaskMessage(tableName, edgStorageDeviceTask);
}
+
+
+ @Override
+ public Boolean resetTask(Integer deviceId) {
+ String tableName = deviceId == 1 ? EDG_STORAGE_DEVICE_ONE_TASK : EDG_STORAGE_DEVICE_TWO_TASK;
+ EdgStorageDeviceTaskHistory taskHistory = edgStorageDeviceTaskHistoryService.getOne(new LambdaQueryWrapper<EdgStorageDeviceTaskHistory>()
+ .eq(EdgStorageDeviceTaskHistory::getTaskState, Const.RAW_GLASS_TASK_NEW)
+ .eq(EdgStorageDeviceTaskHistory::getDeviceId, deviceId)
+ .orderByDesc(EdgStorageDeviceTaskHistory::getCreateTime).last("limit 1"));
+ if (taskHistory == null) {
+ return Boolean.FALSE;
+ }
+ Integer cell = taskHistory.getStartCell();
+ Integer taskType = taskHistory.getTaskType();
+ if (Const.GLASS_CACHE_TYPE_IN_ALL.contains(taskType)) {
+ String glassId = taskHistory.getGlassIdIn();
+ edgStorageCageDetailsService.remove(new LambdaQueryWrapper<EdgStorageCageDetails>()
+ .eq(EdgStorageCageDetails::getDeviceId, deviceId)
+ .eq(EdgStorageCageDetails::getSlot, cell)
+ .eq(EdgStorageCageDetails::getGlassId, glassId));
+ } else {
+ String glassId = taskHistory.getGlassIdOut();
+ edgStorageCageDetailsService.update(new LambdaUpdateWrapper<EdgStorageCageDetails>()
+ .set(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN)
+ .eq(EdgStorageCageDetails::getDeviceId, deviceId)
+ .eq(EdgStorageCageDetails::getSlot, cell)
+ .eq(EdgStorageCageDetails::getGlassId, glassId));
+ }
+
+ opcCacheGlassTask.updateCellRemainWidth(cell, deviceId, taskHistory);
+ edgStorageDeviceTaskHistoryService.update(new LambdaUpdateWrapper<EdgStorageDeviceTaskHistory>()
+ .eq(EdgStorageDeviceTaskHistory::getTaskState, Const.RAW_GLASS_TASK_NEW)
+ .eq(EdgStorageDeviceTaskHistory::getDeviceId, deviceId)
+ .set(EdgStorageDeviceTaskHistory::getTaskState, Const.RAW_GLASS_TASK_FAILURE)
+ );
+ //鏈�鍚庢洿鏂颁换鍔★紝淇濊瘉浠诲姟鍓嶇殑鍔ㄤ綔閮藉仛瀹�
+ EdgStorageDeviceTask task = new EdgStorageDeviceTask();
+ task.setTaskRunning(Const.GLASS_CACHE_TYPE_EMPTY);
+ task.setGlassIdOut("");
+ task.setStartCell(0);
+ this.updateTaskMessage(tableName, task);
+ return Boolean.TRUE;
+ }
}
--
Gitblit v1.8.0