From fd35c0ee025e8f5471acd4075af33b9f59f4d817 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期四, 05 十二月 2024 13:39:11 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java
index a05dfe6..7efbd7d 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java
@@ -183,8 +183,9 @@
     public static final Integer TEMPERING_START = 2;
     public static final Integer TEMPERING_SUCCESS = 3;
     public static final Integer TEMPERING_END = 4;
-//    public static final Integer TEMPERING_DAMAGE = 8;
-//    public static final Integer TEMPERING_TAKE = 9;
+    public static final Integer TEMPERING_PAUSE = 5;
+    public static final Integer TEMPERING_DAMAGE = 8;
+    public static final Integer TEMPERING_TAKE = 9;
 
     /**
      * 涓嬬墖
@@ -276,4 +277,16 @@
     public static final Integer BIG_STORAGE_TASK_EMPTY = 0;
     public static final Integer BIG_STORAGE_TASK_RUNNING = 1;
 
+    /**
+     * 涓┖澶х悊鐗囩鍑虹墖鐘舵�両
+     * 0 绌轰换鍔�
+     * 1 鍚姩
+     * 2 鏆傚仠
+     * 3 瀹屾垚
+     */
+    public static final Integer HOLLOW_FLOW_CARD_NEW = 0;
+    public static final Integer HOLLOW_FLOW_CARD_START = 1;
+    public static final Integer HOLLOW_FLOW_CARD_PAUSE = 2;
+    public static final Integer HOLLOW_FLOW_CARD_SUCCESS = 3;
+
 }

--
Gitblit v1.8.0