From 9ae5cf6edf1a2acb2a4283eaa35c0c3fa6f13eba Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 18 七月 2024 10:19:06 +0800
Subject: [PATCH] 原片仓储任务查询
---
UI-Project/src/views/UnLoadGlass/loadmachinerack.vue | 8 ++++----
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/service/impl/StorageTaskServiceImpl.java | 29 +++++++++++++++++++++++++++++
hangzhoumesParent/moduleService/GlassStorageModule/src/test/java/mes/GlassStorageModuleApplicationTest.java | 5 +++--
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/service/StorageTaskService.java | 5 ++++-
4 files changed, 40 insertions(+), 7 deletions(-)
diff --git a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
index 640d82f..8bbc6f5 100644
--- a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
+++ b/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"
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/service/StorageTaskService.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/service/StorageTaskService.java
index e774319..0af86b2 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/service/StorageTaskService.java
+++ b/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();
}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/service/impl/StorageTaskServiceImpl.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/service/impl/StorageTaskServiceImpl.java
index 8709da5..e9506e9 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/service/impl/StorageTaskServiceImpl.java
+++ b/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;
+ }
+
+
+
}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/test/java/mes/GlassStorageModuleApplicationTest.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/test/java/mes/GlassStorageModuleApplicationTest.java
index b680851..05ec5fe 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/test/java/mes/GlassStorageModuleApplicationTest.java
+++ b/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();
}
--
Gitblit v1.8.0