Browse Source

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

YunaiV 2 months ago
parent
commit
0d4ff43f56

+ 2 - 2
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/MesMdWorkshopController.java

@@ -92,8 +92,8 @@ public class MesMdWorkshopController {
     @Operation(summary = "获得车间精简列表", description = "只包含被开启的车间,主要用于前端的下拉选项")
     public CommonResult<List<MesMdWorkshopRespVO>> getWorkshopSimpleList() {
         List<MesMdWorkshopDO> list = workshopService.getWorkshopListByStatus(CommonStatusEnum.ENABLE.getStatus());
-        return success(convertList(list, workshop -> new MesMdWorkshopRespVO()
-                .setId(workshop.getId()).setName(workshop.getName()).setCode(workshop.getCode())));
+        return success(convertList(list, ws -> new MesMdWorkshopRespVO()
+                .setId(ws.getId()).setCode(ws.getCode()).setName(ws.getName()).setArea(ws.getArea())));
     }
 
     @GetMapping("/export-excel")

+ 0 - 8
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/MesMdWorkstationController.java

@@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.mes.controller.admin.md.workstation;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
-import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
@@ -92,13 +91,6 @@ public class MesMdWorkstationController {
         return success(new PageResult<>(buildWorkstationRespVOList(pageResult.getList()), pageResult.getTotal()));
     }
 
-    @GetMapping("/simple-list")
-    @Operation(summary = "获得工作站精简列表", description = "只包含被开启的工作站,主要用于前端的下拉选项")
-    public CommonResult<List<MesMdWorkstationRespVO>> getWorkstationSimpleList() {
-        List<MesMdWorkstationDO> list = workstationService.getWorkstationListByStatus(CommonStatusEnum.ENABLE.getStatus());
-        return success(convertList(list, ws -> new MesMdWorkstationRespVO()
-                .setId(ws.getId()).setName(ws.getName()).setCode(ws.getCode())));
-    }
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出工作站 Excel")