fix(mes): 隔离设备物料并支持销售产品映射

liu

昨天 381e02b9eccbe953b31d09f2af1c2ce77c816140

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/archive/MesPdArchiveController.java

@@ -71,7 +71,6 @@
    @GetMapping("/get")
    @Operation(summary = "获得归档台账")
    @Parameter(name = "id", description = "编号", required = true, example = "1024")
    @PreAuthorize("@ss.hasPermission('mes:pd-archive:query')")
    public CommonResult<MesPdArchiveRespVO> getArchive(@RequestParam("id") Long id) {
        MesPdArchiveDO archive = archiveService.getArchive(id);
        if (archive == null) {
@@ -82,9 +81,8 @@

    @GetMapping("/page")
    @Operation(summary = "获得归档台账分页（按项目/产品聚合）")
    @PreAuthorize("@ss.hasPermission('mes:pd-archive:query')")
    public CommonResult<PageResult<MesPdArchiveRespVO>> getArchivePage(@Valid MesPdArchivePageReqVO pageReqVO,
                                                                        Page<MesPdArchiveGroupRespVO> page) {
    public CommonResult<PageResult<MesPdArchiveRespVO>> getArchivePage(@Valid MesPdArchivePageReqVO pageReqVO) {
        Page<MesPdArchiveGroupRespVO> page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
        IPage<MesPdArchiveGroupRespVO> archivePage = archiveService.getArchivePageGroupByProject(pageReqVO, page);
        return CommonResult.success(new PageResult<>(
                buildArchiveRespVOList(archivePage.getRecords()), archivePage.getTotal()));
@@ -93,7 +91,6 @@
    @GetMapping("/detail-by-product")
    @Operation(summary = "获得归档台账详情（按产品）")
    @Parameter(name = "productCode", description = "产品编号", required = true, example = "1")
    @PreAuthorize("@ss.hasPermission('mes:pd-archive:query')")
    public CommonResult<List<MesPdArchiveDetailRespVO>> getArchiveDetailByProduct(@RequestParam("productCode") String productCode) {
        return success(archiveService.getArchiveDetailByProductCode(productCode));
    }
@@ -105,7 +102,9 @@
    public void exportArchiveExcel(@Valid MesPdArchivePageReqVO pageReqVO,
                                   HttpServletResponse response) throws IOException {
        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
        IPage<MesPdArchiveGroupRespVO> archivePage = archiveService.getArchivePageGroupByProject(pageReqVO, null);
        // 注意：Mapper 返回 IPage，必须传入非空的分页对象；size=-1 表示不分页，searchCount=false 跳过 count 查询
        Page<MesPdArchiveGroupRespVO> page = new Page<>(1, PageParam.PAGE_SIZE_NONE, false);
        IPage<MesPdArchiveGroupRespVO> archivePage = archiveService.getArchivePageGroupByProject(pageReqVO, page);
        ExcelUtils.write(response, "归档台账.xls", "数据", MesPdArchiveRespVO.class,
                buildArchiveRespVOList(archivePage.getRecords()));
    }