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/service/TErpProcurementService.java |   90 ++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 88 insertions(+), 2 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TErpProcurementService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TErpProcurementService.java
index 0c4adef..5a96425 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TErpProcurementService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TErpProcurementService.java
@@ -3,11 +3,17 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.common.basic.PageInfo;
 import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.system.dto.AddProcurementDto;
+import com.ruoyi.system.model.TErpGoods;
 import com.ruoyi.system.model.TErpProcurement;
 import com.ruoyi.system.query.TErpGoodsQuery;
 import com.ruoyi.system.query.TErpProcurementQuery;
-import com.ruoyi.system.vo.TErpProcurementDetailVo;
-import com.ruoyi.system.vo.TErpProcurementVo;
+import com.ruoyi.system.vo.*;
+
+import javax.validation.Valid;
+import java.math.BigDecimal;
+import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * <p>
@@ -21,9 +27,89 @@
 
     PageInfo<TErpProcurementVo> pageList(TErpProcurementQuery query, SysUser user);
 
+    PageInfo<TErpProcurementVo> pageListWarehouse(TErpProcurementQuery query, SysUser user);
+
 
     TErpProcurementDetailVo detail(String id, SysUser user, String goodsName);
 
 
+    PageInfo<TErpGoods> pageGoodsPageList(TErpGoodsQuery query, SysUser user);
 
+    List<TErpGoodsVO> inventoryNotEnoughList(SysUser user);
+
+
+    void addProcurement(String clinicSupplierId, SysUser user, @Valid List<AddProcurementDto> dtos);
+
+    DetailProcurementVO detailProcurement(String clinicSupplierId, SysUser user, String id);
+
+    void detailProcurementSend(List<String> clinicSupplierId, SysUser user, String id,String logisticsNumber);
+    /**
+     * 供应商采购统计
+     * @param supplierAndClinicId
+     * @param startTime
+     * @param endTime
+     * @return
+     */
+    List<SupplierThirtyProcurementStatisticsVO> supplierThirtyProcurementStatistics(String supplierAndClinicId, String startTime, String endTime, Integer roleType);
+
+    /**
+     * 供应商30天采购金额统计
+     * @param supplierAndClinicId
+     * @param startTime
+     * @param endTime
+     * @return
+     */
+    List<SupplierThirtyMoneyProcurementStatisticsVO> supplierThirtyMoneyProcurementStatistics(String supplierAndClinicId, String startTime, String endTime,Integer roleType);
+
+    /**
+     * 供应商30天采购总类统计
+     * @param supplierId
+     * @return
+     */
+    Integer supplierSalesStatisticsTypeCount(String supplierId);
+
+    /**
+     * 供应商30天采购总数统计
+     * @param supplierId
+     * @return
+     */
+    Integer supplierSalesStatisticsCount(String supplierId);
+
+    /**
+     * 供应商30天采购金额统计
+     * @param supplierId
+     * @param startTime
+     * @param endTime
+     * @return
+     */
+    BigDecimal supplierSalesStatisticsMoney(String supplierId, String startTime, String endTime);
+
+    /**
+     * 供应商30天销售占比
+     * @param supplierId
+     * @param startTime
+     * @param endTime
+     * @return
+     */
+    List<SupplierSalesStatisticsGoodsTypeVO> supplierSalesStatisticsGoodsType(String supplierId, String startTime, String endTime);
+
+    /**
+     * 供应商30天销售商品统计
+     * @param supplierId
+     * @param startTime
+     * @param endTime
+     * @param goodsName
+     * @return
+     */
+    List<SupplierSalesStatisticsGoodsCountVO> supplierSalesStatisticsGoodsCount(String supplierId, String startTime, String endTime, String goodsName);
+
+    /**
+     * 供应商30天销售商品统计
+     * @param supplierId
+     * @param startTime
+     * @param endTime
+     * @param goodsName
+     * @return
+     */
+    List<SupplierSalesStatisticsGoodsCountVO> supplierSalesStatisticsGoodsCountMonth(String supplierId, String startTime, String endTime, String goodsName);
 }

--
Gitblit v1.7.1