feat(erp): 添加禁用标记字段以支持状态过滤

- 在 expense.go 中添加 BanFlag 字段用于标识报销单状态
- 在 receipt.go 中添加 BanFlag 字段用于标识结汇单状态
- 在 request.go 中添加 BanFlag 字段用于标识申请单状态
- 所有新增字段均支持 1=禁用 2=启用 的状态定义

erp/constant.go

@@ -12,6 +12,8 @@ const (
 	BusinessTypeShipmentModifyAudit BusinessType = "shipmentModifyAudit" // 订舱单修改单审核
 	BusinessTypeAccountingAudit     BusinessType = "accountingAudit"     // 做账合同审核
 	BusinessTypeAccountingAuditV2   BusinessType = "accountingAuditV2"   // 做账合同审核
+	BusinessTypeExpense             BusinessType = "expense"             // 报销单
+	BusinessTypeRequest             BusinessType = "request"             // 申请单
 )
 
 var BusinessTypeName = map[BusinessType]string{

erp/dict.go

@@ -0,0 +1,106 @@
+package erp
+
+import (
+	"context"
+	"time"
+
+	client2 "git.kumo.work/shama/service/client"
+	dict2 "git.kumo.work/shama/service/erp/dict"
+	"git.kumo.work/shama/service/lib/bean"
+)
+
+type dict struct {
+	dict2.Dict
+}
+type ArgsDictList struct {
+	Page   bean.Page
+	Search DictSearch
+}
+type DictSearch struct {
+	Name         string `label:"名称"`
+	Value2       string `label:"属性值2"`
+	CategoryId   int64  `label:"分类ID"`
+	CategoryCode string `label:"分类编码"`
+}
+type ReplyDictList struct {
+	List  []DictItem `json:"list"`
+	Total int64      `json:"total"`
+}
+
+type DictItem struct {
+	Id           int64      `json:"id"`
+	CategoryId   int64      `json:"categoryId"`
+	CategoryCode string     `json:"categoryCode"`
+	Sort         int64      `json:"sort"`
+	Value1       string     `json:"value1"`
+	Value2       string     `json:"value2"`
+	Value3       string     `json:"value3"`
+	Value4       string     `json:"value4"`
+	Value5       string     `json:"value5"`
+	Value6       string     `json:"value6"`
+	Value7       string     `json:"value7"`
+	Value8       string     `json:"value8"`
+	CreatedAt    *time.Time `json:"createdAt"`
+	UpdatedAt    *time.Time `json:"updatedAt"`
+}
+
+// List @TITLE 字典列表
+func (d *dict) List(ctx context.Context, args ArgsDictList) (reply ReplyDictList, err error) {
+	xClient, err := client2.GetClient(d)
+	if err != nil {
+		return
+	}
+	err = xClient.Call(ctx, "List", args, &reply)
+	return
+}
+
+type ArgsDictAdd struct {
+	CategoryId int64  `binding:"required" label:"类目ID"`
+	Sort       int64  `label:"排序"`
+	Value1     string `label:"属性值"`
+	Value2     string `label:"属性值"`
+	Value3     string `label:"属性值"`
+	Value4     string `label:"属性值"`
+	Value5     string `label:"属性值"`
+	Value6     string `label:"属性值"`
+	Value7     string `label:"属性值"`
+	Value8     string `label:"属性值"`
+}
+
+// Add @TITLE 添加字典
+func (d *dict) Add(ctx context.Context, args ArgsDictAdd) (err error) {
+	xClient, err := client2.GetClient(d)
+	if err != nil {
+		return
+	}
+	reply := 0
+	err = xClient.Call(ctx, "Add", args, &reply)
+	return
+}
+
+type ArgsDictEdit struct {
+	DictId int64 `binding:"required" label:"字典ID"`
+	ArgsDictAdd
+}
+
+// Edit @TITLE 编辑字典
+func (d *dict) Edit(ctx context.Context, args ArgsDictEdit) (err error) {
+	xClient, err := client2.GetClient(d)
+	if err != nil {
+		return
+	}
+	reply := 0
+	err = xClient.Call(ctx, "Edit", args, &reply)
+	return
+}
+
+// Delete @TITLE 删除字典
+func (d *dict) Delete(ctx context.Context, dictIds []int64) (err error) {
+	xClient, err := client2.GetClient(d)
+	if err != nil {
+		return
+	}
+	reply := 0
+	err = xClient.Call(ctx, "Delete", dictIds, &reply)
+	return
+}

erp/dict/category.go

@@ -0,0 +1,107 @@
+package dict
+
+import (
+	"context"
+	"time"
+
+	client2 "git.kumo.work/shama/service/client"
+	"git.kumo.work/shama/service/lib/bean"
+)
+
+type category struct {
+}
+type ArgsCategoryList struct {
+	Page   bean.Page
+	Search CategorySearch
+}
+type CategorySearch struct {
+	Name      string `label:"名称"`
+	GroupName string `label:"分组名"`
+}
+type ReplyCategoryList struct {
+	List  []CategoryItem `json:"list"`
+	Total int64          `json:"total"`
+}
+
+type CategoryItem struct {
+	Id        int64      `json:"id"`
+	Name      string     `json:"name"`
+	Code      string     `json:"code"`
+	Sort      int64      `json:"sort"`
+	Info      string     `json:"info"`
+	GroupName string     `json:"groupName"`
+	Label1    string     `json:"label1"`
+	Label2    string     `json:"label2"`
+	Label3    string     `json:"label3"`
+	Label4    string     `json:"label4"`
+	Label5    string     `json:"label5"`
+	Label6    string     `json:"label6"`
+	Label7    string     `json:"label7"`
+	Label8    string     `json:"label8"`
+	CreatedAt *time.Time `json:"createdAt"`
+	UpdatedAt *time.Time `json:"updatedAt"`
+}
+
+// List @TITLE 分类列表
+func (c *category) List(ctx context.Context, args ArgsCategoryList) (reply ReplyCategoryList, err error) {
+	xClient, err := client2.GetClient(c)
+	if err != nil {
+		return
+	}
+	err = xClient.Call(ctx, "List", args, &reply)
+	return
+}
+
+type ArgsCategoryAdd struct {
+	Name      string `binding:"required" label:"名称"`
+	Code      string `binding:"required" label:"唯一编码"`
+	Sort      int64  `label:"排序"`
+	Info      string `label:"备注"`
+	GroupName string `label:"分组名"`
+	Label1    string `label:"属性名称"`
+	Label2    string `label:"属性名称"`
+	Label3    string `label:"属性名称"`
+	Label4    string `label:"属性名称"`
+	Label5    string `label:"属性名称"`
+	Label6    string `label:"属性名称"`
+	Label7    string `label:"属性名称"`
+	Label8    string `label:"属性名称"`
+}
+
+// Add @TITLE 添加分类
+func (c *category) Add(ctx context.Context, args ArgsCategoryAdd) (err error) {
+	xClient, err := client2.GetClient(c)
+	if err != nil {
+		return
+	}
+	reply := 0
+	err = xClient.Call(ctx, "Add", args, &reply)
+	return
+}
+
+type ArgsCategoryEdit struct {
+	CategoryId int64 `binding:"required" label:"分类Id"`
+	ArgsCategoryAdd
+}
+
+// Edit @TITLE 编辑分类
+func (c *category) Edit(ctx context.Context, args ArgsCategoryEdit) (err error) {
+	xClient, err := client2.GetClient(c)
+	if err != nil {
+		return
+	}
+	reply := 0
+	err = xClient.Call(ctx, "Edit", args, &reply)
+	return
+}
+
+// Delete @TITLE 删除分类
+func (c *category) Delete(ctx context.Context, categoryIds []int64) (err error) {
+	xClient, err := client2.GetClient(c)
+	if err != nil {
+		return
+	}
+	reply := 0
+	err = xClient.Call(ctx, "Delete", categoryIds, &reply)
+	return
+}

erp/dict/dict.go

@@ -0,0 +1,6 @@
+package dict
+
+type Dict struct {
+	Font     font
+	Category category
+}

erp/dict/font.go

@@ -0,0 +1,39 @@
+package dict
+
+import (
+	"context"
+
+	"git.kumo.work/shama/service/client"
+	"git.kumo.work/shama/service/lib/bean"
+)
+
+type font struct {
+}
+
+type ArgsFontList struct {
+	Page   bean.Page
+	Search FontSearch
+}
+type FontSearch struct {
+	Name string
+}
+type ReplyFontList struct {
+	List  []FontItem `json:"list"`
+	Total int64      `json:"total"`
+}
+type FontItem struct {
+	Id       int64  `json:"id"`
+	Name     string `json:"name"`
+	Path     string `json:"path"`
+	BoldPath string `json:"boldPath"`
+}
+
+// List @TITLE 列表
+func (f *font) List(ctx context.Context, args ArgsFontList) (reply ReplyFontList, err error) {
+	xClient, err := client.GetClient(f)
+	if err != nil {
+		return
+	}
+	err = xClient.Call(ctx, "List", args, &reply)
+	return
+}

erp/erp.go

@@ -15,4 +15,7 @@ type Erp struct {
 	Payable          payable
 	Receivable       receivable
 	Receipt          receipt
+	Expense          expense
+	Request          request
+	Dict             dict
 }

erp/expense.go

@@ -0,0 +1,143 @@
+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 // 创建结束时间
+	ExpenseIds     []int64    // 报销单id
+	BanFlag        int64      // 禁用标记 1=禁用 2=启用
+}
+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"`
+	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"`
+}
+
+// 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          // 备注
+	ExpenseStaffId int64           // 报销人
+}
+
+// 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"`
+	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"`
+}
+
+// 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)
+}
+
+// Ik3cloud @TITLE 同步
+func (r *expense) Ik3cloud(ctx context.Context, expenseId int64) (err error) {
+	xClient, err := client.GetClient(r)
+	if err != nil {
+		return
+	}
+	reply := 0
+	return xClient.Call(ctx, "Ik3cloud", expenseId, &reply)
+}
+
+// Cancel @TITLE 作废
+func (r *expense) Cancel(ctx context.Context, expenseId int64) (err error) {
+	xClient, err := client.GetClient(r)
+	if err != nil {
+		return
+	}
+	reply := 0
+	return xClient.Call(ctx, "Cancel", expenseId, &reply)
+}

erp/expense/audit.go

@@ -0,0 +1,26 @@
+package expense
+
+import (
+	"context"
+
+	"git.kumo.work/shama/service/client"
+)
+
+type audit struct {
+}
+type ArgsAuditSubmit struct {
+	StaffId       int64   // 操作人
+	ExpenseId     int64   // 报销单id
+	AuditStaffIds []int64 // 审核人
+}
+
+// Submit @TITLE 提交审核
+func (a *audit) Submit(ctx context.Context, args ArgsAuditSubmit) (err error) {
+	xClient, err := client.GetClient(a)
+	if err != nil {
+		return
+	}
+	reply := 0
+	err = xClient.Call(ctx, "Submit", args, &reply)
+	return
+}

erp/expense/cost.go

@@ -0,0 +1,98 @@
+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"`
+	TypeNumber    string          `json:"typeNumber"`
+	TypeName      string          `json:"typeName"`
+	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       // 费用日期
+	TypeNumber    string          // 费用类型
+	TypeName      string          // 费用类型名称
+	Value         string          // 费用名称
+	Amount        decimal.Decimal // 金额
+	DepartmentId  int64           // 部门
+	InvoiceSerial 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 {
+	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)
+}

erp/expense/expense.go

@@ -0,0 +1,6 @@
+package expense
+
+type Expense struct {
+	Cost  cost
+	Audit audit
+}

erp/payable.go

@@ -30,7 +30,6 @@ type ReplyPayableList struct {
 type PayableItem struct {
 	Id               int64           `json:"id"`
 	PayableSerial    string          `json:"payableSerial"`
-	FactoryName      string          `json:"factoryName"`
 	AccountingSerial string          `json:"accountingSerial"`
 	Amount           decimal.Decimal `json:"amount"`
 	Currency         string          `json:"currency"`
@@ -54,28 +53,27 @@ func (p *payable) List(ctx context.Context, args ArgsPayableList) (reply ReplyPa
 }
 
 type ReplyPayableInfo struct {
-	Id                 int64                `json:"id"`
+	Id               int64                `json:"id"`
-	PayableSerial      string               `json:"payableSerial"`
+	PayableSerial    string               `json:"payableSerial"`
-	AccountingSerial   string               `json:"accountingSerial"`
+	AccountingSerial string               `json:"accountingSerial"`
-	FactoryName        string               `json:"factoryName"`
+	InvoiceSerial    string               `json:"invoiceSerial"`
-	FactoryBank        string               `json:"factoryBank"`
+	Amount           decimal.Decimal      `json:"amount"`
-	FactoryBankAccount string               `json:"factoryBankAccount"`
+	Currency         string               `json:"currency"`
-	Amount             decimal.Decimal      `json:"amount"`
+	CurrencyName     string               `json:"currencyName"`
-	Currency           string               `json:"currency"`
+	CurrencyRate     decimal.Decimal      `json:"currencyRate"`
-	CurrencyName       string               `json:"currencyName"`
+	CurrencySymbol   string               `json:"currencySymbol"`
-	CurrencyRate       decimal.Decimal      `json:"currencyRate"`
+	PurchaseStaffId  int64                `json:"purchaseStaffId"`
-	CurrencySymbol     string               `json:"currencySymbol"`
+	IsConfirm        int64                `json:"isConfirm"`
-	PurchaseStaffId    int64                `json:"purchaseStaffId"`
+	CreatedAt        *time.Time           `json:"createdAt"`
-	IsConfirm          int64                `json:"isConfirm"`
+	UpdatedAt        *time.Time           `json:"updatedAt"`
-	CreatedAt          *time.Time           `json:"createdAt"`
+	Products         []PayableProductItem `json:"products"`
-	UpdatedAt          *time.Time           `json:"updatedAt"`
+	Costs            []PayableCostItem    `json:"costs"`
-	Products           []PayableProductItem `json:"products"`
-	Costs              []PayableCostItem    `json:"costs"`
 }
 
 type PayableProductItem struct {
 	Id                  int64           `json:"id"`
 	AccountingProductId int64           `json:"accountingProductId"`
+	FactoryName         string          `json:"factoryName"`
 	Name                string          `json:"name"`
 	Serial              string          `json:"serial"`
 	PayableCount        int64           `json:"payableCount"`
@@ -88,10 +86,11 @@ type PayableProductItem struct {
 }
 
 type PayableCostItem struct {
-	Id      int64           `json:"id"`
+	Id          int64           `json:"id"`
-	Name    string          `json:"name"`
+	FactoryName string          `json:"factoryName"`
-	Amount  decimal.Decimal `json:"amount"`
+	Name        string          `json:"name"`
-	Remarks string          `json:"remarks"`
+	Amount      decimal.Decimal `json:"amount"`
+	Remarks     string          `json:"remarks"`
 }
 
 // Info @TITLE 详情
@@ -113,3 +112,13 @@ func (p *payable) Confirm(ctx context.Context, payableId int64) (err error) {
 	reply := 0
 	return xClient.Call(ctx, "Confirm", payableId, &reply)
 }
+
+// Ik3cloud @TITLE 金蝶同步
+func (p *payable) Ik3cloud(ctx context.Context, payableId int64) (err error) {
+	xClient, err := client.GetClient(p)
+	if err != nil {
+		return
+	}
+	reply := 0
+	return xClient.Call(ctx, "Ik3cloud", payableId, &reply)
+}

erp/receipt.go

@@ -19,10 +19,12 @@ type ArgsReceiptList struct {
 }
 type ReceiptSearch struct {
 	ReceiptSerial    string     // 收汇单号
-	PayName          string     // 付款单位
+	CustomId         int64      // 客户筛选
+	CustomName       string     // 客户筛选
 	BankName         string     // 结汇银行
 	ReceiptDateStart *time.Time // 创建开始时间
 	ReceiptDateEnd   *time.Time // 创建结束时间
+	BanFlag          int64      // 禁用标记 1=禁用 2=启用
 }
 type ReplyReceiptList struct {
 	List  []ReceiptItem `json:"list"`
@@ -31,7 +33,8 @@ type ReplyReceiptList struct {
 type ReceiptItem struct {
 	Id                 int64           `json:"id"`
 	ReceiptSerial      string          `json:"receiptSerial"`
-	PayName            string          `json:"payName"`
+	CustomId           int64           `json:"customId"`
+	CustomName         string          `json:"customName"`
 	ReceiptDate        time.Time       `json:"receiptDate"`
 	Currency           string          `json:"currency"`
 	CurrencyName       string          `json:"currencyName"`
@@ -65,7 +68,7 @@ type ReceiptAdd struct {
 	CurrencyName    string          // 币种名称
 	CurrencySymbol  string          // 币种符号
 	CurrencyRate    decimal.Decimal // 币种汇率
-	PayName         string          // 付款单位
+	CustomId        int64           // 客户id
 	BankName        string          // 结汇银行
 	EntryAmount     decimal.Decimal // 外币入账金额
 	ForeignFee      decimal.Decimal // 国外扣费
@@ -91,7 +94,8 @@ type ReplyReceiptInfo struct {
 	CurrencyName       string          `json:"currencyName"`
 	CurrencySymbol     string          `json:"currencySymbol"`
 	CurrencyRate       decimal.Decimal `json:"currencyRate"`
-	PayName            string          `json:"payName"`
+	CustomId           int64           `json:"customId"`
+	CustomName         string          `json:"customName"`
 	BankName           string          `json:"bankName"`
 	EntryAmount        decimal.Decimal `json:"entryAmount"`
 	ForeignFee         decimal.Decimal `json:"foreignFee"`
@@ -127,3 +131,23 @@ func (r *receipt) Edit(ctx context.Context, args ArgsReceiptEdit) (err error) {
 	reply := 0
 	return xClient.Call(ctx, "Edit", args, &reply)
 }
+
+// Ik3cloud @TITLE 金蝶同步
+func (r *receipt) Ik3cloud(ctx context.Context, receiptId int64) (err error) {
+	xClient, err := client.GetClient(r)
+	if err != nil {
+		return
+	}
+	reply := 0
+	return xClient.Call(ctx, "Ik3cloud", receiptId, &reply)
+}
+
+// Cancel @TITLE 作废
+func (r *receipt) Cancel(ctx context.Context, receiptId int64) (err error) {
+	xClient, err := client.GetClient(r)
+	if err != nil {
+		return
+	}
+	reply := 0
+	return xClient.Call(ctx, "Cancel", receiptId, &reply)
+}

erp/receivable.go

@@ -18,6 +18,7 @@ type ArgsReceivableList struct {
 type ReceivableSearch struct {
 	ReceivableSerial string     // 收款单据号
 	CustomId         int64      // 客户id
+	CustomName       string     // 客户名称
 	InvoiceSerial    string     // 出运发票号
 	CreatedAtStart   *time.Time // 创建开始时间
 	CreatedAtEnd     *time.Time // 创建结束时间
@@ -39,6 +40,7 @@ type ReceivableItem struct {
 	CurrencyRate      decimal.Decimal `json:"currencyRate"`
 	CurrencySymbol    string          `json:"currencySymbol"`
 	CreatedStaffID    int64           `json:"createdStaffID"`
+	Ik3cloudStatus    Flag            `json:"ik3CloudStatus"`
 	CreatedAt         *time.Time      `json:"createdAt"`
 	UpdatedAt         *time.Time      `json:"updatedAt"`
 }
@@ -66,6 +68,7 @@ type ReplyReceivableInfo struct {
 	CurrencyRate      decimal.Decimal         `json:"currencyRate"`
 	CurrencySymbol    string                  `json:"currencySymbol"`
 	CreatedStaffID    int64                   `json:"createdStaffID"`
+	Ik3cloudStatus    Flag                    `json:"ik3CloudStatus"`
 	CreatedAt         *time.Time              `json:"createdAt"`
 	UpdatedAt         *time.Time              `json:"updatedAt"`
 	Products          []ReceivableProductItem `json:"products"`
@@ -91,6 +94,16 @@ func (r *receivable) Info(ctx context.Context, receivableId int64) (reply ReplyR
 	if err != nil {
 		return
 	}
-	err = xClient.Call(ctx, "List", receivableId, &reply)
+	err = xClient.Call(ctx, "Info", receivableId, &reply)
 	return
 }
+
+// Ik3cloud @TITLE 同步
+func (r *receivable) Ik3cloud(ctx context.Context, receivableId int64) (err error) {
+	xClient, err := client.GetClient(r)
+	if err != nil {
+		return
+	}
+	reply := 0
+	return xClient.Call(ctx, "Ik3cloud", receivableId, &reply)
+}

erp/request.go

@@ -0,0 +1,153 @@
+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 // 创建结束时间
+	RequestIds     []int64    // 申请单id
+	BanFlag        int64      // 禁用标记 1=禁用 2=启用
+}
+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"`
+	WorkflowId         int64           `json:"workflowId"`
+	WorkflowStatus     int64           `json:"workflowStatus"`
+	WorkflowReason     string          `json:"workflowReason"`
+	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"`
+	WorkflowId         int64           `json:"workflowId"`
+	WorkflowStatus     int64           `json:"workflowStatus"`
+	WorkflowReason     string          `json:"workflowReason"`
+	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)
+}
+
+// Ik3cloud @TITLE 同步
+func (r *request) Ik3cloud(ctx context.Context, requestId int64) (err error) {
+	xClient, err := client.GetClient(r)
+	if err != nil {
+		return
+	}
+	reply := 0
+	return xClient.Call(ctx, "Ik3cloud", requestId, &reply)
+}
+
+// Cancel @TITLE 作废
+func (r *request) Cancel(ctx context.Context, requestId int64) (err error) {
+	xClient, err := client.GetClient(r)
+	if err != nil {
+		return
+	}
+	reply := 0
+	return xClient.Call(ctx, "Cancel", requestId, &reply)
+}

erp/request/audit.go

@@ -0,0 +1,26 @@
+package request
+
+import (
+	"context"
+
+	"git.kumo.work/shama/service/client"
+)
+
+type audit struct {
+}
+type ArgsAuditSubmit struct {
+	StaffId       int64   // 操作人
+	RequestId     int64   // 申请单id
+	AuditStaffIds []int64 // 审核人
+}
+
+// Submit @TITLE 提交审核
+func (a *audit) Submit(ctx context.Context, args ArgsAuditSubmit) (err error) {
+	xClient, err := client.GetClient(a)
+	if err != nil {
+		return
+	}
+	reply := 0
+	err = xClient.Call(ctx, "Submit", args, &reply)
+	return
+}

erp/request/cost.go

@@ -0,0 +1,100 @@
+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"`
+	TypeNumber      string          `json:"typeNumber"`
+	TypeName        string          `json:"typeName"`
+	Amount          decimal.Decimal `json:"amount"`
+	DepartmentId    int64           `json:"departmentId"`
+	InvoiceSerial   string          `json:"invoiceSerial"`
+	Remarks         string          `json:"remarks"`
+	DueDate         *time.Time      `json:"dueDate"`
+	ExpectedPayDate *time.Time      `json:"expectedPayDate"`
+	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
+	TypeNumber      string          // 费用类型
+	TypeName        string          // 费用类型名称
+	Amount          decimal.Decimal // 金额
+	DepartmentId    int64           // 部门
+	Remarks         string          // 备注
+	InvoiceSerial   string          // 发票号
+	DueDate         *time.Time      // 到期日期
+	ExpectedPayDate *time.Time      // 期望付款日期
+}
+
+// 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)
+}

erp/request/request.go

@@ -0,0 +1,6 @@
+package request
+
+type Request struct {
+	Cost  cost
+	Audit audit
+}

ik3cloud/constant/constant.go

@@ -3,22 +3,91 @@ package constant
 type Action = string // 方法
 
 const (
-	ActionDepartment    Action = "BD_Department"    // 部门
+	ActionDepartment    Action = "BD_Department"            // 部门
-	ActionStaff         Action = "BD_Empinfo"       // 员工
+	ActionStaff         Action = "BD_Empinfo"               // 员工
-	ActionStaffPosition Action = "BD_NEWSTAFF"      // 职位
+	ActionStaffPosition Action = "BD_NEWSTAFF"              // 职位
-	ActionOperatorType  Action = "BD_OPERATOR"      // 业务员类型
+	ActionOperatorType  Action = "BD_OPERATOR"              // 业务员类型
-	ActionPosition      Action = "HR_ORG_HRPOST"    // 职位
+	ActionPosition      Action = "HR_ORG_HRPOST"            // 职位
-	ActionFactory       Action = "BD_Supplier"      // 工厂
+	ActionFactory       Action = "BD_Supplier"              // 工厂
-	ActionContact       Action = "BD_CommonContact" // 联系人
+	ActionContact       Action = "BD_CommonContact"         // 联系人
-	ActionCustom        Action = "BD_Customer"      // 客户
+	ActionCustom        Action = "BD_Customer"              // 客户
-	ActionReceivable    Action = "AR_receivable"    // 付款单
+	ActionReceivable    Action = "AR_receivable"            // 应收单
-	ActionPayable       Action = "AP_Payable"       // 付款单
+	ActionPayable       Action = "AP_Payable"               // 应付单
-	ActionProduct       Action = "BD_MATERIAL"      // 物料
+	ActionProduct       Action = "BD_MATERIAL"              // 物料
+	ActionCurrency      Action = "BD_Currency"              // 币种
+	ActionSettleType    Action = "BD_SETTLETYPE"            // 结算方式
+	ActionRecPayPurpose Action = "CN_RECPAYPURPOSE"         // 收付款用途
+	ActionExpense       Action = "BD_Expense"               // 费用项目
+	ActionPayment       Action = "AP_PAYBILL"               // 付款单
+	ActionInformation   Action = "BOS_ASSISTANTDATA_DETAIL" // 辅助资料
+	ActionReceiptAction Action = "AR_RECEIVEBILL"           // 收款单
 )
 
+var ActionIdField = map[Action]string{
+	ActionDepartment:    "FDEPTID",
+	ActionStaff:         "FID",
+	ActionStaffPosition: "FSTAFFID",
+	ActionOperatorType:  "FOperatorId",
+	ActionPosition:      "FPOSTID",
+	ActionFactory:       "FSupplierId",
+	ActionContact:       "FCONTACTID",
+	ActionCustom:        "FCUSTID",
+	ActionReceivable:    "FID",
+	ActionPayable:       "FID",
+	ActionProduct:       "FMATERIALID",
+	ActionCurrency:      "",
+	ActionSettleType:    "",
+	ActionRecPayPurpose: "",
+	ActionExpense:       "",
+	ActionPayment:       "FID",
+	ActionInformation:   "FEntryID",
+	ActionReceiptAction: "FID",
+}
+var ActionNumberField = map[Action]string{
+	ActionDepartment:    "FNumber",
+	ActionStaff:         "FNumber",
+	ActionStaffPosition: "FNumber",
+	ActionOperatorType:  "FNumber",
+	ActionPosition:      "FNumber",
+	ActionFactory:       "FNumber",
+	ActionContact:       "FNumber",
+	ActionCustom:        "FNumber",
+	ActionReceivable:    "FBillNo",
+	ActionPayable:       "FBillNo",
+	ActionProduct:       "FNumber",
+	ActionCurrency:      "FNumber",
+	ActionSettleType:    "FNumber",
+	ActionRecPayPurpose: "FNumber",
+	ActionExpense:       "FNumber",
+	ActionPayment:       "FBillNo",
+	ActionInformation:   "FNumber",
+	ActionReceiptAction: "FBillNo",
+}
+
 type OperatorType = string
 
 const (
 	OperatorTypeXSY OperatorType = "XSY" // 业务员
 	OperatorTypeCGY OperatorType = "CGY" // 采购员
 )
+
+type PaymentType = string
+
+const (
+	PaymentTypePurchase PaymentType = "FKDLX09_SYS" // 采购付款单
+	PaymentTypeCost     PaymentType = "FKDLX10_SYS" // 费用付款单
+	PaymentTypeRequest  PaymentType = "FKDLX11_SYS" // 报销付款单
+)
+
+type ReceiptType = string
+
+const (
+	ReceiptTypeReceiptFx ReceiptType = "SKDLX08_SYS" // 收汇水单
+	ReceiptTypeReceipt   ReceiptType = "SKDLX09_SYS" // 收款单
+)
+
+type InformationType = string
+
+const (
+	InformationTypeInvoiceSerial InformationType = "FYP" // 采购付款单
+)

ik3cloud/department.go

@@ -46,11 +46,11 @@ func (d *department) Save(ctx context.Context, args ArgsDepartmentSave) (entity
 }
 
 // Delete @TITLE 删除部门
-func (d *department) Delete(ctx context.Context, numbers []string) (err error) {
+func (d *department) Delete(ctx context.Context, args Unique) (err error) {
 	xClient, err := client.GetClient(d)
 	if err != nil {
 		return
 	}
 	var reply int
-	return xClient.Call(ctx, "Delete", numbers, &reply)
+	return xClient.Call(ctx, "Delete", args, &reply)
 }

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
+}

ik3cloud/ik3cloud.go

@@ -1,22 +1,74 @@
 package ik3cloud
 
+import (
+	"encoding/json"
+	"fmt"
+	"strconv"
+)
+
 type Ik3cloud struct {
-	Department department // 部门
+	Department  department  // 部门
-	Staff      staff      // 员工
+	Staff       staff       // 员工
-	Position   position   // 职位
+	Position    position    // 职位
-	Contact    contact    // 联系人
+	Contact     contact     // 联系人
-	Factory    factory    // 工厂
+	Factory     factory     // 工厂
-	Custom     custom     // 客户
+	Custom      custom      // 客户
-	Product    product    // 产品
+	Product     product     // 产品
-	Receivable receivable // 应收
+	Receivable  receivable  // 应收
-	Payable    payable    // 应付
+	Payable     payable     // 应付
+	Dict        dict        // 字典
+	Payment     payment     // 付款单
+	Information information // 资料
+	Receipt     receipt     // 收款单
 }
+
 type Entity struct {
 	Id     int64  `json:"Id"`
 	Number string `json:"Number"`
 	DIndex int    `json:"DIndex"`
 }
 
+// SetStringId @TITLE 设置字符串id
+func (e *Entity) SetStringId(stringId string) {
+	e.Id, _ = strconv.ParseInt(stringId, 16, 64)
+}
+
+// GetStringId @TITLE 获取字符串id
+func (e *Entity) GetStringId() string {
+	return strconv.FormatInt(e.Id, 16)
+}
+
+func (e *Entity) UnmarshalJSON(data []byte) error {
+	var raw map[string]interface{}
+	if err := json.Unmarshal(data, &raw); err != nil {
+		return err
+	}
+
+	// 处理 Id 字段，支持字符串和数字类型
+	if idVal, ok := raw["Id"]; ok {
+		switch v := idVal.(type) {
+		case string:
+			e.SetStringId(v)
+		case float64: // JSON 中的数字默认为 float64
+			e.Id = int64(v)
+		case int64:
+			e.Id = v
+		default:
+			return fmt.Errorf("unsupported type for Id: %T", v)
+		}
+	}
+
+	// 其他字段处理
+	if num, ok := raw["Number"].(string); ok {
+		e.Number = num
+	}
+	if dIndex, ok := raw["DIndex"].(float64); ok {
+		e.DIndex = int(dIndex)
+	}
+
+	return nil
+}
+
 type Unique struct {
 	Numbers []string // 编码
 	Ids     []int64  // id

ik3cloud/information.go

@@ -0,0 +1,28 @@
+package ik3cloud
+
+import (
+	"context"
+
+	"git.kumo.work/shama/service/client"
+	"git.kumo.work/shama/service/ik3cloud/constant"
+)
+
+type information struct {
+}
+
+type InformationSaveItem struct {
+	InformationId int64
+	Number        string
+	Value         string
+	Type          constant.InformationType // 资料类型
+}
+
+// Save @TITLE 保存
+func (i *information) Save(ctx context.Context, args []InformationSaveItem) (entities []Entity, err error) {
+	xClient, err := client.GetClient(i)
+	if err != nil {
+		return
+	}
+	err = xClient.Call(ctx, "Save", args, &entities)
+	return
+}

ik3cloud/payable.go

@@ -2,17 +2,40 @@ package ik3cloud
 
 import (
 	"context"
+	"time"
 
 	"git.kumo.work/shama/service/client"
+	"github.com/shopspring/decimal"
 )
 
 type payable struct {
 }
 type ArgsPayableSave struct {
-	PayableId     int64  // 应付单id
+	PayableId        int64                // 应付单id
-	Number        string // 编码
+	Number           string               // 编码
-	CustomNumber  string // 客户编码
+	InvoiceSerial    string               // 发票号
-	FactoryNumber string // 工厂编码
+	CustomNumber     string               // 客户编码
+	FactoryNumber    string               // 工厂编码
+	Date             time.Time            //  日期
+	CurrencyNumber   string               // 币种
+	DepartmentNumber string               // 部门
+	StaffCgyNumber   string               // 业务员
+	Rate             decimal.Decimal      // 汇率
+	Products         []PayableProductItem // 商品
+}
+
+type PayableProductItem struct {
+	FactoryNumber   string          // 工厂编码
+	Number          string          // 商品编码
+	Name            string          // 商品名称
+	Count           int64           // 数量
+	UnitPrice       decimal.Decimal // 含税单价
+	AddTaxRate      decimal.Decimal // 税率
+	ExTaxUnitPrice  decimal.Decimal // 不含税单价
+	TaxAmount       decimal.Decimal // 税额
+	UnitAmount      decimal.Decimal // 含税金额
+	ExTaxUnitAmount decimal.Decimal // 不含税金额
+	CostAmount      decimal.Decimal // 加减费用金额
 }
 
 // Save @TITLE 保存应付
@@ -24,3 +47,13 @@ func (p *payable) Save(ctx context.Context, args ArgsPayableSave) (entity Entity
 	err = xClient.Call(ctx, "Save", args, &entity)
 	return
 }
+
+// Cancel @TITLE 作废
+func (p *payable) Cancel(ctx context.Context, args Unique) (err error) {
+	xClient, err := client.GetClient(p)
+	if err != nil {
+		return
+	}
+	reply := 0
+	return xClient.Call(ctx, "Cancel", args, &reply)
+}

ik3cloud/payment.go

@@ -0,0 +1,57 @@
+package ik3cloud
+
+import (
+	"context"
+	"time"
+
+	"git.kumo.work/shama/service/client"
+	"git.kumo.work/shama/service/ik3cloud/constant"
+	"github.com/shopspring/decimal"
+)
+
+type payment struct {
+}
+
+type ArgsPaymentSave struct {
+	PaymentId        int64                // 付款单id
+	Number           string               // 付款单编号
+	PaymentType      constant.PaymentType // 付款类型
+	PayeeNameType    string               // 收款单位类型
+	PayeeName        string               // 收款单位
+	CurrencyNumber   string               // 币种
+	DepartmentNumber string               // 采购部门
+	StaffNumber      string               // 采购员
+	Remarks          string               // 备注
+	Costs            []PaymentCostItem    // 费用
+	Rate             decimal.Decimal      // 汇率
+	Date             time.Time            // 业务日期 2006-01-02 15:04:05
+}
+type PaymentCostItem struct {
+	Amount           decimal.Decimal // 金额
+	Date             time.Time       // 费用日期
+	InvoiceSerial    string          // 发票号
+	DepartmentNumber string          // 核算部门
+	//SettlementMethod string          // 结算方式
+	//PaymentPurpose   string          // 付款用途
+	ExpenseItem string // 费用项目
+}
+
+// Save @TITLE 保存付款单
+func (p *payment) Save(ctx context.Context, args ArgsPaymentSave) (entity Entity, err error) {
+	xClient, err := client.GetClient(p)
+	if err != nil {
+		return
+	}
+	err = xClient.Call(ctx, "Save", args, &entity)
+	return
+}
+
+// Cancel @TITLE 作废
+func (p *payment) Cancel(ctx context.Context, args Unique) (err error) {
+	xClient, err := client.GetClient(p)
+	if err != nil {
+		return
+	}
+	reply := 0
+	return xClient.Call(ctx, "Cancel", args, &reply)
+}

ik3cloud/receipt.go

@@ -0,0 +1,53 @@
+package ik3cloud
+
+import (
+	"context"
+	"time"
+
+	"git.kumo.work/shama/service/client"
+	"git.kumo.work/shama/service/ik3cloud/constant"
+	"github.com/shopspring/decimal"
+)
+
+type receipt struct {
+}
+type ArgsReceiptSave struct {
+	ReceiptId        int64                // 收款单ID
+	Number           string               // 单据编号
+	ReceiptType      constant.ReceiptType // 收款单类型
+	Date             time.Time            // 收款单日期
+	DepartmentNumber string               // 部门编号
+	StaffXsyNumber   string               // 业务员编号
+	CurrencyNumber   string               // 币种编号
+	Rate             decimal.Decimal      // 汇率
+	Remarks          string               // 备注
+	Costs            []ReceiptCost        // 费用明细
+	CustomNumber     string               // 客户编号
+}
+
+type ReceiptCost struct {
+	InvoiceSerial    string          // 发票号
+	DepartmentNumber string          // 部门编号
+	Amount           decimal.Decimal // 金额
+	Remarks          string          // 备注
+}
+
+// Save @TITLE 保存收款单
+func (r *receipt) Save(ctx context.Context, args ArgsReceiptSave) (entity Entity, err error) {
+	xClient, err := client.GetClient(r)
+	if err != nil {
+		return
+	}
+	err = xClient.Call(ctx, "Save", args, &entity)
+	return
+}
+
+// Cancel @TITLE 作废
+func (r *receipt) Cancel(ctx context.Context, args Unique) (err error) {
+	xClient, err := client.GetClient(r)
+	if err != nil {
+		return
+	}
+	reply := 0
+	return xClient.Call(ctx, "Cancel", args, &reply)
+}

ik3cloud/receivable.go

@@ -2,16 +2,43 @@ package ik3cloud
 
 import (
 	"context"
+	"time"
 
 	"git.kumo.work/shama/service/client"
+	"github.com/shopspring/decimal"
 )
 
 type receivable struct {
 }
 type ArgsReceivableSave struct {
-	ReceivableId int64  // 应收单id
+	ReceivableId         int64                   // 应收单id
-	Number       string // 编码
+	InvoiceSerial        string                  // 发票号
-	CustomNumber string // 客户编码
+	Number               string                  // 编码
+	CustomNumber         string                  // 客户编码
+	CurrencyNumber       string                  // 币种
+	DepartmentNumber     string                  // 部门
+	StaffXsyNumber       string                  // 业务员
+	Products             []ReceivableProductItem // 商品
+	Rate                 decimal.Decimal         // 汇率
+	Date                 time.Time               //  日期
+	DomesticShippingCost decimal.Decimal         // 国内运费
+	ForeignShippingCost  decimal.Decimal         // 国外运费
+	ForeignCommission    decimal.Decimal         // 出口佣金
+}
+
+type ReceivableProductItem struct {
+	Number          string          // 商品编码
+	Name            string          // 商品名称
+	Count           int64           // 数量
+	UnitPrice       decimal.Decimal // 含税单价
+	AddTaxRate      decimal.Decimal // 税率
+	ExTaxUnitPrice  decimal.Decimal // 不含税单价
+	TaxAmount       decimal.Decimal // 税额
+	UnitAmount      decimal.Decimal // 含税金额
+	ExTaxUnitAmount decimal.Decimal // 不含税金额
+	ExportCost      decimal.Decimal // 外销成本
+	MinusTaxRate    decimal.Decimal // 退税率
+	MinusTaxAmount  decimal.Decimal // 退税额
 }
 
 // Save @TITLE 保存应收
@@ -23,3 +50,13 @@ func (r *receivable) Save(ctx context.Context, args ArgsReceivableSave) (entity
 	err = xClient.Call(ctx, "Save", args, &entity)
 	return
 }
+
+// Cancel @TITLE 作废
+func (r *receivable) Cancel(ctx context.Context, args Unique) (err error) {
+	xClient, err := client.GetClient(r)
+	if err != nil {
+		return
+	}
+	reply := 0
+	return xClient.Call(ctx, "Cancel", args, &reply)
+}

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

oa/staff.go

@@ -272,9 +272,7 @@ type ReplyStaffIk3cloudInfo struct {
 	PositionId     int64                       `json:"positionId"`     // 金蝶部门职位id
 	PositionNumber string                      `json:"positionNumber"` // 金蝶部门职位编码
 	XsyId          int64                       `json:"xsyId"`          // 金蝶员工销售员id
-	XsyNumber      string                      `json:"xsyNumber"`      // 金蝶员工销售员编码
 	CgyId          int64                       `json:"cgyId"`          // 金蝶员工采购员id
-	CgyNumber      string                      `json:"cgyNumber"`      // 金蝶员工采购员编码
 	Department     ReplyDepartmentIk3cloudInfo `json:"department"`
 }