BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 0d4ff43f56f3cc1128a5ea4324cf046f234f2572

Authored by YunaiV
1 parent 1c188583

✨ feat(mes): 更新车间和工作站选择器，增加 tooltip 展示详情

Inline Side-by-side
Showing 2 changed files with 2 additions and 10 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/MesMdWorkshopController.java
  View file @0d4ff43
@@ -92,8 +92,8 @@ public class MesMdWorkshopController { @@ -92,8 +92,8 @@ public class MesMdWorkshopController {
92 @Operation(summary = "获得车间精简列表", description = "只包含被开启的车间，主要用于前端的下拉选项") 92 @Operation(summary = "获得车间精简列表", description = "只包含被开启的车间，主要用于前端的下拉选项")
93 public CommonResult<List<MesMdWorkshopRespVO>> getWorkshopSimpleList() { 93 public CommonResult<List<MesMdWorkshopRespVO>> getWorkshopSimpleList() {
94 List<MesMdWorkshopDO> list = workshopService.getWorkshopListByStatus(CommonStatusEnum.ENABLE.getStatus()); 94 List<MesMdWorkshopDO> list = workshopService.getWorkshopListByStatus(CommonStatusEnum.ENABLE.getStatus());
95 - return success(convertList(list, workshop -> new MesMdWorkshopRespVO()  
96 - .setId(workshop.getId()).setName(workshop.getName()).setCode(workshop.getCode()))); 95 + return success(convertList(list, ws -> new MesMdWorkshopRespVO()
  96 + .setId(ws.getId()).setCode(ws.getCode()).setName(ws.getName()).setArea(ws.getArea())));
97 } 97 }
98 98
99 @GetMapping("/export-excel") 99 @GetMapping("/export-excel")
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/MesMdWorkstationController.java
  View file @0d4ff43
@@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.mes.controller.admin.md.workstation; @@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.mes.controller.admin.md.workstation;
2 2
3 import cn.hutool.core.collection.CollUtil; 3 import cn.hutool.core.collection.CollUtil;
4 import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; 4 import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
5 -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;  
6 import cn.iocoder.yudao.framework.common.pojo.CommonResult; 5 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
7 import cn.iocoder.yudao.framework.common.pojo.PageParam; 6 import cn.iocoder.yudao.framework.common.pojo.PageParam;
8 import cn.iocoder.yudao.framework.common.pojo.PageResult; 7 import cn.iocoder.yudao.framework.common.pojo.PageResult;
@@ -92,13 +91,6 @@ public class MesMdWorkstationController { @@ -92,13 +91,6 @@ public class MesMdWorkstationController {
92 return success(new PageResult<>(buildWorkstationRespVOList(pageResult.getList()), pageResult.getTotal())); 91 return success(new PageResult<>(buildWorkstationRespVOList(pageResult.getList()), pageResult.getTotal()));
93 } 92 }
94 93
95 - @GetMapping("/simple-list")  
96 - @Operation(summary = "获得工作站精简列表", description = "只包含被开启的工作站，主要用于前端的下拉选项")  
97 - public CommonResult<List<MesMdWorkstationRespVO>> getWorkstationSimpleList() {  
98 - List<MesMdWorkstationDO> list = workstationService.getWorkstationListByStatus(CommonStatusEnum.ENABLE.getStatus());  
99 - return success(convertList(list, ws -> new MesMdWorkstationRespVO()  
100 - .setId(ws.getId()).setName(ws.getName()).setCode(ws.getCode())));  
101 - }  
102 94
103 @GetMapping("/export-excel") 95 @GetMapping("/export-excel")
104 @Operation(summary = "导出工作站 Excel") 96 @Operation(summary = "导出工作站 Excel")