From ef2e7cae1910cab2e8397e57fddc167d63f02c75 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 02 七月 2026 15:44:16 +0800
Subject: [PATCH] feat: 新增原料、半成品、成品数据接口
---
src/main/java/com/ruoyi/basic/controller/ProductController.java | 18 ++++++++++++++++++
src/main/java/com/ruoyi/basic/service/IProductService.java | 2 ++
src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java | 6 ++++++
3 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/controller/ProductController.java b/src/main/java/com/ruoyi/basic/controller/ProductController.java
index 1c5224b..8e010d8 100644
--- a/src/main/java/com/ruoyi/basic/controller/ProductController.java
+++ b/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);
+ }
+
/**
* 瀵煎叆浜у搧
*/
diff --git a/src/main/java/com/ruoyi/basic/service/IProductService.java b/src/main/java/com/ruoyi/basic/service/IProductService.java
index 1abaad4..ec3ca19 100644
--- a/src/main/java/com/ruoyi/basic/service/IProductService.java
+++ b/src/main/java/com/ruoyi/basic/service/IProductService.java
@@ -20,4 +20,6 @@
List<ProductTreeDto> selectProductList(ProductDto productDto);
IPage<ProductModelVo> listPageProductModel(Page<ProductModelVo> page, ProductModel productModel);
+
+ IPage<ProductModelVo> listPageProductModelByType(Page<ProductModelVo> page, ProductModel productModel, Long topProductParentId);
}
diff --git a/src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java
index 2b9eb40..2b9b26e 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java
@@ -59,6 +59,12 @@
return productModelMapper.listPageProductModel(page, productModel);
}
+ @Override
+ public IPage<ProductModelVo> listPageProductModelByType(Page<ProductModelVo> page, ProductModel productModel, Long topProductParentId) {
+ productModel.setTopProductParentId(topProductParentId);
+ return productModelMapper.listPageProductModel(page, productModel);
+ }
+
// 閫掑綊鏋勫缓瀛愯妭鐐�
private List<ProductTreeDto> buildChildrenNodes(Long parentId) {
--
Gitblit v1.9.3