feat(erp): 添加运费和佣金字段支持
- 在 shipment 模块中新增国内运费、海外运费和海外佣金字段 - 在 receipt 模块中添加银行账户字段 - 更新 receivable 模块中的应收款项信息结构体 - 扩展 shipment 相关的数据传输对象和修改逻辑 - 为所有相关模块添加新的财务计算字段 - 重构数据结构以支持更详细的成本跟踪功能
This commit is contained in:
@@ -2,12 +2,13 @@ package shipment
|
||||
|
||||
import (
|
||||
"context"
|
||||
"time"
|
||||
|
||||
"git.kumo.work/shama/service/client"
|
||||
bean2 "git.kumo.work/shama/service/erp/bean"
|
||||
modify2 "git.kumo.work/shama/service/erp/shipment/modify"
|
||||
"git.kumo.work/shama/service/lib/bean"
|
||||
"github.com/shopspring/decimal"
|
||||
"time"
|
||||
)
|
||||
|
||||
type modify struct {
|
||||
@@ -144,6 +145,9 @@ type ReplyModifyInfo struct {
|
||||
TaxExemptionNature string `json:"taxExemptionNature"`
|
||||
MarkText string `json:"markText"`
|
||||
MarkImg string `json:"markImg"`
|
||||
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"`
|
||||
@@ -227,6 +231,9 @@ type ArgsShipmentData struct {
|
||||
MarkText string // 唛头文字
|
||||
MarkImg string // 唛头图片
|
||||
VouchingClerkId int64 // 单证id
|
||||
DomesticShippingCost decimal.Decimal // 国内运费
|
||||
ForeignShippingCost decimal.Decimal // 海外运费
|
||||
ForeignCommission decimal.Decimal // 海外佣金
|
||||
}
|
||||
|
||||
// Edit @TITLE 编辑
|
||||
|
||||
Reference in New Issue
Block a user