feat(k3cloud): 新增字典服务模块

- 在服务结构体中添加 Dict 字典服务字段 - 初始化字典服务模块以支持数据字典功能
fix(client): 移除对 ik3cloud 的硬编码配置
2025-12-12 17:24:21 +08:00 · 2025-12-12 17:21:34 +08:00 · 2025-12-12 17:20:22 +08:00 · 2025-12-12 15:57:33 +08:00 · 2025-12-12 15:11:58 +08:00 · 2025-12-11 16:40:21 +08:00
11 changed files with 480 additions and 0 deletions
--- a/erp/erp.go
+++ b/erp/erp.go
@@ -15,4 +15,6 @@ type Erp struct {
 	Payable          payable
 	Receivable       receivable
 	Receipt          receipt
+	Expense          expense
+	Request          request
 }
--- a/erp/expense.go
+++ b/erp/expense.go
@@ -0,0 +1,113 @@
+package erp
+
+import (
+	"context"
+	"time"
+
+	"git.kumo.work/shama/service/client"
+	expense2 "git.kumo.work/shama/service/erp/expense"
+	"git.kumo.work/shama/service/lib/bean"
+	"github.com/shopspring/decimal"
+)
+
+type expense struct {
+	expense2.Expense
+}
+type ArgsExpenseList struct {
+	Page   bean.Page
+	Search ExpenseSearch
+}
+type ExpenseSearch struct {
+	ExpenseSerial  string     // 报销单号
+	CreatedAtStart *time.Time // 创建开始时间
+	CreatedAtEnd   *time.Time // 创建结束时间
+}
+type ReplyExpenseList struct {
+	List  []ExpenseItem `json:"list"`
+	Total int64         `json:"total"`
+}
+type ExpenseItem struct {
+	Id             int64           `json:"id"`
+	ExpenseSerial  string          `json:"expenseSerial"`
+	Currency       string          `json:"currency"`
+	CurrencyName   string          `json:"currencyName"`
+	CurrencySymbol string          `json:"currencySymbol"`
+	CurrencyRate   decimal.Decimal `json:"currencyRate"`
+	Remarks        string          `json:"remarks"`
+	Amount         decimal.Decimal `json:"amount"`
+	CreatedStaffId int64           `json:"createdStaffId"`
+	CreatedAt      *time.Time      `json:"createdAt"`
+	UpdatedAt      *time.Time      `json:"updatedAt"`
+}
+
+// List @TITLE 列表
+func (r *expense) List(ctx context.Context, args ArgsExpenseList) (reply ReplyExpenseList, err error) {
+	xClient, err := client.GetClient(r)
+	if err != nil {
+		return
+	}
+	err = xClient.Call(ctx, "List", args, &reply)
+	return
+}
+
+type ArgsExpenseAdd struct {
+	StaffId int64
+	ExpenseAdd
+}
+type ExpenseAdd struct {
+	Currency       string          // 币种
+	CurrencyName   string          // 币种名称
+	CurrencySymbol string          // 币种符号
+	CurrencyRate   decimal.Decimal // 币种汇率
+	Remarks        string          // 备注
+	Amount         decimal.Decimal // 金额
+}
+
+// Add @TITLE 添加
+func (r *expense) Add(ctx context.Context, args ArgsExpenseAdd) (expenseId int64, err error) {
+	xClient, err := client.GetClient(r)
+	if err != nil {
+		return
+	}
+	err = xClient.Call(ctx, "Add", args, &expenseId)
+	return
+}
+
+type ReplyExpenseInfo struct {
+	Id             int64           `json:"id"`
+	ExpenseSerial  string          `json:"expenseSerial"`
+	Currency       string          `json:"currency"`
+	CurrencyName   string          `json:"currencyName"`
+	CurrencySymbol string          `json:"currencySymbol"`
+	CurrencyRate   decimal.Decimal `json:"currencyRate"`
+	Amount         decimal.Decimal `json:"amount"`
+	Remarks        string          `json:"remarks"`
+	CreatedStaffId int64           `json:"createdStaffId"`
+	CreatedAt      *time.Time      `json:"createdAt"`
+	UpdatedAt      *time.Time      `json:"updatedAt"`
+}
+
+// Info @TITLE 详情
+func (r *expense) Info(ctx context.Context, expenseId int64) (reply ReplyExpenseInfo, err error) {
+	xClient, err := client.GetClient(r)
+	if err != nil {
+		return
+	}
+	err = xClient.Call(ctx, "Info", expenseId, &reply)
+	return
+}
+
+type ArgsExpenseEdit struct {
+	ExpenseId int64
+	ExpenseAdd
+}
+
+// Edit @TITLE 编辑
+func (r *expense) Edit(ctx context.Context, args ArgsExpenseEdit) (err error) {
+	xClient, err := client.GetClient(r)
+	if err != nil {
+		return
+	}
+	reply := 0
+	return xClient.Call(ctx, "Edit", args, &reply)
+}
--- a/erp/expense/cost.go
+++ b/erp/expense/cost.go
@@ -0,0 +1,95 @@
+package expense
+
+import (
+	"context"
+	"time"
+
+	"git.kumo.work/shama/service/client"
+	"git.kumo.work/shama/service/lib/bean"
+	"github.com/shopspring/decimal"
+)
+
+type cost struct {
+}
+type ArgsCostList struct {
+	Page   bean.Page
+	Search CostSearch
+}
+type CostSearch struct {
+	ExpenseId int64 // 报销单ID
+}
+type ReplyCostList struct {
+	List  []CostItem `json:"list"`
+	Total int64      `json:"total"`
+}
+type CostItem struct {
+	Id            int64           `json:"id"`
+	ExpenseId     int64           `json:"expenseId"`
+	Date          time.Time       `json:"date"`
+	Type          int64           `json:"type"`
+	Value         string          `json:"value"`
+	Amount        decimal.Decimal `json:"amount"`
+	DepartmentId  int64           `json:"departmentId"`
+	InvoiceSerial string          `json:"invoiceSerial"`
+	CreatedAt     *time.Time      `json:"createdAt"`
+	UpdatedAt     *time.Time      `json:"updatedAt"`
+}
+
+// List @TITLE 列表
+func (c *cost) List(ctx context.Context, args ArgsCostList) (reply ReplyCostList, err error) {
+	xClient, err := client.GetClient(c)
+	if err != nil {
+		return
+	}
+	err = xClient.Call(ctx, "List", args, &reply)
+	return
+}
+
+type ArgsCostAdd struct {
+	ExpenseId    int64           // 报销单ID
+	Date         time.Time       // 费用日期
+	Type         int64           // 费用类型
+	Value        string          // 费用名称
+	Amount       decimal.Decimal // 金额
+	DepartmentId int64           // 部门
+}
+
+// Add @TITLE 添加
+func (c *cost) Add(ctx context.Context, args ArgsCostAdd) (err error) {
+	xClient, err := client.GetClient(c)
+	if err != nil {
+		return
+	}
+	reply := 0
+	return xClient.Call(ctx, "Add", args, &reply)
+}
+
+type ArgsCostEdit struct {
+	CostId int64
+	ArgsCostAdd
+}
+
+// Edit @TITLE 编辑
+func (c *cost) Edit(ctx context.Context, args ArgsCostEdit) (err error) {
+	xClient, err := client.GetClient(c)
+	if err != nil {
+		return
+	}
+	reply := 0
+	return xClient.Call(ctx, "Edit", args, &reply)
+}
+
+type ArgsCostDelete struct {
+	ExpenseId int64 // 报销单ID
+	CostIds   []int64
+}
+
+// Delete @TITLE 删除
+func (c *cost) Delete(ctx context.Context, args ArgsCostDelete) (err error) {
+	xClient, err := client.GetClient(c)
+	if err != nil {
+		return
+	}
+	reply := 0
+	return xClient.Call(ctx, "Delete", args, &reply)
+}
--- a/erp/expense/expense.go
+++ b/erp/expense/expense.go
@@ -0,0 +1,5 @@
+package expense
+
+type Expense struct {
+	Cost cost
+}
--- a/erp/request.go
+++ b/erp/request.go
@@ -0,0 +1,125 @@
+package erp
+
+import (
+	"context"
+	"time"
+
+	"git.kumo.work/shama/service/client"
+	request2 "git.kumo.work/shama/service/erp/request"
+	"git.kumo.work/shama/service/lib/bean"
+	"github.com/shopspring/decimal"
+)
+
+type request struct {
+	request2.Request
+}
+type ArgsRequestList struct {
+	Page   bean.Page
+	Search RequestSearch
+}
+type RequestSearch struct {
+	RequestSerial  string     // 报销单号
+	CreatedAtStart *time.Time // 创建开始时间
+	CreatedAtEnd   *time.Time // 创建结束时间
+}
+type ReplyRequestList struct {
+	List  []RequestItem `json:"list"`
+	Total int64         `json:"total"`
+}
+type RequestItem struct {
+	Id                 int64           `json:"id"`
+	FactoryId          int64           `json:"factoryId"`
+	FactoryName        string          `json:"factoryName"`
+	FactoryBank        string          `json:"factoryBank"`
+	FactoryBankAccount string          `json:"factoryBankAccount"`
+	RequestSerial      string          `json:"requestSerial"`
+	Currency           string          `json:"currency"`
+	CurrencyName       string          `json:"currencyName"`
+	CurrencySymbol     string          `json:"currencySymbol"`
+	CurrencyRate       decimal.Decimal `json:"currencyRate"`
+	Remarks            string          `json:"remarks"`
+	Amount             decimal.Decimal `json:"amount"`
+	CreatedStaffId     int64           `json:"createdStaffId"`
+	CreatedAt          *time.Time      `json:"createdAt"`
+	UpdatedAt          *time.Time      `json:"updatedAt"`
+}
+
+// List @TITLE 列表
+func (r *request) List(ctx context.Context, args ArgsRequestList) (reply ReplyRequestList, err error) {
+	xClient, err := client.GetClient(r)
+	if err != nil {
+		return
+	}
+	err = xClient.Call(ctx, "List", args, &reply)
+	return
+}
+
+type ArgsRequestAdd struct {
+	StaffId int64
+	RequestAdd
+}
+type RequestAdd struct {
+	FactoryId          int64           // 工厂id
+	FactoryName        string          // 工厂名称
+	FactoryBank        string          // 银行
+	FactoryBankAccount string          // 银行账号
+	Currency           string          // 币种
+	CurrencyName       string          // 币种名称
+	CurrencySymbol     string          // 币种符号
+	CurrencyRate       decimal.Decimal // 币种汇率
+	Remarks            string          // 备注
+	Amount             decimal.Decimal // 金额
+}
+
+// Add @TITLE 添加
+func (r *request) Add(ctx context.Context, args ArgsRequestAdd) (requestId int64, err error) {
+	xClient, err := client.GetClient(r)
+	if err != nil {
+		return
+	}
+	err = xClient.Call(ctx, "Add", args, &requestId)
+	return
+}
+
+type ReplyRequestInfo struct {
+	Id                 int64           `json:"id"`
+	RequestSerial      string          `json:"requestSerial"`
+	FactoryId          int64           `json:"factoryId"`
+	FactoryName        string          `json:"factoryName"`
+	FactoryBank        string          `json:"factoryBank"`
+	FactoryBankAccount string          `json:"factoryBankAccount"`
+	Currency           string          `json:"currency"`
+	CurrencyName       string          `json:"currencyName"`
+	CurrencySymbol     string          `json:"currencySymbol"`
+	CurrencyRate       decimal.Decimal `json:"currencyRate"`
+	Amount             decimal.Decimal `json:"amount"`
+	Remarks            string          `json:"remarks"`
+	CreatedStaffId     int64           `json:"createdStaffId"`
+	CreatedAt          *time.Time      `json:"createdAt"`
+	UpdatedAt          *time.Time      `json:"updatedAt"`
+}
+
+// Info @TITLE 详情
+func (r *request) Info(ctx context.Context, requestId int64) (reply ReplyRequestInfo, err error) {
+	xClient, err := client.GetClient(r)
+	if err != nil {
+		return
+	}
+	err = xClient.Call(ctx, "Info", requestId, &reply)
+	return
+}
+
+type ArgsRequestEdit struct {
+	RequestId int64
+	RequestAdd
+}
+
+// Edit @TITLE 编辑
+func (r *request) Edit(ctx context.Context, args ArgsRequestEdit) (err error) {
+	xClient, err := client.GetClient(r)
+	if err != nil {
+		return
+	}
+	reply := 0
+	return xClient.Call(ctx, "Edit", args, &reply)
+}
--- a/erp/request/cost.go
+++ b/erp/request/cost.go
@@ -0,0 +1,90 @@
+package request
+
+import (
+	"context"
+	"time"
+
+	"git.kumo.work/shama/service/client"
+	"git.kumo.work/shama/service/lib/bean"
+	"github.com/shopspring/decimal"
+)
+
+type cost struct {
+}
+type ArgsCostList struct {
+	Page   bean.Page
+	Search CostSearch
+}
+type CostSearch struct {
+	RequestId int64 // 报销单ID
+}
+type ReplyCostList struct {
+	List  []CostItem `json:"list"`
+	Total int64      `json:"total"`
+}
+type CostItem struct {
+	Id           int64           `json:"id"`
+	RequestId    int64           `json:"requestId"`
+	Amount       decimal.Decimal `json:"amount"`
+	DepartmentId int64           `json:"departmentId"`
+	Remarks      string          `json:"remarks"`
+	CreatedAt    *time.Time      `json:"createdAt"`
+	UpdatedAt    *time.Time      `json:"updatedAt"`
+}
+
+// List @TITLE 列表
+func (c *cost) List(ctx context.Context, args ArgsCostList) (reply ReplyCostList, err error) {
+	xClient, err := client.GetClient(c)
+	if err != nil {
+		return
+	}
+	err = xClient.Call(ctx, "List", args, &reply)
+	return
+}
+
+type ArgsCostAdd struct {
+	RequestId    int64           // 报销单ID
+	Amount       decimal.Decimal // 金额
+	DepartmentId int64           // 部门
+	Remarks      string          // 备注
+}
+
+// Add @TITLE 添加
+func (c *cost) Add(ctx context.Context, args ArgsCostAdd) (err error) {
+	xClient, err := client.GetClient(c)
+	if err != nil {
+		return
+	}
+	reply := 0
+	return xClient.Call(ctx, "Add", args, &reply)
+}
+
+type ArgsCostEdit struct {
+	CostId int64
+	ArgsCostAdd
+}
+
+// Edit @TITLE 编辑
+func (c *cost) Edit(ctx context.Context, args ArgsCostEdit) (err error) {
+	xClient, err := client.GetClient(c)
+	if err != nil {
+		return
+	}
+	reply := 0
+	return xClient.Call(ctx, "Edit", args, &reply)
+}
+
+type ArgsCostDelete struct {
+	RequestId int64 // 报销单ID
+	CostIds   []int64
+}
+
+// Delete @TITLE 删除
+func (c *cost) Delete(ctx context.Context, args ArgsCostDelete) (err error) {
+	xClient, err := client.GetClient(c)
+	if err != nil {
+		return
+	}
+	reply := 0
+	return xClient.Call(ctx, "Delete", args, &reply)
+}
--- a/erp/request/request.go
+++ b/erp/request/request.go
@@ -0,0 +1,5 @@
+package request
+
+type Request struct {
+	Cost cost
+}
--- a/ik3cloud/constant/constant.go
+++ b/ik3cloud/constant/constant.go
@@ -14,6 +14,9 @@ const (
 	ActionReceivable    Action = "AR_receivable"    // 付款单
 	ActionPayable       Action = "AP_Payable"       // 付款单
 	ActionProduct       Action = "BD_MATERIAL"      // 物料
+	ActionCurrency      Action = "BD_Currency"      // 币种
+	ActionSettleType    Action = "BD_SETTLETYPE"    // 结算方式
+	ActionRecPayPurpose Action = "CN_RECPAYPURPOSE" // 收付款用途
 )

 type OperatorType = string
--- a/ik3cloud/dict.go
+++ b/ik3cloud/dict.go
@@ -0,0 +1,31 @@
+package ik3cloud
+
+import (
+	"context"
+
+	"git.kumo.work/shama/service/client"
+	"git.kumo.work/shama/service/ik3cloud/constant"
+)
+
+type dict struct {
+}
+type DictItem struct {
+	Field1 any `json:"field1"`
+	Field2 any `json:"field2"`
+	Field3 any `json:"field3"`
+	Field4 any `json:"field4"`
+	Field5 any `json:"field5"`
+	Field6 any `json:"field6"`
+	Field7 any `json:"field7"`
+	Field8 any `json:"field8"`
+}
+
+// All @TITLE 获取字典
+func (d *dict) All(ctx context.Context, companyType constant.Action) (reply []DictItem, err error) {
+	xClient, err := client.GetClient(d)
+	if err != nil {
+		return
+	}
+	err = xClient.Call(ctx, "All", companyType, &reply)
+	return
+}
--- a/ik3cloud/ik3cloud.go
+++ b/ik3cloud/ik3cloud.go
@@ -10,6 +10,7 @@ type Ik3cloud struct {
 	Product    product    // 产品
 	Receivable receivable // 应收
 	Payable    payable    // 应付
+	Dict       dict       // 字典
 }
 type Entity struct {
 	Id     int64  `json:"Id"`
--- a/oa/department.go
+++ b/oa/department.go
@@ -56,6 +56,16 @@ func (d *department) Info(ctx context.Context, departmentId int64) (reply Depart
 	return
 }

+// Infos @TITLE 部门详情
+func (d *department) Infos(ctx context.Context, departmentIds []int64) (reply []DepartmentItem, err error) {
+	xClient, err := client.GetClient(d)
+	if err != nil {
+		return
+	}
+	err = xClient.Call(ctx, "Infos", departmentIds, &reply)
+	return
+}
+
 type ArgsDepartmentEdit struct {
 	DepartmentId int64 // 部门id
 	ArgsDepartmentAdd
Author	SHA1	Message	Date
kanade	81492da604	feat(k3cloud): 新增字典服务模块 - 在服务结构体中添加 Dict 字典服务字段 - 初始化字典服务模块以支持数据字典功能	2025-12-12 17:24:21 +08:00
kanade	b5a164788c	fix(client): 移除对 ik3cloud 的硬编码配置 - 删除了针对 ik3cloud 的特殊处理逻辑 - 统一使用 consul 进行服务发现 - 简化客户端初始化流程 - 修复潜在的配置冲突问题 - 提高代码可维护性 - 减少不必要的条件分支	2025-12-12 17:21:34 +08:00
kanade	929366ed0b	feat(ik3cloud): 新增字典服务与币种结算方式收付款用途常量 - 新增 DictItem 结构体定义字段 field1 至 field8 - 实现 dict.All 方法用于获取字典数据 - 添加 BD_Currency、BD_SETTLETYPE 和 CN_RECPAYPURPOSE 常量 - 在 client.go 中为 ik3cloud 服务增加本地调试发现逻辑	2025-12-12 17:20:22 +08:00
kanade	fce4272da9	feat(erp): 添加报销单及其费用管理功能 - 在 ERP 服务中新增 Request 模块，用于处理报销单相关逻辑 - 实现报销单的增删改查接口，支持列表、详情及编辑操作 - 新增费用管理模块 Cost，支持费用项的添加、修改、删除和列表查询 - 定义完整的请求与响应结构体，包括分页、搜索条件和返回数据格式 - 集成客户端调用逻辑，通过 RPC 方式与其他服务通信 - 引入 decimal 包处理金额字段，确保数值精度 - 添加时间戳字段用于记录创建和更新时间	2025-12-12 15:57:33 +08:00
kanade	436c60c2d0	feat(erp): 添加费用报销模块 - 新增费用报销主模块结构体及接口定义 - 实现费用列表、添加、编辑、删除功能 - 定义费用项数据结构和传输参数 - 集成客户端调用逻辑 - 支持分页查询和搜索条件过滤 - 提供费用详情查看接口	2025-12-12 15:11:58 +08:00
守护自己的云	d682f333a1	Merge pull request 'fix_account' (#1 ) from fix_account into master Reviewed-on: #1	2025-12-11 16:40:21 +08:00