From 1de63966ed53b68935b1cc4cace471b6b8415d10 Mon Sep 17 00:00:00 2001 From: kanade Date: Mon, 9 Mar 2026 10:00:15 +0800 Subject: [PATCH] =?UTF-8?q?feat(erp):=20=E6=B7=BB=E5=8A=A0=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=E5=8A=9F=E8=83=BD=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 定义 OrderItem、OrderField 和 OrderSort 类型及常量 - 为费用模块添加 createdAt、amount 排序字段 - 为应付模块添加 createdAt、amount 排序字段 - 为收汇模块添加 createdAt、entryAmount、receivableFxAmount 排序字段 - 为应收模块添加 createdAt、receivedAmount、receivableAmount、outstandingAmount 排序字段 - 为申请模块添加 createdAt、prepaidAmount、amount、paidAmount、payAt 排序字段 - 在各列表参数结构体中添加 Order 字段支持 --- erp/constant.go | 37 +++++++++++++++++++++++++++++++++++++ erp/expense.go | 1 + erp/payable.go | 1 + erp/receipt.go | 1 + erp/receivable.go | 1 + erp/request.go | 1 + 6 files changed, 42 insertions(+) diff --git a/erp/constant.go b/erp/constant.go index de14c66..252ae78 100644 --- a/erp/constant.go +++ b/erp/constant.go @@ -111,3 +111,40 @@ const ( PaymentTypePurchase PaymentType = 1 // 采购付款单 PaymentTypeCost PaymentType = 2 // 费用付款单 ) + +type OrderItem struct { + Field OrderField + Sort string +} + +type OrderField = string + +const ( + OrderFieldReceivableCreatedAt OrderField = "createdAt" + OrderFieldReceivableReceivedAmount OrderField = "receivedAmount" + OrderFieldReceivableReceivableAmount OrderField = "receivableAmount" + OrderFieldReceivableOutstandingAmount OrderField = "outstandingAmount" + + OrderFieldReceiptCreatedAt OrderField = "createdAt" + OrderFieldReceiptEntryAmount OrderField = "entryAmount" + OrderFieldReceiptReceivableFxAmount OrderField = "receivableFxAmount" + + OrderFieldPayableCreatedAt OrderField = "createdAt" + OrderFieldPayableAmount OrderField = "amount" + + OrderFieldRequestCreatedAt OrderField = "createdAt" + OrderFieldRequestPrepaidAmount OrderField = "prepaidAmount" + OrderFieldRequestAmount OrderField = "amount" + OrderFieldRequestPaidAmount OrderField = "paidAmount" + OrderFieldRequestPayAt OrderField = "payAt" + + OrderFieldExpenseCreatedAt OrderField = "createdAt" + OrderFieldExpenseAmount OrderField = "amount" +) + +type OrderSort = string + +const ( + OrderSortAsc OrderSort = "asc" + OrderSortDesc OrderSort = "desc" +) diff --git a/erp/expense.go b/erp/expense.go index d2cbf29..9740956 100644 --- a/erp/expense.go +++ b/erp/expense.go @@ -16,6 +16,7 @@ type expense struct { type ArgsExpenseList struct { Page bean.Page Search ExpenseSearch + Order []OrderItem } type ExpenseSearch struct { ExpenseSerial string // 报销单号 diff --git a/erp/payable.go b/erp/payable.go index b25a04e..cb273e6 100644 --- a/erp/payable.go +++ b/erp/payable.go @@ -14,6 +14,7 @@ type payable struct { type ArgsPayableList struct { Page bean.Page Search PayableSearch + Order []OrderItem } type PayableSearch struct { PayableSerial string // 付款单据号 diff --git a/erp/receipt.go b/erp/receipt.go index 3eae402..8fc0714 100644 --- a/erp/receipt.go +++ b/erp/receipt.go @@ -16,6 +16,7 @@ type receipt struct { type ArgsReceiptList struct { Page bean.Page Search ReceiptSearch + Order []OrderItem } type ReceiptSearch struct { ReceiptSerial string // 收汇单号 diff --git a/erp/receivable.go b/erp/receivable.go index c3ecb9a..bf1f50e 100644 --- a/erp/receivable.go +++ b/erp/receivable.go @@ -14,6 +14,7 @@ type receivable struct { type ArgsReceivableList struct { Page bean.Page Search ReceivableSearch + Order []OrderItem } type ReceivableSearch struct { ReceivableSerial string // 收款单据号 diff --git a/erp/request.go b/erp/request.go index bbbfcfd..a09dc68 100644 --- a/erp/request.go +++ b/erp/request.go @@ -16,6 +16,7 @@ type request struct { type ArgsRequestList struct { Page bean.Page Search RequestSearch + Order []OrderItem } type RequestSearch struct { RequestSerial string // 报销单号