diff --git a/erp/constant.go b/erp/constant.go index acac050..162318d 100644 --- a/erp/constant.go +++ b/erp/constant.go @@ -89,3 +89,11 @@ const ( DomesticFeeTypeForeign DomesticFeeType = 1 // 外币 DomesticFeeTypeRMB DomesticFeeType = 2 // 人民币 ) + +type Ik3cloudStatus = int64 // 金蝶推送状态 +const ( + Ik3cloudStatusNone Ik3cloudStatus = 1 // 未推送 + Ik3cloudStatusIng Ik3cloudStatus = 2 // 推送中 + Ik3cloudStatusSuccess Ik3cloudStatus = 3 // 推送成功 + Ik3cloudStatusFail Ik3cloudStatus = 4 // 推送失败 +) diff --git a/erp/expense.go b/erp/expense.go index 6c18e59..ac3fbee 100644 --- a/erp/expense.go +++ b/erp/expense.go @@ -29,21 +29,24 @@ type ReplyExpenseList struct { 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"` + 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"` + Ik3cloudStatus int64 `json:"ik3CloudStatus"` + Ik3cloudErrMsg string `json:"ik3CloudErrMsg"` + Ik3cloudUpdatedAt *time.Time `json:"ik3CloudUpdatedAt"` + CreatedAt *time.Time `json:"createdAt"` + UpdatedAt *time.Time `json:"updatedAt"` } // List @TITLE 列表 @@ -80,21 +83,24 @@ func (r *expense) Add(ctx context.Context, args ArgsExpenseAdd) (expenseId int64 } 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"` + 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"` + Ik3cloudStatus int64 `json:"ik3CloudStatus"` + Ik3cloudErrMsg string `json:"ik3CloudErrMsg"` + Ik3cloudUpdatedAt *time.Time `json:"ik3CloudUpdatedAt"` + CreatedAt *time.Time `json:"createdAt"` + UpdatedAt *time.Time `json:"updatedAt"` } // Info @TITLE 详情 diff --git a/erp/payable.go b/erp/payable.go index 12812a9..f86b3fa 100644 --- a/erp/payable.go +++ b/erp/payable.go @@ -28,19 +28,22 @@ type ReplyPayableList struct { Total int64 `json:"total"` } type PayableItem struct { - Id int64 `json:"id"` - PayableSerial string `json:"payableSerial"` - InvoiceSerial string `json:"invoiceSerial"` - 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"` + Id int64 `json:"id"` + PayableSerial string `json:"payableSerial"` + InvoiceSerial string `json:"invoiceSerial"` + 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"` + Ik3cloudStatus int64 `json:"ik3CloudStatus"` + Ik3cloudErrMsg string `json:"ik3CloudErrMsg"` + Ik3cloudUpdatedAt *time.Time `json:"ik3CloudUpdatedAt"` + CreatedAt *time.Time `json:"createdAt"` + UpdatedAt *time.Time `json:"updatedAt"` } // List @TITLE 列表 @@ -54,21 +57,24 @@ 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"` - 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"` + Ik3cloudStatus int64 `json:"ik3CloudStatus"` + Ik3cloudErrMsg string `json:"ik3CloudErrMsg"` + Ik3cloudUpdatedAt *time.Time `json:"ik3CloudUpdatedAt"` + CreatedAt *time.Time `json:"createdAt"` + UpdatedAt *time.Time `json:"updatedAt"` + Products []PayableProductItem `json:"products"` + Costs []PayableCostItem `json:"costs"` } type PayableProductItem struct { diff --git a/erp/receipt.go b/erp/receipt.go index 3507fe8..98b8d77 100644 --- a/erp/receipt.go +++ b/erp/receipt.go @@ -44,6 +44,9 @@ type ReceiptItem struct { EntryAmount decimal.Decimal `json:"entryAmount"` ReceivableFxAmount decimal.Decimal `json:"receivableFxAmount"` CreatedStaffId int64 `json:"createdStaffId"` + Ik3cloudStatus int64 `json:"ik3CloudStatus"` + Ik3cloudErrMsg string `json:"ik3CloudErrMsg"` + Ik3cloudUpdatedAt *time.Time `json:"ik3CloudUpdatedAt"` CreatedAt *time.Time `json:"createdAt"` UpdatedAt *time.Time `json:"updatedAt"` } @@ -103,6 +106,9 @@ type ReplyReceiptInfo struct { DomesticFeeType int64 `json:"domesticFeeType"` ReceivableFxAmount decimal.Decimal `json:"receivableFxAmount"` CreatedStaffId int64 `json:"createdStaffId"` + Ik3cloudStatus int64 `json:"ik3CloudStatus"` + Ik3cloudErrMsg string `json:"ik3CloudErrMsg"` + Ik3cloudUpdatedAt *time.Time `json:"ik3CloudUpdatedAt"` CreatedAt *time.Time `json:"createdAt"` UpdatedAt *time.Time `json:"updatedAt"` } diff --git a/erp/receivable.go b/erp/receivable.go index ba6a7f3..d271c44 100644 --- a/erp/receivable.go +++ b/erp/receivable.go @@ -40,7 +40,9 @@ type ReceivableItem struct { CurrencyRate decimal.Decimal `json:"currencyRate"` CurrencySymbol string `json:"currencySymbol"` CreatedStaffID int64 `json:"createdStaffID"` - Ik3cloudStatus Flag `json:"ik3CloudStatus"` + Ik3cloudStatus int64 `json:"ik3CloudStatus"` + Ik3cloudErrMsg string `json:"ik3CloudErrMsg"` + Ik3cloudUpdatedAt *time.Time `json:"ik3CloudUpdatedAt"` CreatedAt *time.Time `json:"createdAt"` UpdatedAt *time.Time `json:"updatedAt"` } @@ -68,7 +70,9 @@ type ReplyReceivableInfo struct { CurrencyRate decimal.Decimal `json:"currencyRate"` CurrencySymbol string `json:"currencySymbol"` CreatedStaffID int64 `json:"createdStaffID"` - Ik3cloudStatus Flag `json:"ik3CloudStatus"` + Ik3cloudStatus int64 `json:"ik3CloudStatus"` + Ik3cloudErrMsg string `json:"ik3CloudErrMsg"` + Ik3cloudUpdatedAt *time.Time `json:"ik3CloudUpdatedAt"` CreatedAt *time.Time `json:"createdAt"` UpdatedAt *time.Time `json:"updatedAt"` Products []ReceivableProductItem `json:"products"` diff --git a/erp/request.go b/erp/request.go index 499a90e..516e0b2 100644 --- a/erp/request.go +++ b/erp/request.go @@ -45,6 +45,9 @@ type RequestItem struct { WorkflowStatus int64 `json:"workflowStatus"` WorkflowReason string `json:"workflowReason"` CreatedStaffId int64 `json:"createdStaffId"` + Ik3cloudStatus int64 `json:"ik3CloudStatus"` + Ik3cloudErrMsg string `json:"ik3CloudErrMsg"` + Ik3cloudUpdatedAt *time.Time `json:"ik3CloudUpdatedAt"` CreatedAt *time.Time `json:"createdAt"` UpdatedAt *time.Time `json:"updatedAt"` } @@ -103,6 +106,9 @@ type ReplyRequestInfo struct { WorkflowStatus int64 `json:"workflowStatus"` WorkflowReason string `json:"workflowReason"` CreatedStaffId int64 `json:"createdStaffId"` + Ik3cloudStatus int64 `json:"ik3CloudStatus"` + Ik3cloudErrMsg string `json:"ik3CloudErrMsg"` + Ik3cloudUpdatedAt *time.Time `json:"ik3CloudUpdatedAt"` CreatedAt *time.Time `json:"createdAt"` UpdatedAt *time.Time `json:"updatedAt"` }