From 80f005f41205cd39eedd6299d8f5ba310fe7a0dc Mon Sep 17 00:00:00 2001 From: kanade Date: Sat, 10 Oct 2026 10:17:28 +0800 Subject: [PATCH] =?UTF-8?q?feat(erp):=20=E6=B7=BB=E5=8A=A0=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E5=AE=A1=E6=A0=B8=E7=B1=BB=E5=9E=8B=E5=B8=B8=E9=87=8F?= =?UTF-8?q?=E5=92=8C=E6=94=B6=E6=8D=AE=E5=A4=87=E6=B3=A8=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增 BusinessAuditType 常量定义各种业务审核类型 - 添加收据结构体的 remarks 字段用于存储备注信息 - 扩展订单字段常量添加收据序列号排序字段 - 重构业务类型常量分离审核相关类型到独立常量组 - 创建业务审核类型名称映射表支持多语言显示 --- erp/constant.go | 66 +++++++++++++++++++++++++------------------- erp/receipt/claim.go | 1 + erp/transfer.go | 1 + 3 files changed, 40 insertions(+), 28 deletions(-) create mode 100644 erp/transfer.go diff --git a/erp/constant.go b/erp/constant.go index 90b4b23..806dc7f 100644 --- a/erp/constant.go +++ b/erp/constant.go @@ -1,38 +1,47 @@ package erp +type BusinessAuditType = string // 业务审核类型 +const ( + BusinessAuditTypeSaleAudit BusinessAuditType = "saleAudit" // 销售合同审核 + BusinessAuditTypeSaleAuditClose BusinessAuditType = "saleAuditClose" // 销售合同关单审核 + BusinessAuditTypeSaleAppendAudit BusinessAuditType = "saleAuditAppend" // 销售合同追加商品 + BusinessAuditTypeSaleChangeAudit BusinessAuditType = "saleAuditChange" // 销售合同修改产品 + BusinessAuditTypeSaleBenefitAudit BusinessAuditType = "saleAuditBenefit" // 销售合同修改效益测算 + BusinessAuditTypePurchaseAudit BusinessAuditType = "purchaseAudit" // 采购合同审核 + BusinessAuditTypeShipmentAudit BusinessAuditType = "shipmentAudit" // 订舱单审核 + BusinessAuditTypeShipmentModifyAudit BusinessAuditType = "shipmentModifyAudit" // 订舱单修改单审核 + BusinessAuditTypeAccountingAudit BusinessAuditType = "accountingAudit" // 做账合同审核 + BusinessAuditTypeAccountingAuditV2 BusinessAuditType = "accountingAuditV2" // 做账合同审核 + BusinessAuditTypeAccountingAppendCostAudit BusinessAuditType = "accountingAppendCostAudit" // 做账合同追加费用审核 + BusinessAuditTypeExpense BusinessAuditType = "expenseAudit" // 报销单 + BusinessAuditTypeRequest BusinessAuditType = "requestAudit" // 申请单 + BusinessAuditTypePayment BusinessAuditType = "paymentAudit" // 申请单 +) + +var BusinessAuditTypeName = map[BusinessAuditType]string{ + BusinessAuditTypeSaleAudit: "销售合同审核", + BusinessAuditTypeSaleAuditClose: "销售合同关单审核", + BusinessAuditTypeSaleAppendAudit: "销售合同追加商品审核", + BusinessAuditTypeSaleChangeAudit: "销售合同编辑产品审核", + BusinessAuditTypeSaleBenefitAudit: "销售合同修改效益测算", + BusinessAuditTypePurchaseAudit: "采购合同审核", + BusinessAuditTypeShipmentAudit: "订舱单审核", + BusinessAuditTypeShipmentModifyAudit: "订舱修改单审核", + BusinessAuditTypeAccountingAudit: "做账合同审核", + BusinessAuditTypeAccountingAuditV2: "做账合同审核", + BusinessAuditTypeAccountingAppendCostAudit: "做账费用追加审核", + BusinessAuditTypeExpense: "报销单审核", + BusinessAuditTypeRequest: "申请单审核", + BusinessAuditTypePayment: "付款单审核", +} + type BusinessType = string // 业务类型 const ( - BusinessTypeSaleAudit BusinessType = "saleAudit" // 销售合同审核 - BusinessTypeSaleAuditClose BusinessType = "saleAuditClose" // 销售合同关单审核 - BusinessTypeSaleAppendAudit BusinessType = "saleAuditAppend" // 销售合同追加商品 - BusinessTypeSaleChangeAudit BusinessType = "saleAuditChange" // 销售合同修改产品 - BusinessTypeSaleBenefitAudit BusinessType = "saleAuditBenefit" // 销售合同修改效益测算 - BusinessTypePurchaseAudit BusinessType = "purchaseAudit" // 采购合同审核 - BusinessTypeShipmentAudit BusinessType = "shipmentAudit" // 订舱单审核 - BusinessTypeShipmentModifyAudit BusinessType = "shipmentModifyAudit" // 订舱单修改单审核 - BusinessTypeAccountingAudit BusinessType = "accountingAudit" // 做账合同审核 - BusinessTypeAccountingAuditV2 BusinessType = "accountingAuditV2" // 做账合同审核 - BusinessTypeAccountingAppendCostAudit BusinessType = "accountingAppendCostAudit" // 做账合同追加费用审核 - BusinessTypeExpense BusinessType = "expenseAudit" // 报销单 - BusinessTypeRequest BusinessType = "requestAudit" // 申请单 - BusinessTypePayment BusinessType = "paymentAudit" // 申请单 + BusinessTypeExpense BusinessType = "expense" // 报销 ) var BusinessTypeName = map[BusinessType]string{ - BusinessTypeSaleAudit: "销售合同审核", - BusinessTypeSaleAuditClose: "销售合同关单审核", - BusinessTypeSaleAppendAudit: "销售合同追加商品审核", - BusinessTypeSaleChangeAudit: "销售合同编辑产品审核", - BusinessTypeSaleBenefitAudit: "销售合同修改效益测算", - BusinessTypePurchaseAudit: "采购合同审核", - BusinessTypeShipmentAudit: "订舱单审核", - BusinessTypeShipmentModifyAudit: "订舱修改单审核", - BusinessTypeAccountingAudit: "做账合同审核", - BusinessTypeAccountingAuditV2: "做账合同审核", - BusinessTypeAccountingAppendCostAudit: "做账费用追加审核", - BusinessTypeExpense: "报销单审核", - BusinessTypeRequest: "申请单审核", - BusinessTypePayment: "付款单审核", + BusinessTypeExpense: "报销", } type AuditStatus = int64 // 审核状态 @@ -131,6 +140,7 @@ const ( OrderFieldReceivableReceivableAmount OrderField = "receivableAmount" OrderFieldReceivableOutstandingAmount OrderField = "outstandingAmount" + OrderFieldReceiptReceiptSerial OrderField = "receiptSerial" OrderFieldReceiptCreatedAt OrderField = "createdAt" OrderFieldReceiptEntryAmount OrderField = "entryAmount" OrderFieldReceiptReceivableFxAmount OrderField = "receivableFxAmount" diff --git a/erp/receipt/claim.go b/erp/receipt/claim.go index 18423aa..321bb92 100644 --- a/erp/receipt/claim.go +++ b/erp/receipt/claim.go @@ -30,6 +30,7 @@ type ClaimItem struct { Amount decimal.Decimal `json:"amount"` CustomName string `json:"customName"` IsConfirm int64 `json:"isConfirm"` + Remarks string `json:"remarks"` CreatedStaffId int64 `json:"createdStaffId"` DepartmentId int64 `json:"departmentId"` CreatedAt *time.Time `json:"createdAt"` diff --git a/erp/transfer.go b/erp/transfer.go new file mode 100644 index 0000000..f3b2ac0 --- /dev/null +++ b/erp/transfer.go @@ -0,0 +1 @@ +package erp