From 270d3f8179b0e0d4b59a7f27d05eecdbb275f365 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期五, 19 四月 2024 15:28:28 +0800
Subject: [PATCH] 识别版图测试
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java | 1 +
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/controller/EdgStorageCageController.java | 2 ++
2 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/controller/EdgStorageCageController.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/controller/EdgStorageCageController.java
index 2631a1a..d7a94c3 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/controller/EdgStorageCageController.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/controller/EdgStorageCageController.java
@@ -6,6 +6,7 @@
import com.mes.taskcache.entity.TaskCache;
import com.mes.taskcache.service.impl.TaskCacheServiceImpl;
import com.mes.utils.Result;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -23,6 +24,7 @@
* @author zhoush
* @since 2024-04-07
*/
+@Api("纾ㄨ竟鍓嶇紦瀛�")
@RestController
@RequestMapping("/edgStorageCage")
public class EdgStorageCageController {
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
index e1df386..e5339fb 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
@@ -47,6 +47,7 @@
List<Map> list = upPattenUsageMapper.selectJoinList(
Map.class, new MPJQueryWrapper<UpPattenUsage>().selectAll(UpPattenUsage.class)
.select("escd.glass_id", "escd.flow_card_id", "escd.width", "escd.height")
+ .select("gi.x_coordinate","gi.y_coordinate","gi.tempering_feed_sequence")
.leftJoin("glass_info gi on t.layout_sequence=gi.pattern_sequence and t.engineering_id=gi.engineer_id")
.leftJoin("edg_storage_cage_details escd on gi.id=escd.glass_id")
.eq("t.state", 1)
--
Gitblit v1.8.0