Merge branch 'dev_New_pro' into dev_平遥县盛达铸造厂

gongchunyi

2026-07-07 72a32c227fdf10f34fe563a7de35169da5729eea

 src/main/java/com/ruoyi/basic/controller/ProductController.java

@@ -120,6 +120,24 @@
        return productService.listPageProductModel(page, productModel);
    }

    @Operation(summary = "分页查询原料")
    @GetMapping("/pageModel/material")
    public IPage<ProductModelVo> listPageMaterial(Page<ProductModelVo> page, ProductModel productModel) {
        return productService.listPageProductModelByType(page, productModel, 278L);
    }

    @Operation(summary = "分页查询半成品")
    @GetMapping("/pageModel/semiFinished")
    public IPage<ProductModelVo> listPageSemiFinished(Page<ProductModelVo> page, ProductModel productModel) {
        return productService.listPageProductModelByType(page, productModel, 277L);
    }

    @Operation(summary = "分页查询成品")
    @GetMapping("/pageModel/finished")
    public IPage<ProductModelVo> listPageFinished(Page<ProductModelVo> page, ProductModel productModel) {
        return productService.listPageProductModelByType(page, productModel, 276L);
    }

    /**
     * 导入产品
     */