feat(erp): 添加运费和佣金字段支持

- 在 shipment 模块中新增国内运费、海外运费和海外佣金字段
- 在 receipt 模块中添加银行账户字段
- 更新 receivable 模块中的应收款项信息结构体
- 扩展 shipment 相关的数据传输对象和修改逻辑
- 为所有相关模块添加新的财务计算字段
- 重构数据结构以支持更详细的成本跟踪功能

erp/receipt.go

@@ -45,6 +45,7 @@ type ReceiptItem struct {
 	CurrencyName       string          `json:"currencyName"`
 	CurrencySymbol     string          `json:"currencySymbol"`
 	CurrencyRate       decimal.Decimal `json:"currencyRate"`
+	BankAccount        string          `json:"bankAccount"`
 	BankName           string          `json:"bankName"`
 	EntryAmount        decimal.Decimal `json:"entryAmount"`
 	ReceivableFxAmount decimal.Decimal `json:"receivableFxAmount"`
@@ -79,6 +80,7 @@ type ReceiptAdd struct {
 	CurrencySymbol  string          // 币种符号
 	CurrencyRate    decimal.Decimal // 币种汇率
 	PayCustomId     int64           // 付款客户id
+	BankAccount     string          // 结汇银行账号
 	BankName        string          // 结汇银行
 	EntryAmount     decimal.Decimal // 外币入账金额
 	ForeignFee      decimal.Decimal // 国外扣费
@@ -108,6 +110,7 @@ type ReplyReceiptInfo struct {
 	CustomName         string          `json:"customName"`
 	PayCustomId        int64           `json:"payCustomId"`
 	PayCustomName      string          `json:"payCustomName"`
+	BankAccount        string          `json:"bankAccount"`
 	BankName           string          `json:"bankName"`
 	EntryAmount        decimal.Decimal `json:"entryAmount"`
 	ForeignFee         decimal.Decimal `json:"foreignFee"`

erp/receivable.go

@@ -69,6 +69,9 @@ type ReplyReceivableInfo struct {
 	CurrencyName         string                  `json:"currencyName"`
 	CurrencyRate         decimal.Decimal         `json:"currencyRate"`
 	CurrencySymbol       string                  `json:"currencySymbol"`
+	DomesticShippingCost decimal.Decimal         `json:"domesticShippingCost"`
+	ForeignShippingCost  decimal.Decimal         `json:"foreignShippingCost"`
+	ForeignCommission    decimal.Decimal         `json:"foreignCommission"`
 	CreatedStaffID       int64                   `json:"createdStaffID"`
 	Ik3cloudStatus       int64                   `json:"ik3CloudStatus"`
 	Ik3cloudErrMsg       string                  `json:"ik3CloudErrMsg"`

erp/shipment.go

@@ -131,6 +131,9 @@ type ShipmentAdd struct {
 	MarkText                     string           // 唛头文字
 	MarkImg                      string           // 唛头图片
 	SaleIds                      []int64          // 销售合同
+	DomesticShippingCost         decimal.Decimal  // 国内运费
+	ForeignShippingCost          decimal.Decimal  // 国外运费
+	ForeignCommission            decimal.Decimal  // 国外佣金
 }
 
 // Add @TITLE 添加
@@ -214,6 +217,9 @@ type ArgsShipmentData struct {
 	MarkText                     string          // 唛头文字
 	MarkImg                      string          // 唛头图片
 	VouchingClerkId              int64           // 单证id
+	DomesticShippingCost         decimal.Decimal // 国内运费
+	ForeignShippingCost          decimal.Decimal // 国外运费
+	ForeignCommission            decimal.Decimal // 国外佣金
 }
 
 // Edit @TITLE 编辑

erp/shipment/bean.go

@@ -68,6 +68,9 @@ type ReplyShipmentInfo 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"`

erp/shipment/modify.go

@@ -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 编辑

ik3cloud/receipt.go

@@ -31,6 +31,7 @@ type ReceiptCost struct {
 	DepartmentNumber string          // 部门编号
 	Amount           decimal.Decimal // 金额
 	Remarks          string          // 备注
+	BankAccount      string          // 银行账户
 }
 
 // Save @TITLE 保存收款单