From f6e755678fab0ccd8001523d29dc2efaa8d5810c Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 28 一月 2026 13:47:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/stock/mapper/StockInventoryMapper.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/mapper/StockInventoryMapper.java b/src/main/java/com/ruoyi/stock/mapper/StockInventoryMapper.java
index 74f4134..15dcbbc 100644
--- a/src/main/java/com/ruoyi/stock/mapper/StockInventoryMapper.java
+++ b/src/main/java/com/ruoyi/stock/mapper/StockInventoryMapper.java
@@ -1,8 +1,18 @@
package com.ruoyi.stock.mapper;
-import com.ruoyi.stock.pojo.StockInventory;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.stock.dto.StockInRecordDto;
+import com.ruoyi.stock.dto.StockInventoryDto;
+import com.ruoyi.stock.execl.StockInventoryExportData;
+import com.ruoyi.stock.pojo.StockInventory;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.List;
/**
* <p>
@@ -15,4 +25,20 @@
@Mapper
public interface StockInventoryMapper extends BaseMapper<StockInventory> {
+ IPage<StockInventoryDto> pagestockInventory(Page page, @Param("ew") StockInventoryDto stockInventoryDto);
+
+
+ int updateAddStockInventory(@Param("ew") StockInventoryDto stockInventoryDto);
+
+ int updateSubtractStockInventory(@Param("ew") StockInventoryDto stockInventoryDto);
+
+ List<StockInventoryExportData> listStockInventoryExportData(@Param("ew") StockInventoryDto stockInventoryDto);
+
+ IPage<StockInRecordDto> stockInventoryPage(@Param("ew") StockInventoryDto stockInventoryDto, Page page);
+
+ IPage<StockInventoryDto> stockInAndOutRecord(@Param("ew") StockInventoryDto stockInventoryDto, Page page);
+
+ BigDecimal selectTotal();
+
+ BigDecimal selectTotalByDate( @Param("now") LocalDate now);
}
--
Gitblit v1.9.3