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

gaoluyang

6 天以前 d39e4f7d839167c16425086dfa2f8747bccfdff9

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

@@ -11,13 +11,15 @@
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;

/**
 * ERP 采购订单 Mapper
 *
 * @author 芋道源码
 * @author 超级管理员
 */
@Mapper
public interface ErpPurchaseOrderMapper extends BaseMapperX<ErpPurchaseOrderDO> {
@@ -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())
@@ -57,6 +63,11 @@
            query.eq(ErpPurchaseOrderDO::getStatus, ErpAuditStatus.APPROVE.getStatus())
                    .apply("t.return_count < t.in_count");
        }
        // 可来票登记（剩余可开票金额 > 0）：金额已开完的订单不展示
        if (Boolean.TRUE.equals(reqVO.getRemainPriceEnable())) {
            query.apply("t.total_price > (SELECT IFNULL(SUM(i.price), 0) FROM erp_purchase_invoice i "
                    + "WHERE i.purchase_order_id = t.id AND i.deleted = 0)");
        }
        if (reqVO.getProductId() != null) {
            query.leftJoin(ErpPurchaseOrderItemDO.class, ErpPurchaseOrderItemDO::getOrderId, ErpPurchaseOrderDO::getId)
                    .eq(reqVO.getProductId() != null, ErpPurchaseOrderItemDO::getProductId, reqVO.getProductId())
@@ -74,6 +85,10 @@
        return selectOne(ErpPurchaseOrderDO::getNo, no);
    }

    default ErpPurchaseOrderDO selectByProcessInstanceId(String processInstanceId) {
        return selectOne(ErpPurchaseOrderDO::getProcessInstanceId, processInstanceId);
    }

    default List<ErpPurchaseOrderDO> selectList(Long supplierId, Integer status) {
        return selectList(new LambdaQueryWrapperX<ErpPurchaseOrderDO>()
                .eqIfPresent(ErpPurchaseOrderDO::getSupplierId, supplierId)
@@ -81,4 +96,41 @@
                .orderByDesc(ErpPurchaseOrderDO::getId));
    }

    /**
     * 按来源查询采购订单（用于追溯来源工单对应的采购订单）
     */
    default List<ErpPurchaseOrderDO> selectListBySource(Integer sourceType, Long sourceId) {
        return selectList(new LambdaQueryWrapperX<ErpPurchaseOrderDO>()
                .eq(ErpPurchaseOrderDO::getSourceType, sourceType)
                .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));
    }

}