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 | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/ProductMaterialService.java b/src/main/java/com/ruoyi/production/service/ProductMaterialService.java
index 4d24475..75a32cc 100644
--- a/src/main/java/com/ruoyi/production/service/ProductMaterialService.java
+++ b/src/main/java/com/ruoyi/production/service/ProductMaterialService.java
@@ -1,10 +1,10 @@
package com.ruoyi.production.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.production.dto.ProductMaterialGroupDto;
import com.ruoyi.production.pojo.ProductMaterial;
import java.util.List;
-import java.util.Map;
/**
* <br>
@@ -21,11 +21,13 @@
void syncProductMaterialJob();
- Map<String, List<ProductMaterial>> 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