From b8db251e56b6476f22a5531f12d9c81a308a3d3e Mon Sep 17 00:00:00 2001 From: kanade Date: Tue, 11 Aug 2026 14:14:02 +0800 Subject: [PATCH] =?UTF-8?q?feat(erp):=20=E6=B7=BB=E5=8A=A0=E6=A8=A1?= =?UTF-8?q?=E5=85=B7=E5=92=8C=E7=88=B6=E7=BA=A7=E8=A3=85=E8=BF=90=E9=94=80?= =?UTF-8?q?=E5=94=AE=E4=BA=A7=E5=93=81ID=E5=AD=97=E6=AE=B5=E5=88=B0?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E9=A1=B9=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 添加 Mold 字段用于标识模具信息 - 添加 ParentShipmentSaleProductID 字段用于关联父级装运销售产品 - 重新排列结构体字段顺序以保持一致性 - 维护所有现有字段的完整功能和数据映射关系 --- erp/shipment/mixed/product.go | 64 ++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/erp/shipment/mixed/product.go b/erp/shipment/mixed/product.go index 7b62080..9a03dc7 100644 --- a/erp/shipment/mixed/product.go +++ b/erp/shipment/mixed/product.go @@ -11,37 +11,39 @@ type product struct { } type ProductItem struct { - Id int64 `json:"id"` - MixedFlag int64 `json:"mixedFlag"` - Serial string `json:"serial"` - CustomSerial string `json:"customSerial"` - Po string `json:"po"` - Name string `json:"name"` - BlEngName string `json:"blEngName"` - ShipmentCount int64 `json:"shipmentCount"` - InnerNum *int64 `json:"innerNum"` - InnerBoxCount *int64 `json:"innerBoxCount"` - OuterNum *int64 `json:"outerNum"` - OuterBoxCount int64 `json:"outerBoxCount"` - CustomsSerial string `json:"customsSerial"` - CustomsName string `json:"customsName"` - CustomsDetail string `json:"customsDetail"` - CustomsMeasureUnit string `json:"customsMeasureUnit"` - ShipmentCountUnit string `json:"shipmentCountUnit"` - CustomsGrossWeight decimal.Decimal `json:"customsGrossWeight"` - TotalCustomsGrossWeight decimal.Decimal `json:"totalCustomsGrossWeight"` - CustomsNetWeight decimal.Decimal `json:"customsNetWeight"` - TotalCustomsNetWeight decimal.Decimal `json:"totalCustomsNetWeight"` - DomesticSupply string `json:"domesticSupply"` - FactoryName string `json:"factoryName"` - SalePrice decimal.Decimal `json:"salePrice"` - SaleAmount decimal.Decimal `json:"saleAmount"` - CustomsPrice decimal.Decimal `json:"customsPrice"` - CustomsAmount decimal.Decimal `json:"customsAmount"` - OuterLength *decimal.Decimal `json:"outerLength"` - OuterWidth *decimal.Decimal `json:"outerWidth"` - OuterHeight *decimal.Decimal `json:"outerHeight"` - OuterVolume *decimal.Decimal `json:"outerVolume"` + Id int64 `json:"id"` + MixedFlag int64 `json:"mixedFlag"` + Mold int64 `json:"mold"` + ParentShipmentSaleProductID int64 `json:"parentShipmentSaleProductID"` + Serial string `json:"serial"` + CustomSerial string `json:"customSerial"` + Po string `json:"po"` + Name string `json:"name"` + BlEngName string `json:"blEngName"` + ShipmentCount int64 `json:"shipmentCount"` + InnerNum *int64 `json:"innerNum"` + InnerBoxCount *int64 `json:"innerBoxCount"` + OuterNum *int64 `json:"outerNum"` + OuterBoxCount int64 `json:"outerBoxCount"` + CustomsSerial string `json:"customsSerial"` + CustomsName string `json:"customsName"` + CustomsDetail string `json:"customsDetail"` + CustomsMeasureUnit string `json:"customsMeasureUnit"` + ShipmentCountUnit string `json:"shipmentCountUnit"` + CustomsGrossWeight decimal.Decimal `json:"customsGrossWeight"` + TotalCustomsGrossWeight decimal.Decimal `json:"totalCustomsGrossWeight"` + CustomsNetWeight decimal.Decimal `json:"customsNetWeight"` + TotalCustomsNetWeight decimal.Decimal `json:"totalCustomsNetWeight"` + DomesticSupply string `json:"domesticSupply"` + FactoryName string `json:"factoryName"` + SalePrice decimal.Decimal `json:"salePrice"` + SaleAmount decimal.Decimal `json:"saleAmount"` + CustomsPrice decimal.Decimal `json:"customsPrice"` + CustomsAmount decimal.Decimal `json:"customsAmount"` + OuterLength *decimal.Decimal `json:"outerLength"` + OuterWidth *decimal.Decimal `json:"outerWidth"` + OuterHeight *decimal.Decimal `json:"outerHeight"` + OuterVolume *decimal.Decimal `json:"outerVolume"` } // All @TITLE 获取全部产品