From 72a32c227fdf10f34fe563a7de35169da5729eea Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 07 七月 2026 15:50:31 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_平遥县盛达铸造厂
---
src/main/java/com/ruoyi/basic/controller/ProductController.java | 18 ++++++++++++++++++
1 files changed, 18 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);
+ }
+
/**
* 瀵煎叆浜у搧
*/
--
Gitblit v1.9.3