From cdf315d5737cb69bd0a326f31694c89f2eb24d04 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 27 十月 2025 08:29:17 +0800
Subject: [PATCH] 钢化排产查询接口，排序功能，读取正在钢化的工程进行排序
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java | 4 ++++
UI-Project/src/views/EngineerScheduling/engineerScheduling.vue | 4 ----
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/UI-Project/src/views/EngineerScheduling/engineerScheduling.vue b/UI-Project/src/views/EngineerScheduling/engineerScheduling.vue
index d1bf2aa..ee56256 100644
--- a/UI-Project/src/views/EngineerScheduling/engineerScheduling.vue
+++ b/UI-Project/src/views/EngineerScheduling/engineerScheduling.vue
@@ -405,7 +405,6 @@
>
{{ t('scheduling.remove') }}
</el-button>
- <!-- 鍚戜笂鎸夐挳 -->
<el-button
type="default"
size="small"
@@ -415,7 +414,6 @@
>
鈫�
</el-button>
- <!-- 鍚戜笅鎸夐挳 -->
<el-button
type="default"
size="small"
@@ -425,8 +423,6 @@
>
鈫�
</el-button>
-
- <!-- 缃《鎸夐挳 -->
<el-button
size="small"
@click="moveToTop(row)"
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
index ee1bfc4..b233b36 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
@@ -581,6 +581,7 @@
@Override
public List<OptimizeProject> queryTemperingOrder() {
+ String temperingengineerId = redisUtil.getCacheObject("temperingEngineerId");
List<TemperingGlassCountDTO> temperingGlassCountDTOS = baseMapper.queryTemperingGlassCountSummary(1);
List<OptimizeProject> projectList = optimizeProjectService.engineerScheduling(new OptimizeProject() {{
setType(3);
@@ -592,6 +593,9 @@
for (TemperingGlassCountDTO dto : temperingGlassCountDTOS) {
if (projectNoSet.contains(dto.getEngineerId())) {
OptimizeProject project = new OptimizeProject();
+ if (Objects.equals(dto.getEngineerId(), temperingengineerId)) {
+ project.setState(1);
+ }
project.setProjectNo(dto.getEngineerId());
project.setGlassType(dto.getFilmsId());
project.setGlassThickness(dto.getThickness().intValue());
--
Gitblit v1.8.0