UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
@@ -172,11 +172,11 @@ <el-table-column prop="workstationId" align="center" :label="$t('reportWork.lowerbit')" min-width="80" /> <el-table-column prop="workstationId" align="center" :label="$t('reportWork.shelfnumber')" min-width="120" /> <el-table-column prop="flowCardId" align="center" :label="$t('reportWork.cardnumber')" min-width="150" /> <el-table-column prop="totalquantity" align="center" :label="$t('reportWork.totalquantity')" min-width="120" /> <el-table-column prop="racksnumber" align="center" :label="$t('reportWork.beendropped')" min-width="120" /> <el-table-column prop="totalQuantity" align="center" :label="$t('reportWork.totalquantity')" min-width="120" /> <el-table-column prop="racksNumber" align="center" :label="$t('reportWork.beendropped')" min-width="120" /> <el-table-column prop="layer" align="center" label="层数" min-width="120" /> <el-table-column prop="artificialnumber" align="center" label="人工下片数" min-width="120" /> <el-table-column prop="work_state" align="center" :label="$t('reportWork.state')" min-width="120" /> <el-table-column prop="otherNumber" align="center" label="人工下片数" min-width="120" /> <!-- <el-table-column prop="work_state" align="center" :label="$t('reportWork.state')" min-width="120" /> --> <el-table-column prop="deviceId" align="center" :label="$t('reportWork.devicenumber')" min-width="120" /> <el-table-column align="center" hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/service/StorageTaskService.java
@@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; import java.util.Map; import java.util.Optional; /** * @author system * @since 2024-07-09 14:51:27 @@ -12,5 +15,5 @@ List<StorageTask> findList(StorageTask params); Map<String, Optional<StorageTask>> findLatestTasks(); } hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/service/impl/StorageTaskServiceImpl.java
@@ -6,15 +6,21 @@ import com.mes.storagetask.mapper.StorageTaskMapper; import com.mes.storagetask.entity.StorageTask; import com.mes.storagetask.service.StorageTaskService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Optional; /** * @author system * @since 2024-07-09 14:51:27 */ @Service @Slf4j public class StorageTaskServiceImpl extends ServiceImpl<StorageTaskMapper, StorageTask> implements StorageTaskService { @Autowired @@ -27,5 +33,28 @@ } public Map<String, Optional<StorageTask>> findLatestTasks() { Map<String, Optional<StorageTask>> latestTasks = new HashMap<>(); // 查询最新的已完成任务 LambdaQueryWrapper<StorageTask> completedWrapper = new LambdaQueryWrapper<>(); completedWrapper.eq(StorageTask::getTaskType, "已完成") .orderByDesc(StorageTask::getId) .last("LIMIT 1"); Optional<StorageTask> latestCompletedTask = Optional.ofNullable(storageTaskMapper.selectOne(completedWrapper)); latestTasks.put("已完成", latestCompletedTask); // 查询最新的等待中任务 LambdaQueryWrapper<StorageTask> pendingWrapper = new LambdaQueryWrapper<>(); pendingWrapper.eq(StorageTask::getTaskType, "等待中") .orderByDesc(StorageTask::getId); Optional<StorageTask> latestPendingTask = Optional.ofNullable(storageTaskMapper.selectOne(pendingWrapper)); latestTasks.put("等待中", latestPendingTask); log.info(latestTasks+""); return latestTasks; } } hangzhoumesParent/moduleService/GlassStorageModule/src/test/java/mes/GlassStorageModuleApplicationTest.java
@@ -37,12 +37,13 @@ @Test public void testCacheGlass() { // storageTaskService.getBaseMapper().selectById(1); StorageTask storageTask=new StorageTask(); //StorageTask storageTask=new StorageTask(); // storageTask.setId(Long.valueOf("1")); // storageTask.setTaskState("1"); // storageTaskService.updateById(storageTask); // storageTaskService.getBaseMapper().deleteById(1); storageTaskService.findList(storageTask); // storageTaskService.findList(storageTask); storageTaskService.findLatestTasks(); }
