From 74dce1f4b8fda9ce4e1481fb16d1603a00cdf3ab Mon Sep 17 00:00:00 2001 From: kanade Date: Thu, 17 Sep 2026 17:42:21 +0800 Subject: [PATCH] =?UTF-8?q?feat(erp):=20=E6=B7=BB=E5=8A=A0=E8=B4=B9?= =?UTF-8?q?=E7=94=A8=E6=8A=A5=E9=94=80=E7=9B=B8=E5=85=B3=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在常量中新增收款单付款公司和银行账户字段 - 在常量中新增请款单工厂名称和发票序列号字段 - 在常量中新增费用单员工ID、银行账户和支付时间字段 - 在费用结构体中添加银行员工ID字段 --- erp/constant.go | 11 +++++++++-- erp/expense.go | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/erp/constant.go b/erp/constant.go index 8c0cb3e..ff8f92a 100644 --- a/erp/constant.go +++ b/erp/constant.go @@ -135,6 +135,8 @@ const ( OrderFieldReceiptEntryAmount OrderField = "entryAmount" OrderFieldReceiptReceivableFxAmount OrderField = "receivableFxAmount" OrderFieldReceiptReceiptDate OrderField = "receiptDate" + OrderFieldReceiptPayCompany OrderField = "payCompany" + OrderFieldReceiptBankAccount OrderField = "bankAccount" OrderFieldPayableCreatedAt OrderField = "createdAt" OrderFieldPayableAmount OrderField = "amount" @@ -144,9 +146,14 @@ const ( OrderFieldRequestAmount OrderField = "amount" OrderFieldRequestPaidAmount OrderField = "paidAmount" OrderFieldRequestPayAt OrderField = "payAt" + OrderFieldRequestFactoryName OrderField = "factoryName" + OrderFieldRequestInvoiceSerial OrderField = "invoiceSerial" - OrderFieldExpenseCreatedAt OrderField = "createdAt" - OrderFieldExpenseAmount OrderField = "amount" + OrderFieldExpenseCreatedAt OrderField = "createdAt" + OrderFieldExpenseAmount OrderField = "amount" + OrderFieldExpenseExpenseStaffId OrderField = "expenseStaffId" + OrderFieldExpenseBankAccount OrderField = "bankAccount" + OrderFieldExpensePayAt OrderField = "payAt" OrderFieldInvoiceSerial OrderField = "invoiceSerial" ) diff --git a/erp/expense.go b/erp/expense.go index 2240d91..d6a5484 100644 --- a/erp/expense.go +++ b/erp/expense.go @@ -58,6 +58,7 @@ type ExpenseItem struct { Remarks string `json:"remarks"` BankAccount string `json:"bankAccount"` BankName string `json:"bankName"` + BankStaffId *int64 `json:"bankStaffId"` PayAt *time.Time `json:"payAt"` Amount decimal.Decimal `json:"amount"` PaymentAmount decimal.Decimal `json:"paymentAmount"`