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

feat(erp): 添加单箱金额字段并移除清关总价字段

Browse Source 
- 在销售产品、出货产品等多个结构体中添加 BoxAmount（单箱金额）字段
- 移除出货产品结构体中的 ClearanceAmount（清关总价）字段
- 涉及 sale/product、shipment/saleProduct、shipment/modify/saleProduct、shipment/mixed/product 等模块
This commit is contained in:
守护自己的云
2026-10-28 09:28:37 +08:00
parent 08f987b527
commit c66dd7f963
4 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erp/sale/product.go
View File

@@ -54,6 +54,7 @@ type ProductListItem struct {
SaleCount int64 `json:"saleCount"`
SaleAmount decimal.Decimal `json:"saleAmount"`
BoxCount int64 `json:"boxCount"`
BoxAmount decimal.Decimal `json:"boxAmount"`
QuotePrice decimal.Decimal `json:"quotePrice"`
QuoteFactorySerial string `json:"quoteFactorySerial"`
QuoteFactoryId int64 `json:"quoteFactoryId"`
@@ -113,6 +114,7 @@ type ProductItem struct {
SaleCount int64 `json:"saleCount"`
SaleAmount decimal.Decimal `json:"saleAmount"`
BoxCount int64 `json:"boxCount"`
BoxAmount decimal.Decimal `json:"boxAmount"`
QuotePrice decimal.Decimal `json:"quotePrice"`
QuoteFactorySerial string `json:"quoteFactorySerial"`
QuoteFactoryId int64 `json:"quoteFactoryId"`
@@ -177,6 +179,7 @@ type ProductAdd struct {
PackageWeight decimal.Decimal // 包装重量
Sort int64 // 排序
SaleCount int64 // 销售数量/合同数量
BoxAmount decimal.Decimal // 单箱金额(手填)
Packages []ProductPackage // 包装
Customs ProductCustoms // 海关
Quote ProductQuote // 工厂报价
@@ -369,6 +372,7 @@ type ProductEdit struct {
Weight *decimal.Decimal // 重量
Texture string // 材质
SalePrice decimal.Decimal // 销售单价
BoxAmount decimal.Decimal // 单箱金额(手填)
BanFlag int64 // 禁用标记 1=禁用，2=可用
Mold int64 // 组成类型 1=单件 2=套件
MoldCount int64 // 子组件数量
@@ -405,6 +409,7 @@ type MultiData struct {
QuotePrice decimal.Decimal // 采购单价
SalePrice decimal.Decimal // 销售单价
SaleCount int64 // 销售数量
BoxAmount decimal.Decimal // 单箱金额(手填)
Info string // 备注
}

1
erp/shipment/mixed/product.go
View File

@@ -38,6 +38,7 @@ type ProductItem struct {
FactoryName string `json:"factoryName"`
SalePrice decimal.Decimal `json:"salePrice"`
SaleAmount decimal.Decimal `json:"saleAmount"`
BoxAmount decimal.Decimal `json:"boxAmount"`
CustomsPrice decimal.Decimal `json:"customsPrice"`
CustomsAmount decimal.Decimal `json:"customsAmount"`
OuterLength *decimal.Decimal `json:"outerLength"`

6
erp/shipment/modify/saleProduct.go
View File

@@ -37,6 +37,7 @@ type SaleProductItem struct {
CustomsDetail string `json:"customsDetail"`
BlEngName string `json:"blEngName"`
BoxCount int64 `json:"boxCount"`
BoxAmount decimal.Decimal `json:"boxAmount"`
InnerNum int64 `json:"innerNum"`
InnerBoxCount *int64 `json:"innerBoxCount"`
BoxNumUnit string `json:"boxNumUnit"`
@@ -63,7 +64,6 @@ type SaleProductItem struct {
SaleAmount decimal.Decimal `json:"saleAmount"`
CustomsPrice decimal.Decimal `json:"customsPrice"`
CustomsAmount decimal.Decimal `json:"customsAmount"`
ClearanceAmount decimal.Decimal `json:"clearanceAmount"`
FactoryName string `json:"factoryName"`
CurrencyRate decimal.Decimal `json:"currencyRate"`
Brand string `json:"brand"`
@@ -153,9 +153,9 @@ type SaleProductAdd struct {
CustomsGrossWeight decimal.Decimal // 报关毛重
TotalCustomsGrossWeight decimal.Decimal // 报关总毛重
SalePrice decimal.Decimal // 销售单价
BoxAmount decimal.Decimal // 单箱金额
CustomsPrice decimal.Decimal // 报关价格
CustomsAmount decimal.Decimal // 报关总价
ClearanceAmount decimal.Decimal // 清关总价
CustomsBrand string // 品牌
DomesticSupply string // 货源地
FactoryName string // 工厂名称
@@ -225,9 +225,9 @@ type SaleProductEdit struct {
CustomsGrossWeight decimal.Decimal // 报关毛重
TotalCustomsGrossWeight decimal.Decimal // 报关总毛重
SalePrice decimal.Decimal // 销售单价
BoxAmount decimal.Decimal // 单箱金额
CustomsPrice decimal.Decimal // 报关单价
CustomsAmount decimal.Decimal // 报关总价
ClearanceAmount decimal.Decimal // 清关总价
CustomsBrand string // 品牌
DomesticSupply string // 货源地
FactoryName string // 工厂名称

6
erp/shipment/saleProduct.go
View File

@@ -37,6 +37,7 @@ type SaleProductItem struct {
CustomsDetail string `json:"customsDetail"`
BlEngName string `json:"blEngName"`
BoxCount int64 `json:"boxCount"`
BoxAmount decimal.Decimal `json:"boxAmount"`
InnerNum int64 `json:"innerNum"`
InnerBoxCount *int64 `json:"innerBoxCount"`
BoxNumUnit string `json:"boxNumUnit"`
@@ -63,7 +64,6 @@ type SaleProductItem struct {
SaleAmount decimal.Decimal `json:"saleAmount"`
CustomsPrice decimal.Decimal `json:"customsPrice"`
CustomsAmount decimal.Decimal `json:"customsAmount"`
ClearanceAmount decimal.Decimal `json:"clearanceAmount"`
FactoryName string `json:"factoryName"`
CurrencyRate decimal.Decimal `json:"currencyRate"`
Brand string `json:"brand"`
@@ -154,9 +154,9 @@ type SaleProductAdd struct {
CustomsGrossWeight decimal.Decimal // 报关毛重
TotalCustomsGrossWeight decimal.Decimal // 报关总毛重
SalePrice decimal.Decimal // 销售单价
BoxAmount decimal.Decimal // 单箱金额
CustomsPrice decimal.Decimal // 报关价格
CustomsAmount decimal.Decimal // 报关总价
ClearanceAmount decimal.Decimal // 清关总价
CustomsBrand string // 品牌
DomesticSupply string // 货源地
FactoryName string // 工厂名称
@@ -226,10 +226,10 @@ type SaleProductEdit struct {
CustomsGrossWeight decimal.Decimal // 报关毛重
TotalCustomsGrossWeight decimal.Decimal // 报关总毛重
SalePrice decimal.Decimal // 销售单价
BoxAmount decimal.Decimal // 单箱金额
CustomsBrand string // 品牌
CustomsPrice decimal.Decimal // 报关价格
CustomsAmount decimal.Decimal // 报关总价
ClearanceAmount decimal.Decimal // 清关总价
DomesticSupply string // 货源地
FactoryName string // 工厂名称
HsSerial int64 // 是否商检 1=商检 2=未商检