feat(erp): 新增多模块驳回功能及搜索筛选字段

- 新增做账合同一键驳回方法(accounting.Reject)
- 新增报销单驳回方法(expense.Reject)
- 新增付款申请单驳回方法(request.Reject)
- 出运发票搜索新增创建人精确筛选字段(CreatedStaffId)
- 产品搜索新增工厂名称筛选字段(FactoryName)
- 应收款搜索新增收汇客户名称筛选字段(RecCustomName)
This commit is contained in:
2026-11-03 14:44:06 +08:00
parent b84ba26d9d
commit 5555a14c3c
6 changed files with 52 additions and 0 deletions

View File

@@ -252,3 +252,20 @@ func (a *accounting) CancelAudit(ctx context.Context, accountingId int64) (err e
err = xClient.Call(ctx, "CancelAudit", accountingId, &reply) err = xClient.Call(ctx, "CancelAudit", accountingId, &reply)
return return
} }
type ArgsAccountingReject struct {
StaffId int64 // 操作人
AccountingId int64 // 做账合同id
Reason string // 驳回原因
}
// Reject @TITLE 一键驳回
func (a *accounting) Reject(ctx context.Context, args ArgsAccountingReject) (err error) {
xClient, err := client.GetClient(a)
if err != nil {
return
}
reply := 0
err = xClient.Call(ctx, "Reject", args, &reply)
return
}

View File

@@ -247,3 +247,19 @@ func (r *expense) Cancel(ctx context.Context, expenseId int64) (err error) {
reply := 0 reply := 0
return xClient.Call(ctx, "Cancel", expenseId, &reply) return xClient.Call(ctx, "Cancel", expenseId, &reply)
} }
type ArgsExpenseReject struct {
StaffId int64 // 员工id
ExpenseId int64 // 报销单id
Reason string // 驳回原因
}
// Reject @TITLE 驳回(审核通过且打款状态为待提交时可驳回)
func (r *expense) Reject(ctx context.Context, args ArgsExpenseReject) (err error) {
xClient, err := client.GetClient(r)
if err != nil {
return
}
reply := 0
return xClient.Call(ctx, "Reject", args, &reply)
}

View File

@@ -32,6 +32,7 @@ type ProductSearch struct {
CreatedAtStart *time.Time // 录入开始时间 CreatedAtStart *time.Time // 录入开始时间
CreatedAtEnd *time.Time // 录入结束时间 CreatedAtEnd *time.Time // 录入结束时间
ParentIds []int64 // 上级id ParentIds []int64 // 上级id
FactoryName string // 工厂名称
} }
type ProductItem struct { type ProductItem struct {

View File

@@ -20,6 +20,7 @@ type ReceivableSearch struct {
ReceivableSerial string // 收款单据号 ReceivableSerial string // 收款单据号
CustomId int64 // 客户id CustomId int64 // 客户id
CustomName string // 客户名称 CustomName string // 客户名称
RecCustomName string // 收汇客户名称
InvoiceSerial string // 出运发票号 InvoiceSerial string // 出运发票号
InvoiceSerialEq string // 出运发票号 InvoiceSerialEq string // 出运发票号
CreatedAtStart *time.Time // 创建开始时间 CreatedAtStart *time.Time // 创建开始时间

View File

@@ -276,3 +276,19 @@ func (r *request) Cancel(ctx context.Context, requestId int64) (err error) {
reply := 0 reply := 0
return xClient.Call(ctx, "Cancel", requestId, &reply) return xClient.Call(ctx, "Cancel", requestId, &reply)
} }
type ArgsRequestReject struct {
StaffId int64 // 员工id
RequestId int64 // 付款申请单id
Reason string // 驳回原因
}
// Reject @TITLE 驳回(审核通过且打款状态为待提交时可驳回)
func (r *request) Reject(ctx context.Context, args ArgsRequestReject) (err error) {
xClient, err := client.GetClient(r)
if err != nil {
return
}
reply := 0
return xClient.Call(ctx, "Reject", args, &reply)
}

View File

@@ -19,6 +19,7 @@ type ArgsMixedList struct {
} }
type MixedSearch struct { type MixedSearch struct {
InvoiceSerial string // 出运发票号 InvoiceSerial string // 出运发票号
CreatedStaffId int64 // 创建人(精确筛选)
CreatedStaffIds []int64 // 业务员筛选 CreatedStaffIds []int64 // 业务员筛选
} }
type ReplyMixedList struct { type ReplyMixedList struct {