From f05fd2a067d751333f00a81dad095a7650900c95 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 13 三月 2026 13:16:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/production/service/ProductMaterialSkuService.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/ProductMaterialSkuService.java b/src/main/java/com/ruoyi/production/service/ProductMaterialSkuService.java
index b24a444..104f17d 100644
--- a/src/main/java/com/ruoyi/production/service/ProductMaterialSkuService.java
+++ b/src/main/java/com/ruoyi/production/service/ProductMaterialSkuService.java
@@ -1,8 +1,10 @@
package com.ruoyi.production.service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.production.dto.ProductMaterialSkuDto;
import com.ruoyi.production.pojo.ProductMaterialSku;
+import org.springframework.web.multipart.MultipartFile;
import java.util.List;
@@ -16,11 +18,13 @@
* @since 2026/03/12 10:04
*/
public interface ProductMaterialSkuService extends IService<ProductMaterialSku> {
- List<ProductMaterialSkuDto> productMaterialSkuList(Long materialId);
+ Page<ProductMaterialSkuDto> productMaterialSkuList(Page<ProductMaterialSku> page, ProductMaterialSkuDto dto);
void addProductMaterialSku(ProductMaterialSku productMaterialSku);
void updateProductMaterialSku(ProductMaterialSku productMaterialSku);
void deleteProductMaterialSku(List<Long> ids);
+
+ void importProdData(MultipartFile file, Long materialId);
}
--
Gitblit v1.9.3