From 0b41a5c59028a61bff22f60e74cb1d6d53a40e61 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 13 五月 2025 14:01:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 52 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 a05dfe6..419a29e 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
@@ -25,6 +25,22 @@
public static final Integer A09_OUT_TARGET_POSITION = 2001;
public static final Integer A10_OUT_TARGET_POSITION = 2002;
+ /**
+ * 鍗у紡鐞嗙墖鍑虹墖鐩爣鏂瑰悜
+ */
+ public static final Integer ONE_OUT_TARGET_POSITION = 1;
+ public static final Integer TWO_OUT_TARGET_POSITION = 2;
+ /**
+ * 鍗у紡鐞嗙墖 纾ㄨ竟鍓嶇墖鍙扮姸鎬�
+ * 绌洪棽 0
+ * 蹇欑 1
+ * 绂佺敤 2
+ */
+ public static final String OUT_FREE = "0";
+ public static final String OUT_BUSY = "1";
+ public static final String OUT_DISABLE = "2";
+ public static final List<String> OUT_DISABLE_ALL = Arrays.asList("1", "2");
+
/**
* A09鍑虹墖鐩爣浣嶇疆 d02鍗ц浆绔� 閽㈠寲鍑虹墖 3001
@@ -84,6 +100,7 @@
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);
+ public static final List<Integer> GLASS_CACHE_TYPE_IN_ALL = Arrays.asList(1, 3);
/**
* 纾ㄨ竟浠诲姟鐜荤拑鐘舵��
@@ -108,8 +125,10 @@
* 澶х悊鐗囩浠诲姟绫诲瀷
* 1銆侀挗鍖栧墠杩涚墖
* 2銆侀挗鍖栧墠鍑虹墖
- * 3銆侀挗鍖栧悗杩涚墖
- * 4銆侀挗鍖栧悗鍑虹墖
+ * 3銆佽皟搴︿换鍔�
+ * 4銆侀挗鍖栧悗杩涚墖
+ * 5銆侀挗鍖栧悗鍑虹墖
+ * 6銆佽皟搴︿换鍔�
*/
public static final Integer BIG_STORAGE_BEFORE_IN = 1;
public static final Integer BIG_STORAGE_BEFORE_OUT = 2;
@@ -183,8 +202,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;
/**
* 涓嬬墖
@@ -230,11 +250,13 @@
/**
* 鍘熺墖浠撳偍浠诲姟鐘舵��
- * 鏂板缓0
- * 宸插畬鎴�1
+ * 鏂板缓 0
+ * 杩愯涓� 1
+ * 宸插畬鎴�2
*/
public static final Integer ENGINEERING_NEW = 0;
public static final Integer ENGINEERING_RUNNING = 1;
+ public static final Integer ENGINEERING_SUCCESS = 2;
/**
* 鍘熺墖浠撳偍浠诲姟绫诲瀷
@@ -243,12 +265,14 @@
* 鍑嗗鍑虹102
* 鎵ц涓�103
* 鍦ㄨ溅涓�104
+ * 鍑嗗澶嶄綅105
*/
public static final Integer RAW_GLASS_STATE_IN = 100;
public static final Integer RAW_GLASS_STATE_OUT = 101;
public static final Integer RAW_GLASS_STATE_WAIT_OUT = 102;
public static final Integer RAW_GLASS_STATE_RUNNING = 103;
public static final Integer RAW_GLASS_STATE_CAR = 104;
+ public static final Integer RAW_GLASS_STATE_RESET = 105;
public static final List<Integer> RAW_GLASS_STATE_IN_ALL = Arrays.asList(100, 102, 103);
public static final Integer RAW_GLASS_TASK_NEW = 0;
@@ -276,4 +300,26 @@
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;
+
+ /**
+ * 涓┖澶х悊鐗囩鍑虹墖鐘舵�両
+ * 0 鏈繘绗�
+ * 1 鍗犵敤
+ * 2 杩涚瀹屾垚
+ */
+ public static final Integer HOLLOW_RELATION_NEW = 0;
+ public static final Integer HOLLOW_RELATION_OCCUPY = 1;
+ public static final Integer HOLLOW_RELATION_SUCCESS = 2;
+
}
--
Gitblit v1.8.0