From 3c7d672fb7d6c34742fb7da6f66616ccf3be2c9a Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 08 十一月 2024 14:50:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 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 2a9f2a9..29c8e17 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
@@ -57,13 +57,22 @@
public static final List<Integer> GLASS_STATE_IN_ALL_ZERO = Arrays.asList(0, 100, 102, 103, 104);
/**
- * 鍗у紡鐞嗙墖绗艰鎯呰〃鐜荤拑鐘舵��
- * 杩涚墖浠诲姟1
- * 鍑虹墖浠诲姟2
+ * 鍗х浠诲姟绫诲瀷
+ * 绌轰换鍔� 0
+ * 杩涚墖浠诲姟 1
+ * 鍑虹墖浠诲姟 2
+ * 鐩撮�氫换鍔� 3
+ * 杩涜涓� 4
+ * 缁撴潫 5
+ * 鍏朵粬 6
*/
+ public static final Integer GLASS_CACHE_TYPE_EMPTY = 0;
public static final Integer GLASS_CACHE_TYPE_IN = 1;
public static final Integer GLASS_CACHE_TYPE_OUT = 2;
public static final Integer GLASS_CACHE_TYPE_THROUGH = 3;
+ public static final Integer GLASS_CACHE_TYPE_RUNNING = 4;
+ public static final Integer GLASS_CACHE_TYPE_FINISH = 5;
+ public static final Integer GLASS_CACHE_TYPE_OTHER = 6;
public static final List<Integer> GLASS_CACHE_TYPE_OUT_ALL = Arrays.asList(2, 3);
/**
@@ -185,6 +194,9 @@
* 鍘熺墖浠撳偍浠诲姟绫诲瀷
* 杩涚墖浠诲姟1
* 鍑虹墖浠诲姟2
+ * 璋冨害浠诲姟3
+ * 杩涚墖璇锋眰4
+ * 鍑虹墖璇锋眰5
*/
public static final Integer RAW_GLASS_TASK_TYPE_IN = 1;
public static final Integer RAW_GLASS_TASK_TYPE_OUT = 2;
@@ -193,9 +205,9 @@
public static final Integer RAW_GLASS_TASK_TYPE_OUT_REQUEST = 5;
/**
- * 鍘熺墖浠撳偍浠诲姟绫诲瀷
- * 杩涚墖浠诲姟1
- * 鍑虹墖浠诲姟2
+ * 鍘熺墖浠撳偍浠诲姟鐘舵��
+ * 鏂板缓0
+ * 宸插畬鎴�1
*/
public static final Integer ENGINEERING_NEW = 0;
public static final Integer ENGINEERING_RUNNING = 1;
@@ -224,5 +236,13 @@
*/
public static final List<Integer> RAW_GLASS_DEVICE = Arrays.asList(1, 2, 3);
+ /**
+ * 鍘熺墖涓婄墖鐘舵��
+ * 0 鏂板
+ * 100 宸插畬鎴�
+ */
+ public static final Integer LOAD_RAW_GLASS_NEW = 0;
+ public static final Integer LOAD_RAW_GLASS_SUCCESS = 100;
+
}
--
Gitblit v1.8.0