shama/service
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(erp): 添加应付模块功能

Browse Source 
- 新增应付模块，支持应付列表和详情接口
- 添加应付单据的保存功能
- 实现与客户端的通信调用逻辑
- 定义应付相关的数据结构和参数类型
- 支持分页查询和搜索条件过滤
This commit is contained in:
守护自己的云
2025-12-09 13:11:14 +08:00
parent 89999b7df3
commit 8614837410
8 changed files with 173 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
client/client.go
View File

@@ -61,9 +61,18 @@ func GetClient(s interface{}) (*RpcClient, error) {
mutex.Lock()
xClient, ok = mClient.Load(key)
if !ok {
d, err := consulClient.NewConsulDiscovery(basePath, servicePath, config.RpcConfig.RegistryServer, nil)
if err != nil {
return nil, errors.New("系统异常")
var d client.ServiceDiscovery
var err error
if basePath == "ik3cloud" {
d, err = client.NewPeer2PeerDiscovery("tcp@localhost:8081", "")
if err != nil {
return nil, errors.New("系统异常")
}
} else {
d, err = consulClient.NewConsulDiscovery(basePath, servicePath, config.RpcConfig.RegistryServer, nil)
if err != nil {
return nil, errors.New("系统异常")
}
}
option := client.DefaultOption
option.Retries = 3

1
erp/erp.go
View File

@@ -12,4 +12,5 @@ type Erp struct {
Contact contact
Template template
Accounting accounting
Payable payable
}

105
erp/payable.go Normal file
View File

@@ -0,0 +1,105 @@
package erp
import (
"context"
"time"
"git.kumo.work/shama/service/client"
"git.kumo.work/shama/service/lib/bean"
"github.com/shopspring/decimal"
)
type payable struct {
}
type ArgsPayableList struct {
Page bean.Page
Search PayableSearch
}
type PayableSearch struct {
PayableSerial string // 付款单据号
FactoryId int64 // 工厂id
AccountingSerial string // 做账单号
CreatedAtStart *time.Time // 创建开始时间
CreatedAtEnd *time.Time // 创建结束时间
IsConfirm int64 // 是否确认
}
type ReplyPayableList struct {
List []PayableItem `json:"list"`
Total int64 `json:"total"`
}
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"`
CurrencyName string `json:"currencyName"`
CurrencyRate decimal.Decimal `json:"currencyRate"`
CurrencySymbol string `json:"currencySymbol"`
IsConfirm int64 `json:"isConfirm"`
PurchaseStaffId int64 `json:"purchaseStaffId"`
CreatedAt *time.Time `json:"createdAt"`
UpdatedAt *time.Time `json:"updatedAt"`
}
// List @TITLE 列表
func (p *payable) List(ctx context.Context, args ArgsPayableList) (reply ReplyPayableList, total int64) {
xClient, err := client.GetClient(p)
if err != nil {
return
}
err = xClient.Call(ctx, "List", args, &reply)
return
}
type ReplyPayableInfo struct {
Id int64 `json:"id"`
PayableSerial string `json:"payableSerial"`
AccountingSerial string `json:"accountingSerial"`
FactoryName string `json:"factoryName"`
FactoryBank string `json:"factoryBank"`
FactoryBankAccount string `json:"factoryBankAccount"`
Amount decimal.Decimal `json:"amount"`
Currency string `json:"currency"`
CurrencyName string `json:"currencyName"`
CurrencyRate decimal.Decimal `json:"currencyRate"`
CurrencySymbol string `json:"currencySymbol"`
PurchaseStaffId int64 `json:"purchaseStaffId"`
IsConfirm int64 `json:"isConfirm"`
CreatedAt *time.Time `json:"createdAt"`
UpdatedAt *time.Time `json:"updatedAt"`
Products []PayableProductItem `json:"products"`
Costs []PayableCostItem `json:"costs"`
}
type PayableProductItem struct {
Id int64 `json:"id"`
AccountingProductId int64 `json:"accountingProductId"`
Name string `json:"name"`
Serial string `json:"serial"`
PayableCount int64 `json:"payableCount"`
AddTaxRate decimal.Decimal `json:"addTaxRate"`
UnitPrice decimal.Decimal `json:"unitPrice"`
ExTaxUnitPrice decimal.Decimal `json:"exTaxUnitPrice"`
UnitAmount decimal.Decimal `json:"unitAmount"`
ExTaxUnitAmount decimal.Decimal `json:"exTaxUnitAmount"`
TaxAmount decimal.Decimal `json:"taxAmount"`
}
type PayableCostItem struct {
Id int64 `json:"id"`
Name string `json:"name"`
Amount decimal.Decimal `json:"amount"`
Remarks string `json:"remarks"`
}
// Info @TITLE 详情
func (p *payable) Info(ctx context.Context, payableId int64) (reply ReplyPayableInfo, err error) {
xClient, err := client.GetClient(p)
if err != nil {
return
}
err = xClient.Call(ctx, "List", payableId, &reply)
return
}

3
ik3cloud/constant/constant.go
View File

@@ -11,7 +11,8 @@ const (
ActionFactory Action = "BD_Supplier" // 工厂
ActionContact Action = "BD_CommonContact" // 联系人
ActionCustom Action = "BD_Customer" // 客户
ActionPayment Action = "AR_receivable" // 付款单
ActionReceivable Action = "AR_receivable" // 付款单
ActionPayable Action = "AP_Payable" // 付款单
ActionProduct Action = "BD_MATERIAL" // 物料
)

3
ik3cloud/ik3cloud.go
View File

@@ -7,8 +7,9 @@ type Ik3cloud struct {
Contact contact // 联系人
Factory factory // 工厂
Custom custom // 客户
Payment payment // 付款
Product product // 产品
Receivable receivable // 应收
Payable payable // 应付
}
type Entity struct {
Id int64 `json:"Id"`

26
ik3cloud/payable.go Normal file
View File

@@ -0,0 +1,26 @@
package ik3cloud
import (
"context"
"git.kumo.work/shama/service/client"
)
type payable struct {
}
type ArgsPayableSave struct {
PayableId int64 // 应付单id
Number string // 编码
CustomNumber string // 客户编码
FactoryNumber string // 工厂编码
}
// Save @TITLE 保存应付
func (p *payable) Save(ctx context.Context, args ArgsPayableSave) (entity Entity, err error) {
xClient, err := client.GetClient(p)
if err != nil {
return
}
err = xClient.Call(ctx, "Save", args, &entity)
return
}

25
ik3cloud/payment.go
View File

@@ -1,25 +0,0 @@
package ik3cloud
import (
"context"
"git.kumo.work/shama/service/client"
)
type payment struct {
}
type ArgsPaymentSave struct {
PaymentId int64 // 付款单id
Number string // 编码
CustomNumber 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
}

25
ik3cloud/receivable.go Normal file
View File

@@ -0,0 +1,25 @@
package ik3cloud
import (
"context"
"git.kumo.work/shama/service/client"
)
type receivable struct {
}
type ArgsReceivableSave struct {
ReceivableId int64 // 应收单id
Number string // 编码
CustomNumber string // 客户编码
}
// Save @TITLE 保存应收
func (r *receivable) Save(ctx context.Context, args ArgsReceivableSave) (entity Entity, err error) {
xClient, err := client.GetClient(r)
if err != nil {
return
}
err = xClient.Call(ctx, "Save", args, &entity)
return
}