From 67c98cdd79a1e473fe95ddc1c695ed162c176510 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 15 七月 2025 15:40:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/core/constants/Constants.java | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 47 insertions(+), 1 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/core/constants/Constants.java b/server/services/src/main/java/com/doumee/core/constants/Constants.java
index 76c8c19..df01084 100644
--- a/server/services/src/main/java/com/doumee/core/constants/Constants.java
+++ b/server/services/src/main/java/com/doumee/core/constants/Constants.java
@@ -52,6 +52,7 @@
public static final String RECEIVE_CANCEL_TIME ="RECEIVE_CANCEL_TIME" ;
public static final String AUTO_DISPATCH ="AUTO_DISPATCH" ;
public static final String AUTO_DISPATCH_DISTANCE ="AUTO_DISPATCH_DISTANCE" ;
+ public static final String AUTO_CONFIRM ="AUTO_CONFIRM" ;
public static final String QYWX = "QYWX";
public static final Integer ONE = 1;
@@ -64,6 +65,7 @@
public static final String INENTITY_FILES = "INENTITY_FILES";
public static final String MEMBER_FILES = "MEMBER_FILES";
public static final String CATEGORY_FILES = "CATEGORY_FILES";
+ public static final String ORDERS_FILES = "ORDERS_FILES";
public static boolean WORKORDER_SHE_EMAIL_SENDING = false;
public static boolean DEALING_COMPANY_SYNC = false ;
public static boolean DEALING_MEMBER_SYNC = false ;
@@ -82,7 +84,7 @@
interface CacheKey {
}
public interface RedisKeys {
- public static final String IMPORTING_CATEGORY = "IMPORTING_CATEGORY";
+ public static final String ORDER_CODE = "ORDER_CODE";
}
/**
* 鎿嶄綔绫诲瀷锛岀敤浜庡仛鎺ュ彛楠岃瘉鍒嗙粍
@@ -478,5 +480,49 @@
}
+ public enum workType {
+ czg(0, "閲囨憳宸�"),
+ fjg(1, "鍒嗘嫞宸�"),
+ bzg(2, "鍖呰宸�"),
+
+ ;
+ // 鎴愬憳鍙橀噺
+ private int key;
+ private String name;
+
+ // 鏋勯�犳柟娉�
+ workType(int key, String name) {
+ this.name = name;
+ this.key = key;
+ }
+
+ // 鏅�氭柟娉�
+ public static String getName(int index) {
+ for (OrdersLog c : OrdersLog.values()) {
+ if (c.getKey() == index) {
+ return c.name;
+ }
+ }
+ return null;
+ }
+ // get set 鏂规硶
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public int getKey() {
+ return key;
+ }
+
+ public void setKey(int key) {
+ this.key = key;
+ }
+
+ }
+
}
--
Gitblit v1.9.3