yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productissue/MesWmProductIssueController.java
@@ -9,14 +9,16 @@
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.wm.productissue.vo.MesWmProductIssuePageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.productissue.vo.MesWmProductIssueSupplementReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.productissue.vo.MesWmProductIssueRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.productissue.vo.MesWmProductIssueSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.client.MesMdClientDO;
import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
import cn.iocoder.yudao.module.crm.api.customer.dto.CrmCustomerRespDTO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkstationDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productissue.MesWmProductIssueDO;
import cn.iocoder.yudao.module.mes.service.md.client.MesMdClientService;
import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
import cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkstationService;
import cn.iocoder.yudao.module.mes.service.pro.task.MesProTaskService;
import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService;
@@ -55,13 +57,29 @@
    @Resource
    private MesProTaskService taskService;
    @Resource
    private MesMdClientService clientService;
    private CrmCustomerApi customerApi;
    @PostMapping("/create")
    @Operation(summary = "创建领料出库单")
    @PreAuthorize("@ss.hasPermission('mes:wm-product-issue:create')")
    public CommonResult<Long> createProductIssue(@Valid @RequestBody MesWmProductIssueSaveReqVO createReqVO) {
        return success(issueService.createProductIssue(createReqVO));
    }
    @PostMapping("/generate-by-work-order")
    @Operation(summary = "根据生产工单生成领料任务",
            description = "按工单 BOM 物料清单 × 工单计划数量算出应领数量,扣除已领数量后生成草稿领料出库单")
    @Parameter(name = "workOrderId", description = "生产工单编号", required = true, example = "1024")
    @PreAuthorize("@ss.hasPermission('mes:wm-product-issue:create')")
    public CommonResult<Long> generateByWorkOrder(@RequestParam("workOrderId") Long workOrderId) {
        return success(issueService.generateByWorkOrder(workOrderId));
    }
    @PostMapping("/supplement")
    @Operation(summary = "创建补领辅料单", description = "按工单补领辅料,生成草稿领料单(类型=补领辅料),后续走 提交→拣货→完成 流程")
    @PreAuthorize("@ss.hasPermission('mes:wm-product-issue:create')")
    public CommonResult<Long> createSupplementIssue(@Valid @RequestBody MesWmProductIssueSupplementReqVO reqVO) {
        return success(issueService.createSupplementIssue(reqVO));
    }
    @PutMapping("/update")
@@ -84,7 +102,6 @@
    @GetMapping("/get")
    @Operation(summary = "获得领料出库单")
    @Parameter(name = "id", description = "编号", required = true, example = "1024")
    @PreAuthorize("@ss.hasPermission('mes:wm-product-issue:query')")
    public CommonResult<MesWmProductIssueRespVO> getProductIssue(@RequestParam("id") Long id) {
        MesWmProductIssueDO issue = issueService.getProductIssue(id);
        if (issue == null) {
@@ -95,7 +112,6 @@
    @GetMapping("/page")
    @Operation(summary = "获得领料出库单分页")
    @PreAuthorize("@ss.hasPermission('mes:wm-product-issue:query')")
    public CommonResult<PageResult<MesWmProductIssueRespVO>> getProductIssuePage(
            @Valid MesWmProductIssuePageReqVO pageReqVO) {
        PageResult<MesWmProductIssueDO> pageResult = issueService.getProductIssuePage(pageReqVO);
@@ -153,7 +169,6 @@
    @GetMapping("/check-quantity")
    @Operation(summary = "校验领料出库单数量", description = "校验每行明细数量之和是否等于行领料数量")
    @Parameter(name = "id", description = "编号", required = true)
    @PreAuthorize("@ss.hasPermission('mes:wm-product-issue:query')")
    public CommonResult<Boolean> checkProductIssueQuantity(@RequestParam("id") Long id) {
        return success(issueService.checkProductIssueQuantity(id));
    }
@@ -171,7 +186,7 @@
                convertSet(list, MesWmProductIssueDO::getWorkOrderId));
        Map<Long, MesProTaskDO> taskMap = taskService.getTaskMap(
                convertSet(list, MesWmProductIssueDO::getTaskId));
        Map<Long, MesMdClientDO> clientMap = clientService.getClientMap(
        Map<Long, CrmCustomerRespDTO> clientMap = customerApi.getCustomerMap(
                convertSet(workOrderMap.values(), MesProWorkOrderDO::getClientId));
        // 2. 构建结果
        return BeanUtils.toBean(list, MesWmProductIssueRespVO.class, vo -> {
@@ -182,7 +197,7 @@
            MapUtils.findAndThen(workOrderMap, vo.getWorkOrderId(), workOrder -> {
                vo.setWorkOrderCode(workOrder.getCode());
                MapUtils.findAndThen(clientMap, workOrder.getClientId(), client ->
                        vo.setClientCode(client.getCode()).setClientName(client.getName()));
                        vo.setClientName(client.getName()));
            });
        });
    }