Merge remote-tracking branch 'origin/master'

xuhy

2025-10-14 14f55cd77189bae10627277a2a3dab9cec5fcada

 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,4 +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") 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);

}