feat(erp): 添加预估装船日期字段和复制功能
- 在RequestSearch结构体中添加EstSailingDateStart和EstSailingDateEnd字段用于日期范围搜索 - 在RequestItem和ReplyRequestDetail结构体中添加EstSailingDate字段用于显示预估装船日期 - 新增ArgsRequestClone结构体用于定义复制操作参数 - 实现Clone方法支持申请单复制功能 - 更新相关数据传输对象以包含预估装船日期信息
This commit is contained in:
@@ -27,6 +27,8 @@ type RequestSearch struct {
|
||||
PayAtEnd *time.Time // 付款结束时间
|
||||
AuditAtStart *time.Time // 审核开始时间
|
||||
AuditAtEnd *time.Time // 审核结束时间
|
||||
EstSailingDateStart *time.Time // 估船日期
|
||||
EstSailingDateEnd *time.Time // 估船日期
|
||||
RequestIds []int64 // 申请单id
|
||||
BanFlag int64 // 禁用标记 1=禁用 2=启用
|
||||
BankAccount string // 银行账号
|
||||
@@ -73,6 +75,7 @@ type RequestItem struct {
|
||||
BankName string `json:"bankName"`
|
||||
BankStaffId *int64 `json:"bankStaffId"`
|
||||
PayAt *time.Time `json:"payAt"`
|
||||
EstSailingDate *time.Time `json:"estSailingDate"`
|
||||
PrepaidAmount decimal.Decimal `json:"prepaidAmount"`
|
||||
Amount decimal.Decimal `json:"amount"`
|
||||
PaidAmount decimal.Decimal `json:"paidAmount"`
|
||||
@@ -134,6 +137,21 @@ func (r *request) Add(ctx context.Context, args ArgsRequestAdd) (requestId int64
|
||||
return
|
||||
}
|
||||
|
||||
type ArgsRequestClone struct {
|
||||
StaffId int64
|
||||
RequestId int64
|
||||
}
|
||||
|
||||
// Clone @TITLE 复制
|
||||
func (r *request) Clone(ctx context.Context, args ArgsRequestClone) (requestId int64, err error) {
|
||||
xClient, err := client.GetClient(r)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
err = xClient.Call(ctx, "Clone", args, &requestId)
|
||||
return
|
||||
}
|
||||
|
||||
// Gen @TITLE 生成付款单
|
||||
func (r *request) Gen(ctx context.Context, payableId int64) (err error) {
|
||||
xClient, err := client.GetClient(r)
|
||||
@@ -168,6 +186,7 @@ type ReplyRequestInfo struct {
|
||||
BankName string `json:"bankName"`
|
||||
BankStaffId *int64 `json:"bankStaffId"`
|
||||
PayAt *time.Time `json:"payAt"`
|
||||
EstSailingDate *time.Time `json:"estSailingDate"`
|
||||
WorkflowId int64 `json:"workflowId"`
|
||||
WorkflowStatus int64 `json:"workflowStatus"`
|
||||
WorkflowReason string `json:"workflowReason"`
|
||||
|
||||
Reference in New Issue
Block a user