feat: 打通销售采购财务闭环并完成累计业务优化

gaoluyang

5 天以前 d39e4f7d839167c16425086dfa2f8747bccfdff9

 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseOrderMapper.java

@@ -11,6 +11,8 @@
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.apache.ibatis.annotations.Mapper;

import java.time.LocalDateTime;
import java.util.Collection;
import java.util.List;
import java.util.Objects;

@@ -27,6 +29,10 @@
                .likeIfPresent(ErpPurchaseOrderDO::getNo, reqVO.getNo())
                .eqIfPresent(ErpPurchaseOrderDO::getSupplierId, reqVO.getSupplierId())
                .betweenIfPresent(ErpPurchaseOrderDO::getOrderTime, reqVO.getOrderTime())
                .eqIfPresent(ErpPurchaseOrderDO::getPurchaseType, reqVO.getPurchaseType())
                .likeIfPresent(ErpPurchaseOrderDO::getContractNo, reqVO.getContractNo())
                .betweenIfPresent(ErpPurchaseOrderDO::getPaymentDate, reqVO.getPaymentDate())
                .eqIfPresent(ErpPurchaseOrderDO::getPaymentMethod, reqVO.getPaymentMethod())
                .eqIfPresent(ErpPurchaseOrderDO::getStatus, reqVO.getStatus())
                .likeIfPresent(ErpPurchaseOrderDO::getRemark, reqVO.getRemark())
                .eqIfPresent(ErpPurchaseOrderDO::getCreator, reqVO.getCreator())
@@ -99,4 +105,32 @@
                .eq(ErpPurchaseOrderDO::getSourceId, sourceId));
    }

    /**
     * 按供应商与下单时间范围查询采购订单（供应商往来）
     */
    default List<ErpPurchaseOrderDO> selectListBySupplierIdAndOrderTimeBetween(Long supplierId,
                                                                              LocalDateTime beginTime,
                                                                              LocalDateTime endTime,
                                                                              Collection<Integer> statuses) {
        return selectList(new LambdaQueryWrapperX<ErpPurchaseOrderDO>()
                .eq(ErpPurchaseOrderDO::getSupplierId, supplierId)
                .geIfPresent(ErpPurchaseOrderDO::getOrderTime, beginTime)
                .leIfPresent(ErpPurchaseOrderDO::getOrderTime, endTime)
                .inIfPresent(ErpPurchaseOrderDO::getStatus, statuses)
                .orderByAsc(ErpPurchaseOrderDO::getOrderTime)
                .orderByAsc(ErpPurchaseOrderDO::getId));
    }

    /**
     * 按下单时间范围查询全部供应商的采购订单（供应商往来汇总）
     */
    default List<ErpPurchaseOrderDO> selectListByOrderTimeBetween(LocalDateTime beginTime,
                                                                  LocalDateTime endTime,
                                                                  Collection<Integer> statuses) {
        return selectList(new LambdaQueryWrapperX<ErpPurchaseOrderDO>()
                .geIfPresent(ErpPurchaseOrderDO::getOrderTime, beginTime)
                .leIfPresent(ErpPurchaseOrderDO::getOrderTime, endTime)
                .inIfPresent(ErpPurchaseOrderDO::getStatus, statuses));
    }

}