feat(erp): 更新报销单据结构并移除工作流字段
- 在 payable.go 中添加 CostAmount 字段用于加减费用金额 - 移除 request.go 中 RequestIds 字段 - 移除 RequestItem 和 ReplyRequestList 结构中的 WorkflowId、WorkflowStatus 和 WorkflowReason 字段
This commit is contained in:
@@ -120,3 +120,13 @@ func (r *expense) Edit(ctx context.Context, args ArgsExpenseEdit) (err error) {
|
||||
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)
|
||||
}
|
||||
|
||||
@@ -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,29 +53,27 @@ func (p *payable) List(ctx context.Context, args ArgsPayableList) (reply ReplyPa
|
||||
}
|
||||
|
||||
type ReplyPayableInfo struct {
|
||||
Id int64 `json:"id"`
|
||||
PayableSerial string `json:"payableSerial"`
|
||||
AccountingSerial string `json:"accountingSerial"`
|
||||
InvoiceSerial string `json:"invoiceSerial"`
|
||||
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"`
|
||||
Id int64 `json:"id"`
|
||||
PayableSerial string `json:"payableSerial"`
|
||||
AccountingSerial string `json:"accountingSerial"`
|
||||
InvoiceSerial string `json:"invoiceSerial"`
|
||||
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"`
|
||||
FactoryName string `json:"factoryName"`
|
||||
Name string `json:"name"`
|
||||
Serial string `json:"serial"`
|
||||
PayableCount int64 `json:"payableCount"`
|
||||
@@ -89,10 +86,11 @@ type PayableProductItem struct {
|
||||
}
|
||||
|
||||
type PayableCostItem struct {
|
||||
Id int64 `json:"id"`
|
||||
Name string `json:"name"`
|
||||
Amount decimal.Decimal `json:"amount"`
|
||||
Remarks string `json:"remarks"`
|
||||
Id int64 `json:"id"`
|
||||
FactoryName string `json:"factoryName"`
|
||||
Name string `json:"name"`
|
||||
Amount decimal.Decimal `json:"amount"`
|
||||
Remarks string `json:"remarks"`
|
||||
}
|
||||
|
||||
// Info @TITLE 详情
|
||||
@@ -114,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)
|
||||
}
|
||||
|
||||
@@ -130,3 +130,13 @@ func (r *request) Edit(ctx context.Context, args ArgsRequestEdit) (err error) {
|
||||
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)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user