From ef7458a6eb8ad72f45b65a4e417a9d04f5015246 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期六, 14 三月 2026 11:47:08 +0800
Subject: [PATCH] feat: 根据宜搭表单 ID 获取数据工具类
---
src/main/java/com/ruoyi/production/controller/ProductMaterialController.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductMaterialController.java b/src/main/java/com/ruoyi/production/controller/ProductMaterialController.java
index 184499e..21eddbc 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductMaterialController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductMaterialController.java
@@ -1,5 +1,8 @@
package com.ruoyi.production.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.basic.pojo.ProductModel;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
@@ -43,10 +46,18 @@
}
@GetMapping("/list")
- @ApiOperation("鐗╂枡鏁版嵁")
- @Log(title = "鐗╂枡鏁版嵁", businessType = BusinessType.OTHER)
- public AjaxResult productMaterialList(String materialName) {
- List<ProductMaterialGroupDto> productMaterialMap = productMaterialService.ProductMaterialList(materialName);
+ @ApiOperation("鐗╂枡鏁版嵁绫诲埆鏁版嵁闆嗗悎")
+ @Log(title = "鐗╂枡鏁版嵁绫诲埆鏁版嵁闆嗗悎", businessType = BusinessType.OTHER)
+ public AjaxResult productMaterialList(@RequestParam("type") Integer type) {
+ List<ProductMaterialGroupDto> productMaterialMap = productMaterialService.ProductMaterialList(type);
+ return AjaxResult.success(productMaterialMap);
+ }
+
+ @GetMapping("/listQuery")
+ @ApiOperation("鐗╂枡鏁版嵁绫诲埆瀛愮被鏁版嵁闆嗗悎")
+ @Log(title = "鐗╂枡鏁版嵁绫诲埆瀛愮被鏁版嵁闆嗗悎", businessType = BusinessType.OTHER)
+ public AjaxResult productMaterialListByQuery(@RequestParam(value = "materialName", required = false) String materialName, @RequestParam(value = "materialTypeId", required = false) Integer materialTypeId) {
+ List<ProductMaterialGroupDto> productMaterialMap = productMaterialService.productMaterialListByQuery(materialName, materialTypeId);
return AjaxResult.success(productMaterialMap);
}
--
Gitblit v1.9.3