From 081119f5efbb123c9daaabbc2fcd245489b7af8a Mon Sep 17 00:00:00 2001 From: yinq Date: Wed, 3 Jun 2026 18:26:55 +0800 Subject: [PATCH] =?UTF-8?q?1.1.55=20=E5=90=88=E5=90=8C=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=8F=B0=E8=B4=A6=E7=8A=B6=E6=80=81=E5=B8=B8=E9=87=8F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../constant/OrderDeliveryStatusConstant.java | 18 ++++++++ .../constant/OrderInvoiceStatusConstant.java | 17 +++++++ .../constant/OrderPurchaseStatusConstant.java | 20 +++++++++ .../enums/ContractOrderStatusTypeEnum.java | 45 +++++++++++++++++++ 4 files changed, 100 insertions(+) create mode 100644 ruoyi-api/ruoyi-api-oa/src/main/java/org/dromara/oa/api/constant/OrderDeliveryStatusConstant.java create mode 100644 ruoyi-api/ruoyi-api-oa/src/main/java/org/dromara/oa/api/constant/OrderInvoiceStatusConstant.java create mode 100644 ruoyi-api/ruoyi-api-oa/src/main/java/org/dromara/oa/api/constant/OrderPurchaseStatusConstant.java create mode 100644 ruoyi-api/ruoyi-api-oa/src/main/java/org/dromara/oa/api/enums/ContractOrderStatusTypeEnum.java diff --git a/ruoyi-api/ruoyi-api-oa/src/main/java/org/dromara/oa/api/constant/OrderDeliveryStatusConstant.java b/ruoyi-api/ruoyi-api-oa/src/main/java/org/dromara/oa/api/constant/OrderDeliveryStatusConstant.java new file mode 100644 index 00000000..9bee898a --- /dev/null +++ b/ruoyi-api/ruoyi-api-oa/src/main/java/org/dromara/oa/api/constant/OrderDeliveryStatusConstant.java @@ -0,0 +1,18 @@ +package org.dromara.oa.api.constant; + +/** + * 合同订单发货状态(字典 order_delivery_status) + * + */ +public interface OrderDeliveryStatusConstant { + + /** 未发货 */ + String NOT_DELIVERED = "1"; + + /** 部分发货 */ + String PARTIAL_DELIVERED = "2"; + + /** 已发货 */ + String DELIVERED = "3"; + +} diff --git a/ruoyi-api/ruoyi-api-oa/src/main/java/org/dromara/oa/api/constant/OrderInvoiceStatusConstant.java b/ruoyi-api/ruoyi-api-oa/src/main/java/org/dromara/oa/api/constant/OrderInvoiceStatusConstant.java new file mode 100644 index 00000000..43cb1837 --- /dev/null +++ b/ruoyi-api/ruoyi-api-oa/src/main/java/org/dromara/oa/api/constant/OrderInvoiceStatusConstant.java @@ -0,0 +1,17 @@ +package org.dromara.oa.api.constant; + +/** + * 合同订单开票状态(字典 order_invoice_status) + */ +public interface OrderInvoiceStatusConstant { + + /** 未开票 */ + String NOT_INVOICED = "1"; + + /** 部分开票 */ + String PARTIAL_INVOICED = "2"; + + /** 已开票 */ + String INVOICED = "3"; + +} diff --git a/ruoyi-api/ruoyi-api-oa/src/main/java/org/dromara/oa/api/constant/OrderPurchaseStatusConstant.java b/ruoyi-api/ruoyi-api-oa/src/main/java/org/dromara/oa/api/constant/OrderPurchaseStatusConstant.java new file mode 100644 index 00000000..14877eb6 --- /dev/null +++ b/ruoyi-api/ruoyi-api-oa/src/main/java/org/dromara/oa/api/constant/OrderPurchaseStatusConstant.java @@ -0,0 +1,20 @@ +package org.dromara.oa.api.constant; + +/** + * 合同订单采购状态(字典 order_purchase_status) + */ +public interface OrderPurchaseStatusConstant { + + /** 未采购 */ + String NOT_PURCHASED = "1"; + + /** 采购中 */ + String PURCHASING = "2"; + + /** 部分采购 */ + String PARTIAL_PURCHASED = "3"; + + /** 已采购 */ + String PURCHASED = "4"; + +} diff --git a/ruoyi-api/ruoyi-api-oa/src/main/java/org/dromara/oa/api/enums/ContractOrderStatusTypeEnum.java b/ruoyi-api/ruoyi-api-oa/src/main/java/org/dromara/oa/api/enums/ContractOrderStatusTypeEnum.java new file mode 100644 index 00000000..bea4fe88 --- /dev/null +++ b/ruoyi-api/ruoyi-api-oa/src/main/java/org/dromara/oa/api/enums/ContractOrderStatusTypeEnum.java @@ -0,0 +1,45 @@ +package org.dromara.oa.api.enums; + +import org.dromara.common.core.utils.StringUtils; + +/** + * 合同订单台账状态刷新类型 + * + */ +public enum ContractOrderStatusTypeEnum { + + /** 采购状态 order_purchase_status */ + PURCHASE("purchase"), + + /** 发货状态 order_delivery_status */ + DELIVERY("delivery"), + + /** 开票状态 order_invoice_status */ + INVOICE("invoice"), + + /** 回款比例 order_payment_rate */ + PAYMENT("payment"); + + private final String code; + + ContractOrderStatusTypeEnum(String code) { + this.code = code; + } + + public String getCode() { + return code; + } + + public static ContractOrderStatusTypeEnum getByCode(String code) { + if (StringUtils.isBlank(code)) { + return null; + } + for (ContractOrderStatusTypeEnum item : values()) { + if (item.code.equalsIgnoreCase(code.trim())) { + return item; + } + } + return null; + } + +}