From afabe1816bd836cba4fdfdb7b3ebd0c9583ed4ea Mon Sep 17 00:00:00 2001 From: kanade <kanade@kumo.work> Date: Mon, 23 Sep 2024 17:23:47 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E7=BD=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- erp/constant.go | 15 ++++++++++----- erp/shipment/saleProduct.go | 2 ++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/erp/constant.go b/erp/constant.go index 24e87d3..445e2d4 100644 --- a/erp/constant.go +++ b/erp/constant.go @@ -3,8 +3,8 @@ package erp type BusinessType = string // 业务类型 const ( BusinessTypeSaleAudit BusinessType = "saleAudit" // 销售合同审核 - BusinessTypePurchaseAudit BusinessType = "purchaseAudit" // 销售合同审核 - BusinessTypeShipmentAudit BusinessType = "shipmentAudit" // 销售合同审核 + BusinessTypePurchaseAudit BusinessType = "purchaseAudit" // 采购合同审核 + BusinessTypeShipmentAudit BusinessType = "shipmentAudit" // 订舱单审核 ) var BusinessTypeName = map[BusinessType]string{ @@ -31,7 +31,12 @@ const ( type ExportType = string // 导出类型 const ( - ExportTypeSalePi = "salePi" // 销售pi导出 - ExportTypeSaleBenefit = "saleBenefit" // 效益测算导出 - ExportTypePurchase = "purchase" // 采购导出 + ExportTypeSalePi = "salePi" // 销售pi导出 + ExportTypeSaleBenefit = "saleBenefit" // 效益测算导出 + ExportTypePurchase = "purchase" // 采购导出 + ExportTypeShipment = "shipment" // 订舱导出 + ExportTypeShipmentInfo = "shipmentInfo" // 出运明细导出 + ExportTypeSerial = "serial" // 商检导出 + ExportTypeCustoms = "customs" // 报关导出 + ExportTypeExchangeSettlement = "exchangeSettlement" // 结汇导出 ) diff --git a/erp/shipment/saleProduct.go b/erp/shipment/saleProduct.go index 154a9b2..334ae0f 100644 --- a/erp/shipment/saleProduct.go +++ b/erp/shipment/saleProduct.go @@ -62,6 +62,8 @@ type SaleProductItem struct { Remark6 string `json:"remark6"` ContainerNumber string `json:"containerNumber"` SealNumber string `json:"sealNumber"` + PurchasePrice decimal.Decimal `json:"purchasePrice"` + PurchaseAmount decimal.Decimal `json:"purchaseAmount"` CreatedAt *time.Time `json:"createdAt"` UpdatedAt *time.Time `json:"updatedAt"` }