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

feat(erp): 添加会计模块中的运费和佣金字段

Browse Source 
- 在 ReplyAccountingInfo 结构体中添加 DomesticShippingCost、ForeignShippingCost 和 ForeignCommission 字段
- 在 AccountingEdit 结构体中添加 DomesticShippingCost、ForeignShippingCost 和 ForeignCommission 字段
- 更新结构体字段对齐格式以提高代码可读性
This commit is contained in:
守护自己的云
2026-07-24 17:07:04 +08:00
parent 248ad5fc22
commit 0e95e178b4
1 changed files with 39 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
erp/accounting.go
View File

@@ -118,31 +118,34 @@ func (a *accounting) Gen(ctx context.Context, args ArgsAccountingGen) (err error
} }
type ReplyAccountingInfo struct { type ReplyAccountingInfo struct {
Id int64 `json:"id"` Id int64 `json:"id"`
CustomId int64 `json:"customId"` CustomId int64 `json:"customId"`
CustomShortName string `json:"customShortName"` CustomShortName string `json:"customShortName"`
CustomName string `json:"customName"` CustomName string `json:"customName"`
ShipmentId int64 `json:"shipmentId"` ShipmentId int64 `json:"shipmentId"`
InvoiceDate *time.Time `json:"invoiceDate"` InvoiceDate *time.Time `json:"invoiceDate"`
InvoiceDateEnd *time.Time `json:"invoiceDateEnd"` InvoiceDateEnd *time.Time `json:"invoiceDateEnd"`
InvoiceSerial string `json:"invoiceSerial"` InvoiceSerial string `json:"invoiceSerial"`
AccountingSerial string `json:"accountingSerial"` AccountingSerial string `json:"accountingSerial"`
Currency string `json:"currency"` Currency string `json:"currency"`
CurrencyName string `json:"currencyName"` CurrencyName string `json:"currencyName"`
CurrencySymbol string `json:"currencySymbol"` CurrencySymbol string `json:"currencySymbol"`
CurrencyRate decimal.Decimal `json:"currencyRate"` CurrencyRate decimal.Decimal `json:"currencyRate"`
Remark string `json:"remark"` Remark string `json:"remark"`
WorkflowId int64 `json:"workflowId"` DomesticShippingCost decimal.Decimal `json:"domesticShippingCost"`
WorkflowStatus int64 `json:"workflowStatus"` ForeignShippingCost decimal.Decimal `json:"foreignShippingCost"`
WorkflowReason string `json:"workflowReason"` ForeignCommission decimal.Decimal `json:"foreignCommission"`
BanFlag int64 `json:"banFlag"` WorkflowId int64 `json:"workflowId"`
CreatedStaffId int64 `json:"createdStaffId"` WorkflowStatus int64 `json:"workflowStatus"`
CreatedAt *time.Time `json:"createdAt"` WorkflowReason string `json:"workflowReason"`
TotalBoxCount int64 `json:"totalBoxCount"` BanFlag int64 `json:"banFlag"`
TotalAmount decimal.Decimal `json:"totalAmount"` CreatedStaffId int64 `json:"createdStaffId"`
TotalVolume decimal.Decimal `json:"totalVolume"` CreatedAt *time.Time `json:"createdAt"`
TotalGrossWeight decimal.Decimal `json:"totalGrossWeight"` TotalBoxCount int64 `json:"totalBoxCount"`
TotalNetWeight decimal.Decimal `json:"totalNetWeight"` TotalAmount decimal.Decimal `json:"totalAmount"`
TotalVolume decimal.Decimal `json:"totalVolume"`
TotalGrossWeight decimal.Decimal `json:"totalGrossWeight"`
TotalNetWeight decimal.Decimal `json:"totalNetWeight"`
} }
// Info @TITLE 详情 // Info @TITLE 详情
@@ -161,14 +164,17 @@ type ArgsAccountingEdit struct {
} }
type AccountingEdit struct { type AccountingEdit struct {
InvoiceDate *time.Time // 发票日期 InvoiceDate *time.Time // 发票日期
InvoiceDateEnd *time.Time // 开票期限 InvoiceDateEnd *time.Time // 开票期限
AccountingSerial string // 做账合同号 AccountingSerial string // 做账合同号
Remark string // 备注 Remark string // 备注
Currency string // 币种 Currency string // 币种
CurrencyName string // 币种名称 CurrencyName string // 币种名称
CurrencySymbol string // 币种符号 CurrencySymbol string // 币种符号
CurrencyRate decimal.Decimal // 币种汇率 CurrencyRate decimal.Decimal // 币种汇率
DomesticShippingCost decimal.Decimal // 国内运费
ForeignShippingCost decimal.Decimal // 国外运费
ForeignCommission decimal.Decimal // 国外佣金
} }
// Edit @TITLE 编辑 // Edit @TITLE 编辑