feat(mes): 基础参数与工序绑定，报工填写绑定的参数字段

liu

17 小时以前 cdf5605fb5caa0da0f134893bac350785250ea8a

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/MesProFeedbackController.java

@@ -8,9 +8,16 @@
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.mes.controller.admin.pro.feedback.vo.MesProFeedbackApproveReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.feedback.vo.MesProFeedbackBatchCheckRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.feedback.vo.MesProFeedbackBatchCreateReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.feedback.vo.MesProFeedbackBatchCreateRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.feedback.vo.MesProFeedbackPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.feedback.vo.MesProFeedbackQuickCreateReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.feedback.vo.MesProFeedbackQuickCreateRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.feedback.vo.MesProFeedbackRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.feedback.vo.MesProFeedbackSaveReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.feedback.vo.MesProFeedbackSubmitReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkstationDO;
@@ -41,8 +48,26 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import cn.iocoder.yudao.module.mes.controller.admin.pro.feedback.vo.MesProFeedbackTraceRespVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.ipqc.MesQcIpqcDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemconsume.MesWmItemConsumeDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemconsume.MesWmItemConsumeLineDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productproduce.MesWmProductProduceDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productproduce.MesWmProductProduceLineDO;
import cn.iocoder.yudao.module.mes.dal.mysql.qc.ipqc.MesQcIpqcMapper;
import cn.iocoder.yudao.module.mes.dal.mysql.wm.itemconsume.MesWmItemConsumeLineMapper;
import cn.iocoder.yudao.module.mes.dal.mysql.wm.itemconsume.MesWmItemConsumeMapper;
import cn.iocoder.yudao.module.mes.dal.mysql.wm.productproduce.MesWmProductProduceLineMapper;
import cn.iocoder.yudao.module.mes.dal.mysql.wm.productproduce.MesWmProductProduceMapper;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderParamRecordDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderParamRecordDetailDO;
import cn.iocoder.yudao.module.mes.dal.mysql.pro.workorder.MesProWorkOrderParamRecordMapper;
import cn.iocoder.yudao.module.mes.dal.mysql.pro.workorder.MesProWorkOrderParamRecordDetailMapper;
import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;

import java.io.IOException;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;

import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
@@ -78,6 +103,21 @@

    @Resource
    private AdminUserApi adminUserApi;

    @Resource
    private MesWmProductProduceMapper productProduceMapper;
    @Resource
    private MesWmProductProduceLineMapper productProduceLineMapper;
    @Resource
    private MesWmItemConsumeMapper itemConsumeMapper;
    @Resource
    private MesWmItemConsumeLineMapper itemConsumeLineMapper;
    @Resource
    private MesQcIpqcMapper ipqcMapper;
    @Resource
    private MesProWorkOrderParamRecordMapper paramRecordMapper;
    @Resource
    private MesProWorkOrderParamRecordDetailMapper paramRecordDetailMapper;

    @PostMapping("/create")
    @Operation(summary = "创建生产报工")
@@ -123,6 +163,15 @@
        return success(new PageResult<>(buildFeedbackRespVOList(pageResult.getList()), pageResult.getTotal()));
    }

    @GetMapping("/list-by-task")
    @Operation(summary = "按任务获得报工历史列表")
    @Parameter(name = "taskId", description = "任务编号", required = true, example = "1024")
    @PreAuthorize("@ss.hasPermission('mes:pro-feedback:query')")
    public CommonResult<List<MesProFeedbackRespVO>> getFeedbackListByTask(@RequestParam("taskId") Long taskId) {
        List<MesProFeedbackDO> list = feedbackService.getFeedbackListByTaskId(taskId);
        return success(buildFeedbackRespVOList(list));
    }

    @GetMapping("/export-excel")
    @Operation(summary = "导出生产报工 Excel")
    @PreAuthorize("@ss.hasPermission('mes:pro-feedback:export')")
@@ -137,10 +186,9 @@

    @PutMapping("/submit")
    @Operation(summary = "提交报工")
    @Parameter(name = "id", description = "编号", required = true)
    @PreAuthorize("@ss.hasPermission('mes:pro-feedback:update')")
    public CommonResult<Boolean> submitFeedback(@RequestParam("id") Long id) {
        feedbackService.submitFeedback(id);
    public CommonResult<Boolean> submitFeedback(@Valid @RequestBody MesProFeedbackSubmitReqVO reqVO) {
        feedbackService.submitFeedback(reqVO);
        return success(true);
    }

@@ -155,13 +203,62 @@

    @PutMapping("/approve")
    @Operation(summary = "审批报工")
    @Parameter(name = "id", description = "编号", required = true)
    @PreAuthorize("@ss.hasPermission('mes:pro-feedback:approve')")
    public CommonResult<Boolean> approveFeedback(@RequestParam("id") Long id) {
        return success(feedbackService.approveFeedback(id));
    public CommonResult<Boolean> approveFeedback(@Valid @RequestBody MesProFeedbackApproveReqVO reqVO) {
        return success(feedbackService.approveFeedback(reqVO));
    }

    @GetMapping("/batch-requirements")
    @Operation(summary = "检查报工审批前是否需要填写批次属性")
    @Parameter(name = "id", description = "报工单编号", required = true)
    @PreAuthorize("@ss.hasPermission('mes:pro-feedback:approve')")
    public CommonResult<MesProFeedbackBatchCheckRespVO> getBatchRequirements(@RequestParam("id") Long id) {
        return success(feedbackService.checkBatchRequirements(id));
    }

    @PostMapping("/quick-create")
    @Operation(summary = "快速报工（创建并提交）")
    @PreAuthorize("@ss.hasPermission('mes:pro-feedback:create')")
    public CommonResult<MesProFeedbackQuickCreateRespVO> quickCreateFeedback(
            @Valid @RequestBody MesProFeedbackQuickCreateReqVO reqVO) {
        return success(feedbackService.quickCreateFeedback(reqVO));
    }

    @PostMapping("/batch-create")
    @Operation(summary = "批量报工")
    @PreAuthorize("@ss.hasPermission('mes:pro-feedback:create')")
    public CommonResult<MesProFeedbackBatchCreateRespVO> batchCreateFeedback(
            @Valid @RequestBody MesProFeedbackBatchCreateReqVO reqVO) {
        return success(feedbackService.batchCreateFeedback(reqVO));
    }

    // ==================== 拼接 VO ====================

    @GetMapping("/trace/{id}")
    @Operation(summary = "获得报工追溯信息", description = "报工 + 产出/产出明细 + 消耗/消耗明细 + IPQC检验")
    @Parameter(name = "id", description = "报工编号", required = true, example = "1024")
    @PreAuthorize("@ss.hasPermission('mes:pro-feedback:query')")
    public CommonResult<MesProFeedbackTraceRespVO> getFeedbackTrace(@PathVariable("id") Long id) {
        MesProFeedbackDO feedback = feedbackService.getFeedback(id);
        if (feedback == null) {
            return success(null);
        }
        MesProFeedbackTraceRespVO trace = new MesProFeedbackTraceRespVO();
        // 1. 报工明细（复用展示拼接，带工单/任务/工序/物料/报工人等显示名）
        trace.setFeedback(buildFeedbackRespVOList(ListUtil.of(feedback)).get(0));
        // 2. 生产产出 + 产出明细行（关键工序才有）
        trace.setProductProduce(productProduceMapper.selectByFeedbackId(id));
        trace.setProductProduceLines(productProduceLineMapper.selectListByFeedbackId(id));
        // 3. 物料消耗 + 消耗明细行（倒冲工序才有）
        MesWmItemConsumeDO itemConsume = itemConsumeMapper.selectByFeedbackId(id);
        trace.setItemConsume(itemConsume);
        if (itemConsume != null) {
            trace.setItemConsumeLines(itemConsumeLineMapper.selectListByConsumeId(itemConsume.getId()));
        }
        // 4. IPQC 过程检验单（关键+需检验工序才有）
        trace.setIpqcList(ipqcMapper.selectListBySourceDoc(MesBizTypeConstants.PRO_FEEDBACK, id));
        return success(trace);
    }

    private List<MesProFeedbackRespVO> buildFeedbackRespVOList(List<MesProFeedbackDO> list) {
        if (CollUtil.isEmpty(list)) {
@@ -199,6 +296,28 @@
        Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
                convertSetByFlatMap(list, feedback ->
                        Stream.of(feedback.getFeedbackUserId(), feedback.getApproveUserId())));
        // 1.9 任务参数记录：报工回显参数值
        Set<Long> taskIds = convertSet(list, MesProFeedbackDO::getTaskId);
        Map<Long, List<MesProWorkOrderParamRecordDetailDO>> taskParamDetailMap = new HashMap<>();
        if (CollUtil.isNotEmpty(taskIds)) {
            List<MesProWorkOrderParamRecordDO> paramRecords = paramRecordMapper.selectListByTaskIds(taskIds);
            if (CollUtil.isNotEmpty(paramRecords)) {
                Map<Long, List<MesProWorkOrderParamRecordDetailDO>> recordDetailMap = paramRecordDetailMapper
                        .selectListByRecordIds(convertSet(paramRecords, MesProWorkOrderParamRecordDO::getId)).stream()
                        .collect(Collectors.groupingBy(MesProWorkOrderParamRecordDetailDO::getRecordId));
                for (MesProWorkOrderParamRecordDO record : paramRecords) {
                    taskParamDetailMap.putIfAbsent(record.getTaskId(),
                            recordDetailMap.getOrDefault(record.getId(), Collections.emptyList()));
                }
            }
        }
        Set<Long> paramUnitIds = new HashSet<>();
        taskParamDetailMap.values().forEach(details -> details.forEach(d -> {
            if (d.getUnitMeasureId() != null) {
                paramUnitIds.add(d.getUnitMeasureId());
            }
        }));
        Map<Long, MesMdUnitMeasureDO> paramUnitMeasureMap = unitMeasureService.getUnitMeasureMap(paramUnitIds);

        // 2. 拼接 VO
        return BeanUtils.toBean(list, MesProFeedbackRespVO.class, vo -> {
@@ -232,6 +351,22 @@
                    vo.setFeedbackUserNickname(user.getNickname()));
            findAndThen(userMap, vo.getApproveUserId(), user ->
                    vo.setApproveUserNickname(user.getNickname()));
            // 参数值回显（任务参数记录快照，含必填标记）
            List<MesProWorkOrderParamRecordDetailDO> taskDetails = taskParamDetailMap.get(vo.getTaskId());
            if (CollUtil.isNotEmpty(taskDetails)) {
                vo.setParamValues(taskDetails.stream().map(detail -> {
                    MesProFeedbackRespVO.ParamValueResp pv = new MesProFeedbackRespVO.ParamValueResp();
                    pv.setDetailId(detail.getId());
                    pv.setParamCode(detail.getParamCode());
                    pv.setParamName(detail.getParamName());
                    pv.setParamType(detail.getParamType());
                    pv.setUnitMeasureName(paramUnitMeasureMap.containsKey(detail.getUnitMeasureId())
                            ? paramUnitMeasureMap.get(detail.getUnitMeasureId()).getName() : null);
                    pv.setParamValue(detail.getParamValue());
                    pv.setRequired(detail.getRequired());
                    return pv;
                }).toList());
            }
        });
    }