diff --git a/erp/shipment/gift.go b/erp/shipment/gift.go index cdc31f2..77ed943 100644 --- a/erp/shipment/gift.go +++ b/erp/shipment/gift.go @@ -16,31 +16,32 @@ type ArgsGiftSearch struct { } type GiftItem struct { - Id int64 `json:"id"` - Name string `json:"name"` - EngName string `json:"engName"` - CustomsName string `json:"customsName"` - CustomsSerial string `json:"customsSerial"` - CustomsMeasureUnit string `json:"customsMeasureUnit"` - CustomsInvoiceUnit string `json:"customsInvoiceUnit"` - CustomsDetail string `json:"customsDetail"` - ShipmentCount int64 `json:"shipmentCount"` - ShipmentCountUnit string `json:"shipmentCountUnit"` - OuterBoxCount int64 `json:"outerBoxCount"` - TotalVolume decimal.Decimal `json:"totalVolume"` - TotalGrossWeight decimal.Decimal `json:"totalGrossWeight"` - TotalNetWeight decimal.Decimal `json:"totalNetWeight"` - CustomsPrice decimal.Decimal `json:"customsPrice"` - CustomsAmount decimal.Decimal `json:"customsAmount"` - DomesticSupply string `json:"domesticSupply"` - TaxExemption string `json:"taxExemption"` - ContainerNumber string `json:"containerNumber"` - SealNumber string `json:"sealNumber"` - Remark string `json:"remark"` - Sort int64 `json:"sort"` - IsSerial int64 `json:"isSerial"` - IsCustoms int64 `json:"isCustoms"` - CreatedAt *time.Time `json:"createdAt"` + Id int64 `json:"id"` + Name string `json:"name"` + EngName string `json:"engName"` + CustomsName string `json:"customsName"` + CustomsSerial string `json:"customsSerial"` + CustomsMeasureUnit string `json:"customsMeasureUnit"` + CustomsInvoiceUnit string `json:"customsInvoiceUnit"` + CustomsDetail string `json:"customsDetail"` + ShipmentCount int64 `json:"shipmentCount"` + ShipmentCountUnit string `json:"shipmentCountUnit"` + OuterBoxCount int64 `json:"outerBoxCount"` + TotalVolume decimal.Decimal `json:"totalVolume"` + TotalGrossWeight decimal.Decimal `json:"totalGrossWeight"` + TotalNetWeight decimal.Decimal `json:"totalNetWeight"` + CustomsPrice decimal.Decimal `json:"customsPrice"` + CustomsAmount decimal.Decimal `json:"customsAmount"` + DomesticSupply string `json:"domesticSupply"` + TaxExemption string `json:"taxExemption"` + ContainerNumber string `json:"containerNumber"` + SealNumber string `json:"sealNumber"` + Remark string `json:"remark"` + Sort int64 `json:"sort"` + IsSerial int64 `json:"isSerial"` + IsCustoms int64 `json:"isCustoms"` + IsExchangeSettlement int64 `json:"isExchangeSettlement"` + CreatedAt *time.Time `json:"createdAt"` } // All @TITLE 全部赠品 diff --git a/erp/shipment/saleProduct.go b/erp/shipment/saleProduct.go index c47202c..063f519 100644 --- a/erp/shipment/saleProduct.go +++ b/erp/shipment/saleProduct.go @@ -80,6 +80,7 @@ type SaleProductItem struct { PurchaseAmount decimal.Decimal `json:"purchaseAmount"` IsSerial int64 `json:"isSerial"` IsCustoms int64 `json:"isCustoms"` + IsExchangeSettlement int64 `json:"isExchangeSettlement"` CreatedAt *time.Time `json:"createdAt"` UpdatedAt *time.Time `json:"updatedAt"` Children []*SaleProductItem `json:"children"`