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 | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/controller/ProductController.java b/src/main/java/com/ruoyi/basic/controller/ProductController.java
index 77334e0..8e010d8 100644
--- a/src/main/java/com/ruoyi/basic/controller/ProductController.java
+++ b/src/main/java/com/ruoyi/basic/controller/ProductController.java
@@ -10,6 +10,7 @@
import com.ruoyi.basic.pojo.ProductModel;
import com.ruoyi.basic.service.IProductModelService;
import com.ruoyi.basic.service.IProductService;
+import com.ruoyi.basic.vo.ProductModelVo;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
@@ -17,11 +18,8 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.service.ISalesLedgerProductService;
-import com.ruoyi.sales.service.ISalesLedgerService;
-import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -118,10 +116,28 @@
@Operation(summary = "鍒嗛〉鏌ヨ鎵�鏈変骇鍝佸瀷鍙�")
@GetMapping("/pageModel")
- public IPage<ProductModel> listPageProductModel(Page<ProductModel> page, ProductModel productModel) {
+ public IPage<ProductModelVo> listPageProductModel(Page<ProductModelVo> page, ProductModel productModel) {
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