From 8e39f175ef26827d08904a65b10748e736eeca21 Mon Sep 17 00:00:00 2001 From: liyong <18434998025@163.com> Date: 星期一, 23 六月 2025 10:20:08 +0800 Subject: [PATCH] 2025-06-23 【销售台账】 增加客户合同号、销售合同号、项目名称模糊查询 增加客户名称、客户合同号、项目名称查询,不显示待回款为0,默认为打钩。 销售管理】-【回款流水】,增加合同号、项目名称列查询,增加客户名称、项目名称、合同号查询条件。 【销售管理】-【回款登记】,增加导出功能 --- src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java | 33 +++++++++++++++++++-------------- 1 files changed, 19 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java b/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java index a2843c8..a5e935b 100644 --- a/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java +++ b/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java @@ -1,12 +1,12 @@ package com.ruoyi.purchase.pojo; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.framework.aspectj.lang.annotation.Excel; import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; /** * 閲囪喘鍙拌处瀵硅薄 purchase_ledger @@ -30,6 +30,11 @@ */ @Excel(name = "閲囪喘鍚堝悓鍙�") private String purchaseContractNumber; + + /** + * 渚涘簲鍟嗗悕绉癷d + */ + private Long supplierId; /** * 渚涘簲鍟嗗悕绉� @@ -105,17 +110,17 @@ * 鍚堝悓閲戦锛堜骇鍝佸惈绋庢�讳环锛� */ private BigDecimal contractAmount; - - /** - * 涓氬姟鍛� - */ - @Excel(name = "涓氬姟鍛�") - private String businessPerson; - - /** - * 涓氬姟鍛榠d - */ - private Long businessPersonId; +// +// /** +// * 涓氬姟鍛� +// */ +// @Excel(name = "涓氬姟鍛�") +// private String businessPerson; +// +// /** +// * 涓氬姟鍛榠d +// */ +// private Long businessPersonId; /** * 涓氬姟鍛樻墜鏈哄彿 -- Gitblit v1.9.3