feat(mes): 生产计划审批改走协同办公，修复工单领料与产成品入库校验

gaoluyang

8 天以前 7bd10d34e8a8dc2437ec8551eb511e37634d7306

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

@@ -12,7 +12,9 @@
import cn.iocoder.yudao.module.mes.controller.admin.md.workstation.vo.workshop.MesMdWorkshopPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.md.workstation.vo.workshop.MesMdWorkshopRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.md.workstation.vo.workshop.MesMdWorkshopSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.factory.MesMdFactoryDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkshopDO;
import cn.iocoder.yudao.module.mes.service.md.factory.MesMdFactoryService;
import cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkshopService;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
@@ -47,6 +49,9 @@
    @Resource
    private AdminUserApi adminUserApi;

    @Resource
    private MesMdFactoryService factoryService;

    @PostMapping("/create")
    @Operation(summary = "创建车间")
    @PreAuthorize("@ss.hasPermission('mes:md-workshop:create')")
@@ -74,7 +79,6 @@
    @GetMapping("/get")
    @Operation(summary = "获得车间")
    @Parameter(name = "id", description = "编号", required = true, example = "1024")
    @PreAuthorize("@ss.hasPermission('mes:md-workshop:query')")
    public CommonResult<MesMdWorkshopRespVO> getWorkshop(@RequestParam("id") Long id) {
        MesMdWorkshopDO workshop = workshopService.getWorkshop(id);
        if (workshop == null) {
@@ -86,7 +90,6 @@

    @GetMapping("/page")
    @Operation(summary = "获得车间分页")
    @PreAuthorize("@ss.hasPermission('mes:md-workshop:query')")
    public CommonResult<PageResult<MesMdWorkshopRespVO>> getWorkshopPage(@Valid MesMdWorkshopPageReqVO pageReqVO) {
        PageResult<MesMdWorkshopDO> pageResult = workshopService.getWorkshopPage(pageReqVO);
        return success(new PageResult<>(buildWorkshopRespVOList(pageResult.getList()), pageResult.getTotal()));
@@ -99,14 +102,19 @@
        if (CollUtil.isEmpty(list)) {
            return success(Collections.emptyList());
        }
        // 批量获取负责人信息
        // 批量获取负责人、所属工厂信息
        Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
                convertSet(list, MesMdWorkshopDO::getChargeUserId));
        Map<Long, MesMdFactoryDO> factoryMap = factoryService.getFactoryMap(
                convertSet(list, MesMdWorkshopDO::getFactoryId));
        return success(convertList(list, ws -> {
            MesMdWorkshopRespVO vo = new MesMdWorkshopRespVO()
                    .setId(ws.getId()).setCode(ws.getCode()).setName(ws.getName()).setArea(ws.getArea());
                    .setId(ws.getId()).setCode(ws.getCode()).setName(ws.getName()).setArea(ws.getArea())
                    .setFactoryId(ws.getFactoryId());
            MapUtils.findAndThen(userMap, ws.getChargeUserId(),
                    user -> vo.setChargeUserName(user.getNickname()));
            MapUtils.findAndThen(factoryMap, ws.getFactoryId(),
                    factory -> vo.setFactoryName(factory.getName()));
            return vo;
        }));
    }
@@ -129,13 +137,17 @@
        if (CollUtil.isEmpty(list)) {
            return Collections.emptyList();
        }
        // 1. 批量获取负责人信息
        // 1. 批量获取负责人、所属工厂信息
        Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
                convertSet(list, MesMdWorkshopDO::getChargeUserId));
        Map<Long, MesMdFactoryDO> factoryMap = factoryService.getFactoryMap(
                convertSet(list, MesMdWorkshopDO::getFactoryId));
        // 2. 拼接 VO
        return BeanUtils.toBean(list, MesMdWorkshopRespVO.class, vo -> {
            MapUtils.findAndThen(userMap, vo.getChargeUserId(),
                    user -> vo.setChargeUserName(user.getNickname()));
            MapUtils.findAndThen(factoryMap, vo.getFactoryId(),
                    factory -> vo.setFactoryName(factory.getName()));
        });
    }