From 0315faea078205749e5f770f247531927fdaa84e Mon Sep 17 00:00:00 2001 From: kanade Date: Thu, 18 Dec 2025 17:00:50 +0800 Subject: [PATCH] =?UTF-8?q?feat(erp):=20=E6=B7=BB=E5=8A=A0=E6=8A=A5?= =?UTF-8?q?=E9=94=80=E4=BA=BA=E5=AD=97=E6=AE=B5=E5=B9=B6=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E4=BB=98=E6=AC=BE=E5=8D=95=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 expense.go 的 Expense 结构体中添加 ExpenseStaffId 字段 - 在 expense.go 的 Add 和 Update 结构体中同步添加 ExpenseStaffId 字段 - 在 payment.go 中移除 SettlementMethod 和 PaymentPurpose 字段 - 在 payment.go 中保留 ExpenseItem 字段并调整其位置 --- erp/expense.go | 4 +++- ik3cloud/payment.go | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/erp/expense.go b/erp/expense.go index e9cbe01..6a9cd53 100644 --- a/erp/expense.go +++ b/erp/expense.go @@ -39,6 +39,7 @@ type ExpenseItem struct { WorkflowId int64 `json:"workflowId"` WorkflowStatus int64 `json:"workflowStatus"` WorkflowReason string `json:"workflowReason"` + ExpenseStaffId int64 `json:"expenseStaffId"` CreatedStaffId int64 `json:"createdStaffId"` CreatedAt *time.Time `json:"createdAt"` UpdatedAt *time.Time `json:"updatedAt"` @@ -64,7 +65,7 @@ type ExpenseAdd struct { CurrencySymbol string // 币种符号 CurrencyRate decimal.Decimal // 币种汇率 Remarks string // 备注 - Amount decimal.Decimal // 金额 + ExpenseStaffId int64 // 报销人 } // Add @TITLE 添加 @@ -89,6 +90,7 @@ type ReplyExpenseInfo struct { WorkflowId int64 `json:"workflowId"` WorkflowStatus int64 `json:"workflowStatus"` WorkflowReason string `json:"workflowReason"` + ExpenseStaffId int64 `json:"expenseStaffId"` CreatedStaffId int64 `json:"createdStaffId"` CreatedAt *time.Time `json:"createdAt"` UpdatedAt *time.Time `json:"updatedAt"` diff --git a/ik3cloud/payment.go b/ik3cloud/payment.go index 33afb52..b40ad90 100644 --- a/ik3cloud/payment.go +++ b/ik3cloud/payment.go @@ -31,9 +31,9 @@ type PaymentCostItem struct { Date time.Time // 费用日期 InvoiceSerial string // 发票号 DepartmentNumber string // 核算部门 - SettlementMethod string // 结算方式 - PaymentPurpose string // 付款用途 - ExpenseItem string // 费用项目 + //SettlementMethod string // 结算方式 + //PaymentPurpose string // 付款用途 + ExpenseItem string // 费用项目 } // Save @TITLE 保存付款单