From dc9b6a4dad55dbe67dbb40aa72f36f16582a2f79 Mon Sep 17 00:00:00 2001 From: kanade Date: Tue, 20 Jan 2026 11:04:05 +0800 Subject: [PATCH] =?UTF-8?q?feat(erp):=20=E6=B7=BB=E5=8A=A0=E8=AE=A2?= =?UTF-8?q?=E8=88=B1=E4=BF=AE=E6=94=B9=E5=8D=95=E5=AF=BC=E5=87=BA=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=92=8C=E6=8F=90=E5=8D=95=E8=8B=B1=E6=96=87=E5=93=81?= =?UTF-8?q?=E5=90=8D=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增 ExportTypeShipmentModify 常量用于订舱修改单导出 - 在产品结构体中添加 BlEngName 字段用于存储提单英文品名 - 更新多个产品相关结构体以支持提单英文品名字段 - 调整 import 顺序将 time 包移到适当位置 --- erp/constant.go | 1 + erp/product.go | 6 +++++- erp/sale/product.go | 5 +++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/erp/constant.go b/erp/constant.go index f4cdb40..d1dd977 100644 --- a/erp/constant.go +++ b/erp/constant.go @@ -58,6 +58,7 @@ const ( ExportTypeSaleBenefit = "saleBenefit" // 效益测算导出 ExportTypePurchase = "purchase" // 采购导出 ExportTypeShipment = "shipment" // 订舱导出 + ExportTypeShipmentModify = "shipmentModify" // 订舱修改单导出 ExportTypeShipmentInfo = "shipmentInfo" // 出运明细导出 ExportTypeSerial = "serial" // 商检导出 ExportTypeCustoms = "customs" // 报关导出 diff --git a/erp/product.go b/erp/product.go index eee60dd..63b426e 100644 --- a/erp/product.go +++ b/erp/product.go @@ -2,12 +2,13 @@ package erp import ( "context" + "time" + "git.kumo.work/shama/service/client" bean2 "git.kumo.work/shama/service/erp/bean" product2 "git.kumo.work/shama/service/erp/product" "git.kumo.work/shama/service/lib/bean" "github.com/shopspring/decimal" - "time" ) type product struct { @@ -40,6 +41,7 @@ type ProductItem struct { CustomSerial string `json:"customSerial"` Name string `json:"name"` EngName string `json:"engName"` + BlEngName string `json:"blEngName"` ImgFilePaths []string `json:"imgFilePaths"` CategoryId *int64 `json:"categoryId"` CategoryName string `json:"categoryName"` @@ -81,6 +83,7 @@ type ProductAdd struct { CustomSerial string // 客户货号 Name string // 中文品名 EngName string // 英文品名 + BlEngName string // 提单英文品名 CategoryId *int64 // 类目ID Weight *decimal.Decimal // 重量 Texture string // 材质 @@ -163,6 +166,7 @@ type ReplyProductInfo struct { CustomSerial string `json:"customSerial"` Name string `json:"name"` EngName string `json:"engName"` + BlEngName string `json:"blEngName"` ImgFilePaths []string `json:"imgFilePaths"` CategoryId *int64 `json:"categoryId"` CategoryName string `json:"categoryName"` diff --git a/erp/sale/product.go b/erp/sale/product.go index e775db4..8bd311a 100644 --- a/erp/sale/product.go +++ b/erp/sale/product.go @@ -40,6 +40,7 @@ type ProductListItem struct { CustomSerial string `json:"customSerial"` Name string `json:"name"` EngName string `json:"engName"` + BlEngName string `json:"blEngName"` ImgFilePaths []string `json:"imgFilePaths"` Weight *decimal.Decimal `json:"weight"` Texture string `json:"texture"` @@ -98,6 +99,7 @@ type ProductItem struct { CustomSerial string `json:"customSerial"` Name string `json:"name"` EngName string `json:"engName"` + BlEngName string `json:"blEngName"` ImgFilePaths []string `json:"imgFilePaths"` Weight *decimal.Decimal `json:"weight"` Texture string `json:"texture"` @@ -156,6 +158,7 @@ type ProductAdd struct { CustomSerial string // 客户货号 Name string // 中文品名 EngName string // 英文品名 + BlEngName string // 提单英文品名 Weight *decimal.Decimal // 重量 Texture string // 材质 SalePrice decimal.Decimal // 销售单价 @@ -254,6 +257,7 @@ type ReplyProductInfo struct { CustomSerial string `json:"customSerial"` Name string `json:"name"` EngName string `json:"engName"` + BlEngName string `json:"blEngName"` ImgFilePaths []string `json:"imgFilePaths"` Weight *decimal.Decimal `json:"weight"` Texture string `json:"texture"` @@ -361,6 +365,7 @@ type ProductEdit struct { CustomSerial string // 客户货号 Name string // 中文品名 EngName string // 英文品名 + BlEngName string // 提单英文品名 Weight *decimal.Decimal // 重量 Texture string // 材质 SalePrice decimal.Decimal // 销售单价