From 81f9d4d416efd6383fb06161cb930e3bbd37129d Mon Sep 17 00:00:00 2001 From: kanade Date: Tue, 13 May 2025 11:25:13 +0800 Subject: [PATCH] =?UTF-8?q?feat(shipment):=20=E6=B7=BB=E5=8A=A0=E6=8A=A5?= =?UTF-8?q?=E5=85=B3=E4=BB=B7=E6=A0=BC=E5=92=8C=E6=80=BB=E4=BB=B7=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 saleProduct 结构中添加 CustomsPrice 和 CustomsAmount 字段 - 在 modify 和 shipment 文件中都进行了相应的更新- 新增字段用于记录报关单价和报关总价信息 --- erp/shipment/modify/saleProduct.go | 4 ++++ erp/shipment/saleProduct.go | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/erp/shipment/modify/saleProduct.go b/erp/shipment/modify/saleProduct.go index e7698c6..c3abb2b 100644 --- a/erp/shipment/modify/saleProduct.go +++ b/erp/shipment/modify/saleProduct.go @@ -56,6 +56,8 @@ type SaleProductItem struct { TotalCustomsGrossWeight decimal.Decimal `json:"totalCustomsGrossWeight"` SalePrice decimal.Decimal `json:"salePrice"` SaleAmount decimal.Decimal `json:"saleAmount"` + CustomsPrice decimal.Decimal `json:"customsPrice"` + CustomsAmount decimal.Decimal `json:"customsAmount"` FactoryName string `json:"factoryName"` CurrencyRate decimal.Decimal `json:"currencyRate"` Brand string `json:"brand"` @@ -202,6 +204,8 @@ type SaleProductEdit struct { CustomsGrossWeight decimal.Decimal // 报关毛重 TotalCustomsGrossWeight decimal.Decimal // 报关总毛重 SalePrice decimal.Decimal // 销售单价 + CustomsPrice decimal.Decimal // 报关单价 + CustomsAmount decimal.Decimal // 报关总价 CustomsBrand string // 品牌 DomesticSupply string // 货源地 FactoryName string // 工厂名称 diff --git a/erp/shipment/saleProduct.go b/erp/shipment/saleProduct.go index 371d1fc..cad90e3 100644 --- a/erp/shipment/saleProduct.go +++ b/erp/shipment/saleProduct.go @@ -57,6 +57,8 @@ type SaleProductItem struct { TotalCustomsGrossWeight decimal.Decimal `json:"totalCustomsGrossWeight"` SalePrice decimal.Decimal `json:"salePrice"` SaleAmount decimal.Decimal `json:"saleAmount"` + CustomsPrice decimal.Decimal `json:"customsPrice"` + CustomsAmount decimal.Decimal `json:"customsAmount"` FactoryName string `json:"factoryName"` CurrencyRate decimal.Decimal `json:"currencyRate"` Brand string `json:"brand"` @@ -207,6 +209,8 @@ type SaleProductEdit struct { TotalCustomsGrossWeight decimal.Decimal // 报关总毛重 SalePrice decimal.Decimal // 销售单价 CustomsBrand string // 品牌 + CustomsPrice decimal.Decimal // 报关价格 + CustomsAmount decimal.Decimal // 报关总价 DomesticSupply string // 货源地 FactoryName string // 工厂名称 HsSerial int64 // 是否商检 1=商检 2=未商检