云
12 小时以前 fec1341c1cb8e11cfbe3fa7dfabe447edb72b630
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourceissue/MesWmOutsourceIssueController.java
@@ -11,10 +11,10 @@
import cn.iocoder.yudao.module.mes.controller.admin.wm.outsourceissue.vo.MesWmOutsourceIssuePageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.outsourceissue.vo.MesWmOutsourceIssueRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.outsourceissue.vo.MesWmOutsourceIssueSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.vendor.MesMdVendorDO;
import cn.iocoder.yudao.module.srm.api.supplier.SrmSupplierApi;
import cn.iocoder.yudao.module.srm.api.supplier.dto.SrmSupplierRespDTO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.outsourceissue.MesWmOutsourceIssueDO;
import cn.iocoder.yudao.module.mes.service.md.vendor.MesMdVendorService;
import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService;
import cn.iocoder.yudao.module.mes.service.wm.outsourceissue.MesWmOutsourceIssueService;
import io.swagger.v3.oas.annotations.Operation;
@@ -36,11 +36,6 @@
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
/**
 * MES 外协发料单 Controller
 *
 * @author 芋道源码
 */
@Tag(name = "管理后台 - MES 外协发料单")
@RestController
@RequestMapping("/mes/wm/outsource-issue")
@@ -50,7 +45,7 @@
    @Resource
    private MesWmOutsourceIssueService outsourceIssueService;
    @Resource
    private MesMdVendorService vendorService;
    private SrmSupplierApi srmSupplierApi;
    @Resource
    private MesProWorkOrderService workOrderService;
@@ -81,7 +76,6 @@
    @GetMapping("/get")
    @Operation(summary = "获得外协发料单")
    @Parameter(name = "id", description = "编号", required = true, example = "1024")
    @PreAuthorize("@ss.hasPermission('mes:wm-outsource-issue:query')")
    public CommonResult<MesWmOutsourceIssueRespVO> getOutsourceIssue(@RequestParam("id") Long id) {
        MesWmOutsourceIssueDO issue = outsourceIssueService.getOutsourceIssue(id);
        if (issue == null) {
@@ -92,7 +86,6 @@
    @GetMapping("/page")
    @Operation(summary = "获得外协发料单分页")
    @PreAuthorize("@ss.hasPermission('mes:wm-outsource-issue:query')")
    public CommonResult<PageResult<MesWmOutsourceIssueRespVO>> getOutsourceIssuePage(
            @Valid MesWmOutsourceIssuePageReqVO pageReqVO) {
        PageResult<MesWmOutsourceIssueDO> pageResult = outsourceIssueService.getOutsourceIssuePage(pageReqVO);
@@ -150,7 +143,6 @@
    @GetMapping("/check-quantity")
    @Operation(summary = "校验外协发料单数量", description = "校验每行明细数量之和是否等于行发料数量")
    @Parameter(name = "id", description = "编号", required = true)
    @PreAuthorize("@ss.hasPermission('mes:wm-outsource-issue:query')")
    public CommonResult<Boolean> checkOutsourceIssueQuantity(@RequestParam("id") Long id) {
        return success(outsourceIssueService.checkOutsourceIssueQuantity(id));
    }
@@ -162,14 +154,15 @@
            return Collections.emptyList();
        }
        // 1. 获得关联数据
        Map<Long, MesMdVendorDO> vendorMap = vendorService.getVendorMap(
                convertSet(list, MesWmOutsourceIssueDO::getVendorId));
        Map<Long, SrmSupplierRespDTO> vendorMap = srmSupplierApi.getSupplierList(
                convertSet(list, MesWmOutsourceIssueDO::getVendorId)).getCheckedData().stream()
                .collect(java.util.stream.Collectors.toMap(SrmSupplierRespDTO::getId, s -> s));
        Map<Long, MesProWorkOrderDO> workOrderMap = workOrderService.getWorkOrderMap(
                convertSet(list, MesWmOutsourceIssueDO::getWorkOrderId));
        // 2. 构建结果
        return BeanUtils.toBean(list, MesWmOutsourceIssueRespVO.class, vo -> {
            MapUtils.findAndThen(vendorMap, vo.getVendorId(), vendor ->
                    vo.setVendorCode(vendor.getCode()).setVendorName(vendor.getName()));
                    vo.setVendorName(vendor.getName()));
            MapUtils.findAndThen(workOrderMap, vo.getWorkOrderId(), workOrder ->
                    vo.setWorkOrderCode(workOrder.getCode()).setWorkOrderName(workOrder.getName()));
        });