From f68d79d0ff6658795c19c2fd473fab9ff6f0640d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 14 三月 2026 13:53:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/production/service/ProductMaterialService.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/ProductMaterialService.java b/src/main/java/com/ruoyi/production/service/ProductMaterialService.java
index 9dfc867..75a32cc 100644
--- a/src/main/java/com/ruoyi/production/service/ProductMaterialService.java
+++ b/src/main/java/com/ruoyi/production/service/ProductMaterialService.java
@@ -21,11 +21,13 @@
void syncProductMaterialJob();
- List<ProductMaterialGroupDto> ProductMaterialList(String materialName);
+ List<ProductMaterialGroupDto> ProductMaterialList(Integer type);
void addProductMaterial(ProductMaterial productMaterial);
void updateProductMaterial(ProductMaterial productMaterial);
void deleteProductMaterial(List<Long> ids);
+
+ List<ProductMaterialGroupDto> productMaterialListByQuery(String materialName, Integer materialTypeId);
}
--
Gitblit v1.9.3