回款登记功能修改

chenrui

5 天以前 698008c4a0f97efa3c583967e246b78777b150a7

回款登记功能修改

 src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java

@@ -82,4 +82,25 @@
            return AjaxResult.error("获取合同金额失败：" + e.getMessage());
        }
    }

    /**
     * 查询已经绑定发票的开票台账
     * @param page
     * @param receiptPaymentDto
     * @return
     */
    @GetMapping("/bindInvoiceNoRegPage")
    public AjaxResult bindInvoiceNoRegPage(Page page, ReceiptPaymentDto receiptPaymentDto) {
        return AjaxResult.success(receiptPaymentService.bindInvoiceNoRegPage(page,receiptPaymentDto));
    }

    /**
     * 开票台账详情
     * @param id
     * @return
     */
    @GetMapping("/invoiceInfo")
    public AjaxResult invoiceInfo (Integer id) {
        return AjaxResult.success(receiptPaymentService.invoiceInfo(id));
    }
}

 src/main/java/com/ruoyi/sales/dto/InvoiceLedgerDto.java

@@ -33,4 +33,10 @@

    @ApiModelProperty(value = "未回款金额")
    private BigDecimal unReceiptPaymentAmount;

    @ApiModelProperty(value = "税率")
    private BigDecimal taxRate;

    @ApiModelProperty(value = "销售合同号")
    private String salesContractNo;
}

 src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java

@@ -4,6 +4,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;

@Data
public class ReceiptPaymentDto extends ReceiptPayment {

@@ -16,4 +18,31 @@
    @ApiModelProperty(value = "查询文本")
    private String searchText;

    @ApiModelProperty(value = "销售台账sales_ledger")
    private Integer salesLedgerId;

    @ApiModelProperty(value = "销售合同号")
    private String salesContractNo;

    @ApiModelProperty(value = "客户名称ID")
    private Integer customerId;

    @ApiModelProperty(value = "发票号")
    private String invoiceNo;

    @ApiModelProperty(value = "发票金额")
    private BigDecimal invoiceTotal;

    @ApiModelProperty(value = "税率")
    private BigDecimal taxRate;

    @ApiModelProperty(value = "产品大类")
    private String productCategory;

    @ApiModelProperty(value = "回款金额")
    private BigDecimal receiptPaymentAmountTotal;

    @ApiModelProperty(value = "待回款金额")
    private BigDecimal noReceiptAmount;

}

 src/main/java/com/ruoyi/sales/mapper/ReceiptPaymentMapper.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.sales.dto.InvoiceLedgerDto;
import com.ruoyi.sales.dto.ReceiptPaymentDto;
import com.ruoyi.sales.pojo.ReceiptPayment;
import org.apache.ibatis.annotations.Param;
@@ -12,4 +13,19 @@
    IPage<ReceiptPaymentDto> receiptPaymentListPage(Page page, @Param("receiptPaymentDto") ReceiptPaymentDto receiptPaymentDto);

    ReceiptPaymentDto receiptPaymentInfo(Integer id);

    /**
     * 查询已经绑定发票的开票台账
     * @param page
     * @param receiptPaymentDto
     * @return
     */
    IPage<ReceiptPaymentDto> bindInvoiceNoRegPage(Page page, ReceiptPaymentDto receiptPaymentDto);

    /**
     * 开票台账详情
     * @param id
     * @return
     */
    InvoiceLedgerDto invoiceInfo(Integer id);
}

 src/main/java/com/ruoyi/sales/pojo/ReceiptPayment.java

@@ -22,24 +22,6 @@
    @TableId(type = IdType.AUTO)
    private Integer id;

    @ApiModelProperty(value = "销售台账sales_ledger")
    private Integer salesLedgerId;

    @ApiModelProperty(value = "销售合同号")
    private String salesContractNo;

    @ApiModelProperty(value = "客户名称ID")
    private Integer customerId;

    @ApiModelProperty(value = "发票号")
    private String invoiceNo;

    @ApiModelProperty(value = "发票金额")
    private BigDecimal invoiceAmount;

    @ApiModelProperty(value = "税率")
    private BigDecimal taxRate;

    @ApiModelProperty(value = "回款形式 0电汇1承兑")
    private String receiptPaymentType;


 src/main/java/com/ruoyi/sales/service/ReceiptPaymentService.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.sales.dto.InvoiceLedgerDto;
import com.ruoyi.sales.dto.ReceiptPaymentDto;
import com.ruoyi.sales.pojo.ReceiptPayment;

@@ -47,4 +48,19 @@
    ReceiptPaymentDto receiptPaymentInfo(Integer id);

    BigDecimal getReceiptAmount();

    /**
     * 查询已经绑定发票的开票台账
     * @param page
     * @param receiptPaymentDto
     * @return
     */
    IPage<ReceiptPaymentDto> bindInvoiceNoRegPage(Page page, ReceiptPaymentDto receiptPaymentDto);

    /**
     * 开票台账详情
     * @param id
     * @return
     */
    InvoiceLedgerDto invoiceInfo(Integer id);
}

 src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.sales.dto.InvoiceLedgerDto;
import com.ruoyi.sales.dto.ReceiptPaymentDto;
import com.ruoyi.sales.mapper.ReceiptPaymentMapper;
import com.ruoyi.sales.pojo.ReceiptPayment;
@@ -100,4 +101,25 @@

        return totalContractAmount;
    }

    /**
     * 查询已经绑定发票的开票台账
     * @param page
     * @param receiptPaymentDto
     * @return
     */
    @Override
    public IPage<ReceiptPaymentDto> bindInvoiceNoRegPage(Page page, ReceiptPaymentDto receiptPaymentDto) {
        return receiptPaymentMapper.bindInvoiceNoRegPage(page, receiptPaymentDto);
    }

    /**
     * 开票台账详情
     * @param id
     * @return
     */
    @Override
    public InvoiceLedgerDto invoiceInfo(Integer id) {
        return receiptPaymentMapper.invoiceInfo(id);
    }
}

 src/main/resources/mapper/sales/ReceiptPaymentMapper.xml

@@ -67,4 +67,56 @@
        WHERE T1.id = #{id}
    </select>

    <select id="bindInvoiceNoRegPage" resultType="com.ruoyi.sales.dto.ReceiptPaymentDto">
        SELECT
            T1.id                ,
            T1.invoice_no        ,
            T1.invoice_total    ,
            T1.invoice_person    ,
            T1.invoice_date      ,
            T1.create_time       ,
            T1.create_user       ,
            T1.update_time       ,
            T1.update_user       ,
            T1.tenant_id         ,
            T2.tax_rate,
            T3.sales_contract_no,
            T3.customer_contract_no,
            T3.customer_name,
            T4.invoiceFileName,
            T5.product_category,
            IFNULL(T6.receipt_payment_amount_total ,0) AS receipt_payment_amount_total,
            (T1.invoice_total  - IFNULL(T6.receipt_payment_amount_total ,0)) AS no_receipt_amount
        FROM invoice_ledger T1
                 LEFT JOIN invoice_registration_product T2 ON T2.id = T1.invoice_registration_product_id
                 LEFT JOIN sales_ledger T3 ON T3.id = T2.sales_ledger_id
                 LEFT JOIN (
            SELECT
                invoice_ledger_id,
                GROUP_CONCAT( name ORDER BY id ASC SEPARATOR ' | ') AS invoiceFileName
            FROM invoice_ledger_file GROUP BY invoice_ledger_id
        ) T4 ON T4.invoice_ledger_id = T1.id
                 LEFT JOIN sales_ledger_product T5 ON T2.sales_ledger_product_id = T5.id
                 LEFT JOIN (
            SELECT SUM(receipt_payment_amount) AS receipt_payment_amount_total,invoice_ledger_id FROM receipt_payment GROUP BY invoice_ledger_id
        )  T6 ON T1.id = T6.invoice_ledger_id
        ORDER BY T2.create_time DESC
    </select>

    <select id="invoiceInfo" resultType="com.ruoyi.sales.dto.InvoiceLedgerDto">
        SELECT
            T1.id,
            T1.invoice_no,
            T1.invoice_total ,
            T2.tax_rate,
            T3.customer_name,
            T3.sales_contract_no
        FROM
            invoice_ledger T1
                LEFT JOIN
            invoice_registration_product T2 ON T1.invoice_registration_product_id = T2.id
                LEFT JOIN sales_ledger T3 ON T3.id = T2.sales_ledger_id
        WHERE T1.id = #{id}
    </select>

</mapper>