From 0d83a54d5f3ae08fe0ee4b3cd3fd72e94e2767e1 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 14 十月 2025 09:32:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TErpProcurementMapper.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TErpProcurementMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TErpProcurementMapper.java
index df29c41..8a8ba1b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TErpProcurementMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TErpProcurementMapper.java
@@ -4,7 +4,11 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.system.model.TErpProcurement;
+import com.ruoyi.system.query.TErpGoodsQuery;
import com.ruoyi.system.query.TErpProcurementQuery;
+import com.ruoyi.system.vo.SupplierThirtyMoneyProcurementStatisticsVO;
+import com.ruoyi.system.vo.SupplierThirtyProcurementStatisticsVO;
+import com.ruoyi.system.vo.TErpGoodsVO;
import com.ruoyi.system.vo.TErpProcurementVo;
import org.apache.ibatis.annotations.Param;
@@ -20,6 +24,22 @@
*/
public interface TErpProcurementMapper extends BaseMapper<TErpProcurement> {
- List<TErpProcurementVo> pageList(@Param("query") TErpProcurementQuery query, @Param("pageInfo") PageInfo<TErpProcurementVo> pageInfo, @Param("user") SysUser user, @Param("sTime") String sTime, @Param("eTime") String eTime);
+ List<TErpProcurementVo> pageList(@Param("query") TErpProcurementQuery query, @Param("pageInfo") PageInfo<TErpProcurementVo> pageInfo, @Param("user") SysUser user, @Param("sTime") String sTime, @Param("eTime") String eTime, @Param("supplierClinicId") String supplierClinicId);
+
+
+ List<TErpGoodsVO> inventoryNotEnoughList(@Param("user") SysUser user);
+
+
+ List<TErpProcurementVo> pageListWarehouse(@Param("query") TErpProcurementQuery query, @Param("pageInfo") PageInfo<TErpProcurementVo> pageInfo, @Param("user") SysUser user, @Param("sTime") String sTime, @Param("eTime") String eTime, @Param("supplierClinicId") String supplierClinicId);
+
+ List<SupplierThirtyProcurementStatisticsVO> supplierThirtyProcurementStatistics(@Param("supplierAndClinicId")String supplierAndClinicId,
+ @Param("startTime")String startTime,
+ @Param("endTime")String endTime,
+ @Param("roleType")Integer roleType);
+
+ List<SupplierThirtyMoneyProcurementStatisticsVO> supplierThirtyMoneyProcurementStatistics(@Param("supplierAndClinicId")String supplierAndClinicId,
+ @Param("startTime")String startTime,
+ @Param("endTime")String endTime,
+ @Param("roleType")Integer roleType);
}
--
Gitblit v1.7.1