From f62353986a6afff2e2a5a17cfdec30d04a4e600d Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期六, 07 十二月 2024 16:50:09 +0800
Subject: [PATCH] 1、fixbug:缺片详情临时解决 将所有缺片信息返回 2、新增膜系 状态:避免同一块玻璃占用完相同尺寸关系表 3、中空界面注释开始暂停按钮 4、领取/强制执行任务增加限制,必须在本条线没有任务的情况下可以领取

---
 hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassRelationInfoController.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassRelationInfoController.java b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassRelationInfoController.java
index 7bddf61..b290ff7 100644
--- a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassRelationInfoController.java
+++ b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassRelationInfoController.java
@@ -34,10 +34,17 @@
         return Result.success(bigStorageCageDetails);
     }
 
+    //    @ApiOperation("鏌ヨ鎸囧畾娴佺▼鍗″強灞傛暟鐨勭己鐗囪鎯�")
+//    @PostMapping("/queryLackByFlowCard")
+//    public Result<Map<Integer, List<LackDetailsDTO>> > queryLackByFlowCard(String flowCardId) {
+//        Map<Integer, List<LackDetailsDTO>>  lackDetailsList = hollowGlassRelationInfoService.queryLackByFlowCard(flowCardId);
+//        return Result.success(lackDetailsList);
+//    }
+//
     @ApiOperation("鏌ヨ鎸囧畾娴佺▼鍗″強灞傛暟鐨勭己鐗囪鎯�")
     @PostMapping("/queryLackByFlowCard")
-    public Result<Map<Integer, List<LackDetailsDTO>> > queryLackByFlowCard(String flowCardId) {
-        Map<Integer, List<LackDetailsDTO>>  lackDetailsList = hollowGlassRelationInfoService.queryLackByFlowCard(flowCardId);
+    public Result<List<LackDetailsDTO>> queryLackByFlowCard(String flowCardId) {
+        List<LackDetailsDTO> lackDetailsList = hollowGlassRelationInfoService.queryLackByFlowCard(flowCardId);
         return Result.success(lackDetailsList);
     }
 

--
Gitblit v1.8.0