From 79054eef527c991f9a84ab3bc3fd2603a5521eb1 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 26 一月 2026 12:45:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New

---
 src/main/java/com/ruoyi/production/service/ProductBomService.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/service/ProductBomService.java b/src/main/java/com/ruoyi/production/service/ProductBomService.java
index 0736338..d812f9f 100644
--- a/src/main/java/com/ruoyi/production/service/ProductBomService.java
+++ b/src/main/java/com/ruoyi/production/service/ProductBomService.java
@@ -2,11 +2,13 @@
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.production.dto.ProductBomDto;
-import com.ruoyi.production.dto.ProductProcessDto;
 import com.ruoyi.production.pojo.ProductBom;
-import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
 
 /**
  * <p>
@@ -21,4 +23,8 @@
     IPage<ProductBomDto> listPage(Page page, ProductBomDto productBomDto);
 
     AjaxResult add(ProductBom productBom);
+
+    AjaxResult uploadBom(MultipartFile file);
+
+    void exportBom(HttpServletResponse response, Integer bomId);
 }

--
Gitblit v1.9.3