feat: 完善质检、生产、销售、财务与人事模块并接入审批流程

gaoluyang

昨天 8c65f898ed6e5b0c7a94c792c4562f6ec831dccd

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/MesDvMachineryController.java

@@ -54,6 +54,8 @@
    private MesMdWorkshopService workshopService;
    @Resource
    private cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkstationService workstationService;
    @Resource
    private cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkstationMachineService workstationMachineService;

    @PostMapping("/create")
    @Operation(summary = "创建设备")
@@ -111,9 +113,17 @@
    }

    @GetMapping("/simple-list")
    @Operation(summary = "获得设备精简列表", description = "主要用于前端的下拉选项")
    public CommonResult<List<MesDvMachineryRespVO>> getMachinerySimpleList() {
    @Operation(summary = "获得设备精简列表", description = "主要用于前端的下拉选项；传 workstationId 时只返回该工作站绑定的设备")
    @Parameter(name = "workstationId", description = "工作站编号，可选；传则只返回该工作站绑定的设备")
    public CommonResult<List<MesDvMachineryRespVO>> getMachinerySimpleList(
            @RequestParam(value = "workstationId", required = false) Long workstationId) {
        List<MesDvMachineryDO> list = machineryService.getMachineryList();
        if (workstationId != null) {
            var boundIds = cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet(
                    workstationMachineService.getWorkstationMachineListByWorkstationId(workstationId),
                    cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkstationMachineDO::getMachineryId);
            list = list.stream().filter(machinery -> boundIds.contains(machinery.getId())).toList();
        }
        return success(BeanUtils.toBean(list, MesDvMachineryRespVO.class));
    }