From 2d94ddd240fca69ebbc4b0570abb30c803db7754 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 13 三月 2026 11:33:44 +0800
Subject: [PATCH] fix: 区分基础数据与生产计划数据查询
---
src/main/java/com/ruoyi/production/controller/ProductMaterialController.java | 16 ++++++++++++----
1 files changed, 12 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..2c27907 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductMaterialController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductMaterialController.java
@@ -43,10 +43,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