From 0e95e178b4ae99bc506ed2856c9b2ab9d0497493 Mon Sep 17 00:00:00 2001 From: kanade Date: Fri, 24 Jul 2026 17:07:04 +0800 Subject: [PATCH] =?UTF-8?q?feat(erp):=20=E6=B7=BB=E5=8A=A0=E4=BC=9A?= =?UTF-8?q?=E8=AE=A1=E6=A8=A1=E5=9D=97=E4=B8=AD=E7=9A=84=E8=BF=90=E8=B4=B9?= =?UTF-8?q?=E5=92=8C=E4=BD=A3=E9=87=91=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 ReplyAccountingInfo 结构体中添加 DomesticShippingCost、ForeignShippingCost 和 ForeignCommission 字段 - 在 AccountingEdit 结构体中添加 DomesticShippingCost、ForeignShippingCost 和 ForeignCommission 字段 - 更新结构体字段对齐格式以提高代码可读性 --- erp/accounting.go | 72 +++++++++++++++++++++++++---------------------- 1 file changed, 39 insertions(+), 33 deletions(-) diff --git a/erp/accounting.go b/erp/accounting.go index 0985dd9..58bbb3f 100644 --- a/erp/accounting.go +++ b/erp/accounting.go @@ -118,31 +118,34 @@ func (a *accounting) Gen(ctx context.Context, args ArgsAccountingGen) (err error } type ReplyAccountingInfo struct { - Id int64 `json:"id"` - CustomId int64 `json:"customId"` - CustomShortName string `json:"customShortName"` - CustomName string `json:"customName"` - ShipmentId int64 `json:"shipmentId"` - InvoiceDate *time.Time `json:"invoiceDate"` - InvoiceDateEnd *time.Time `json:"invoiceDateEnd"` - InvoiceSerial string `json:"invoiceSerial"` - AccountingSerial string `json:"accountingSerial"` - Currency string `json:"currency"` - CurrencyName string `json:"currencyName"` - CurrencySymbol string `json:"currencySymbol"` - CurrencyRate decimal.Decimal `json:"currencyRate"` - Remark string `json:"remark"` - WorkflowId int64 `json:"workflowId"` - WorkflowStatus int64 `json:"workflowStatus"` - WorkflowReason string `json:"workflowReason"` - BanFlag int64 `json:"banFlag"` - CreatedStaffId int64 `json:"createdStaffId"` - CreatedAt *time.Time `json:"createdAt"` - TotalBoxCount int64 `json:"totalBoxCount"` - TotalAmount decimal.Decimal `json:"totalAmount"` - TotalVolume decimal.Decimal `json:"totalVolume"` - TotalGrossWeight decimal.Decimal `json:"totalGrossWeight"` - TotalNetWeight decimal.Decimal `json:"totalNetWeight"` + Id int64 `json:"id"` + CustomId int64 `json:"customId"` + CustomShortName string `json:"customShortName"` + CustomName string `json:"customName"` + ShipmentId int64 `json:"shipmentId"` + InvoiceDate *time.Time `json:"invoiceDate"` + InvoiceDateEnd *time.Time `json:"invoiceDateEnd"` + InvoiceSerial string `json:"invoiceSerial"` + AccountingSerial string `json:"accountingSerial"` + Currency string `json:"currency"` + CurrencyName string `json:"currencyName"` + CurrencySymbol string `json:"currencySymbol"` + CurrencyRate decimal.Decimal `json:"currencyRate"` + Remark string `json:"remark"` + DomesticShippingCost decimal.Decimal `json:"domesticShippingCost"` + ForeignShippingCost decimal.Decimal `json:"foreignShippingCost"` + ForeignCommission decimal.Decimal `json:"foreignCommission"` + WorkflowId int64 `json:"workflowId"` + WorkflowStatus int64 `json:"workflowStatus"` + WorkflowReason string `json:"workflowReason"` + BanFlag int64 `json:"banFlag"` + CreatedStaffId int64 `json:"createdStaffId"` + CreatedAt *time.Time `json:"createdAt"` + TotalBoxCount int64 `json:"totalBoxCount"` + TotalAmount decimal.Decimal `json:"totalAmount"` + TotalVolume decimal.Decimal `json:"totalVolume"` + TotalGrossWeight decimal.Decimal `json:"totalGrossWeight"` + TotalNetWeight decimal.Decimal `json:"totalNetWeight"` } // Info @TITLE 详情 @@ -161,14 +164,17 @@ type ArgsAccountingEdit struct { } type AccountingEdit struct { - InvoiceDate *time.Time // 发票日期 - InvoiceDateEnd *time.Time // 开票期限 - AccountingSerial string // 做账合同号 - Remark string // 备注 - Currency string // 币种 - CurrencyName string // 币种名称 - CurrencySymbol string // 币种符号 - CurrencyRate decimal.Decimal // 币种汇率 + InvoiceDate *time.Time // 发票日期 + InvoiceDateEnd *time.Time // 开票期限 + AccountingSerial string // 做账合同号 + Remark string // 备注 + Currency string // 币种 + CurrencyName string // 币种名称 + CurrencySymbol string // 币种符号 + CurrencyRate decimal.Decimal // 币种汇率 + DomesticShippingCost decimal.Decimal // 国内运费 + ForeignShippingCost decimal.Decimal // 国外运费 + ForeignCommission decimal.Decimal // 国外佣金 } // Edit @TITLE 编辑