From c1e19a6a2560ed4a0fa1b18d421c5f7586db314a Mon Sep 17 00:00:00 2001 From: kanade Date: Mon, 12 May 2025 14:31:48 +0800 Subject: [PATCH] =?UTF-8?q?feat(product):=20=E6=B7=BB=E5=8A=A0=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E5=8C=85=E8=A3=85=E9=87=8D=E9=87=8F=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 product、sale 和 shipment 模块中添加包装重量字段 - 用于记录和显示产品包装的重量信息 --- erp/product.go | 2 ++ erp/sale/product.go | 3 +++ erp/shipment/saleProduct.go | 2 ++ 3 files changed, 7 insertions(+) diff --git a/erp/product.go b/erp/product.go index cd24fbc..fa739ed 100644 --- a/erp/product.go +++ b/erp/product.go @@ -98,6 +98,7 @@ type ProductAdd struct { PackageDescription string // 包装中文描述 PackageEngDescription string // 包装英文描述 PackageInfoFile bean2.FileData // 包装描述文件 + PackageWeight decimal.Decimal // 包装重量 Packages []ProductPackage // 包装 Customs ProductCustoms // 海关 Quotes []product2.ArgsQuoteAdd // 工厂报价 @@ -178,6 +179,7 @@ type ReplyProductInfo struct { PackageDescription string `json:"packageDescription"` PackageEngDescription string `json:"packageEngDescription"` PackageInfoFile bean2.FileData `json:"packageInfoFile"` + PackageWeight decimal.Decimal `json:"packageWeight"` CreatedStaffId int64 `json:"createdStaffId"` DepartmentId int64 `json:"departmentId"` CreatedAt *time.Time `json:"createdAt"` diff --git a/erp/sale/product.go b/erp/sale/product.go index 3a2cff7..ec8effd 100644 --- a/erp/sale/product.go +++ b/erp/sale/product.go @@ -169,6 +169,7 @@ type ProductAdd struct { PackageDescription string // 包装中文描述 PackageEngDescription string // 包装英文描述 PackageInfoFile bean2.FileData // 包装描述文件 + PackageWeight decimal.Decimal // 包装重量 Sort int64 // 排序 SaleCount int64 // 销售数量/合同数量 Packages []ProductPackage // 包装 @@ -265,6 +266,7 @@ type ReplyProductInfo struct { PackageDescription string `json:"packageDescription"` PackageEngDescription string `json:"packageEngDescription"` PackageInfoFile bean2.FileData `json:"packageInfoFile"` + PackageWeight decimal.Decimal `json:"packageWeight"` PurchaseCount int64 `json:"purchaseCount"` PurchasedCount int64 `json:"purchasedCount"` ShipmentCount int64 `json:"shipmentCount"` @@ -354,6 +356,7 @@ type ProductEdit struct { PackageDescription string // 包装中文描述 PackageEngDescription string // 包装英文描述 PackageInfoFile bean2.FileData // 包装描述文件 + PackageWeight decimal.Decimal // 包装重量 Packages []ProductPackage // 包装 Customs ProductCustoms // 海关 Quote ProductQuote // 工厂报价 diff --git a/erp/shipment/saleProduct.go b/erp/shipment/saleProduct.go index 5b0d43c..371d1fc 100644 --- a/erp/shipment/saleProduct.go +++ b/erp/shipment/saleProduct.go @@ -23,6 +23,7 @@ type SaleProductItem struct { CustomSerial string `json:"customSerial"` PackageDescription string `json:"packageDescription"` PackageEngDescription string `json:"packageEngDescription"` + PackageWeight decimal.Decimal `json:"packageWeight"` EngName string `json:"engName"` Name string `json:"name"` CustomsName string `json:"customsName"` @@ -178,6 +179,7 @@ type SaleProductEdit struct { CustomSerial string // 客户货号 PackageDescription string // 包装 PackageEngDescription string // 包装英文描述 + PackageWeight decimal.Decimal // 包装重量 Name string // 中文品名 EngName string // 英文品名 CustomsSerial string // 海关编码