From 14f55cd77189bae10627277a2a3dab9cec5fcada Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 14 十月 2025 18:43:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TErpProcurementMapper.java | 63 ++++++++++++++++++++++++++++++-
1 files changed, 60 insertions(+), 3 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 bf37058..8376d8c 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
@@ -6,10 +6,10 @@
import com.ruoyi.system.model.TErpProcurement;
import com.ruoyi.system.query.TErpGoodsQuery;
import com.ruoyi.system.query.TErpProcurementQuery;
-import com.ruoyi.system.vo.TErpGoodsVO;
-import com.ruoyi.system.vo.TErpProcurementVo;
+import com.ruoyi.system.vo.*;
import org.apache.ibatis.annotations.Param;
+import java.math.BigDecimal;
import java.util.List;
/**
@@ -28,6 +28,63 @@
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<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") List<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);
+
+ /**
+ * 供应商销售统计-类型
+ * @param supplierId
+ * @return
+ */
+ Integer supplierSalesStatisticsTypeCount(@Param("supplierId")String supplierId);
+
+ /**
+ * 供应商销售统计-数量
+ * @param supplierId
+ * @return
+ */
+ Integer supplierSalesStatisticsCount(@Param("supplierId")String supplierId);
+
+ /**
+ * 供应商销售统计-金额
+ * @param supplierId
+ * @return
+ */
+ BigDecimal supplierSalesStatisticsMoney(@Param("supplierId")String supplierId,
+ @Param("startTime")String startTime,
+ @Param("endTime")String endTime);
+
+ /**
+ * 供应商销售统计-商品类型
+ * @param supplierId
+ * @return
+ */
+ List<SupplierSalesStatisticsGoodsTypeVO> supplierSalesStatisticsGoodsType(@Param("supplierId")String supplierId,
+ @Param("startTime")String startTime,
+ @Param("endTime")String endTime);
+
+ /**
+ * 供应商销售统计-商品数量
+ * @param supplierId
+ * @return
+ */
+ List<SupplierSalesStatisticsGoodsCountVO> supplierSalesStatisticsGoodsCount(@Param("supplierId")String supplierId,
+ @Param("startTime")String startTime,
+ @Param("endTime")String endTime,
+ @Param("goodsName")String goodsName);
+
+ List<SupplierSalesStatisticsGoodsCountVO> supplierSalesStatisticsGoodsCountMonth(@Param("supplierId")String supplierId,
+ @Param("startTime")String startTime,
+ @Param("endTime")String endTime,
+ @Param("goodsName")String goodsName);
}
--
Gitblit v1.7.1