From 9c685df2670f9536d1adf9dfb1c0e95a7d5f9c53 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 28 三月 2026 14:04:08 +0800
Subject: [PATCH] 关于能耗的统计调整

---
 src/main/java/com/ruoyi/production/service/ProductMaterialService.java |   11 +++++++++--
 1 files changed, 9 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..0b9bd71 100644
--- a/src/main/java/com/ruoyi/production/service/ProductMaterialService.java
+++ b/src/main/java/com/ruoyi/production/service/ProductMaterialService.java
@@ -1,10 +1,11 @@
 package com.ruoyi.production.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.production.dto.ProductMaterialGroupDto;
+import com.ruoyi.production.dto.ProductMaterialSkuDto;
 import com.ruoyi.production.pojo.ProductMaterial;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <br>
@@ -21,11 +22,17 @@
 
     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);
+
+    ProductMaterialSkuDto selectProductByModelId(Long productModelId);
+
+    ProductMaterialSkuDto selectProductByProductMainId(Long productOrderId);
 }

--
Gitblit v1.9.3