From a76e1d17d67641993dea6335cb8e1465a94df58d Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 21 五月 2026 15:39:05 +0800
Subject: [PATCH] feat(stock): 优化库存管理和成品树结构功能 1- 为ApproveProcessMapper.xml和ProductBomMapper.xml添加排序功能 2- 在ProductionProductMainDto中新增bomInputQty字段用于产品结构投入数量 3- 修改ProductionProductMainServiceImpl中投入数量计算逻辑,使用前端传入的bomInputQty值 4- 在ProductWorkOrderDto中添加bomInputQty字段并在服务实现中计算标准投入数量 5- 更新SalesLedgerMapper.xml查询逻辑,从product_summary获取电压信息 6- 为SalesLedgerProduct添加stockId字段并修改库存扣减逻辑使用具体库存ID 7- 重构StockInventoryController中的成品库存树查询接口和导入导出功能 8- 新增成品和非成品库存导入导出的数据模型和Excel工具类 9- 优化StockInventoryServiceImpl中的库存扣减逻辑,支持按特定库存ID操作 10- 更新库存导入导出功能,区分成品和非成品类型并提供相应模板

---
 src/main/java/com/ruoyi/sales/service/InvoiceLedgerService.java |   44 +++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/service/InvoiceLedgerService.java b/src/main/java/com/ruoyi/sales/service/InvoiceLedgerService.java
index a828f02..ae71649 100644
--- a/src/main/java/com/ruoyi/sales/service/InvoiceLedgerService.java
+++ b/src/main/java/com/ruoyi/sales/service/InvoiceLedgerService.java
@@ -2,23 +2,25 @@
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.basic.dto.SupplierManageDto;
 import com.ruoyi.common.vo.FileVo;
 import com.ruoyi.sales.dto.InvoiceLedgerDto;
+import com.ruoyi.sales.dto.InvoiceRegistrationProductDto;
 import com.ruoyi.sales.pojo.InvoiceLedgerFile;
+import com.ruoyi.sales.pojo.InvoiceRegistrationProduct;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
 import java.util.List;
 
 public interface InvoiceLedgerService {
 
     /**
      * 寮�绁ㄥ彴璐︽柊澧�
-     * @param invoiceLedgerDto
+     * @param productDto
      * @return
      */
-    int invoiceLedgerSaveOrUpdate( InvoiceLedgerDto invoiceLedgerDto);
+    int invoiceLedgerSaveOrUpdate( InvoiceRegistrationProductDto productDto);
 
     /**
      * 寮�绁ㄥ彴璐﹀垹闄�
@@ -52,10 +54,10 @@
     /**
      * 闄勪欢涓嬭浇
      * @param response
-     * @param invoiceLedgerDto
+     * @param invoiceRegistrationProductDto
      * @return
      */
-    void invoiceLedgerExport(HttpServletResponse response ,InvoiceLedgerDto invoiceLedgerDto);
+    void invoiceLedgerExport(HttpServletResponse response ,InvoiceRegistrationProductDto invoiceRegistrationProductDto);
 
     /**
      * 寮�绁ㄥ彴璐﹁鎯�
@@ -77,4 +79,36 @@
      * @return
      */
     List<InvoiceLedgerDto> invoiceLedgerList(InvoiceLedgerDto invoiceLedgerDto);
+
+    /**
+     * 瀹㈡埛閿�鍞褰�
+     * @param page
+     * @param invoiceLedgerDto
+     * @return
+     */
+    IPage<InvoiceLedgerDto> invoiceLedgerSalesAccount(Page page, InvoiceLedgerDto invoiceLedgerDto);
+
+    BigDecimal getInvoiceAmount();
+
+    /**
+     * 寮�绁ㄧ櫥璁颁骇鍝佸垎椤垫煡璇�
+     * @param page
+     * @param registrationProductDto
+     * @return
+     */
+    IPage<InvoiceRegistrationProductDto>  registrationProductPage(Page page, InvoiceRegistrationProductDto registrationProductDto);
+
+    /**
+     * 浜у搧寮�绁ㄥ彴璐﹁鎯�
+     * @param id
+     * @return
+     */
+    InvoiceRegistrationProductDto invoiceLedgerProductDetail(Integer id);
+
+    /**
+     * 寮�绁ㄥ彴璐﹀垹闄�
+     * @param invoiceRegistrationProductId
+     * @return
+     */
+    void delInvoiceLedger(Integer invoiceRegistrationProductId);
 }

--
Gitblit v1.9.3