From c377d90fe2a01c2118f6c69c3c177f75be7c318b Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 29 十一月 2024 15:20:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java | 158 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 134 insertions(+), 24 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 5a0bd8a..a05dfe6 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
@@ -30,8 +30,18 @@
* A09鍑虹墖鐩爣浣嶇疆 d02鍗ц浆绔� 閽㈠寲鍑虹墖 3001
* A10鍑虹墖鐩爣浣嶇疆 d05鍗ц浆绔� 浜哄伐鍑虹墖 3002
*/
- public static final Integer TEMPERING_OUT_TARGET_POSITION = 3001;
- public static final Integer ARTIFICIAL_OUT_TARGET_POSITION = 3002;
+// public static final Integer TEMPERING_OUT_TARGET_POSITION = 3001;
+// public static final Integer ARTIFICIAL_OUT_TARGET_POSITION = 3002;
+// public static final List<Integer> OUT_TARGET_POSITION_ALL = Arrays.asList(3001, 3002);
+
+ /**
+ * 涔変箤纾ㄨ竟绾�
+ * A09鍑虹墖鐩爣浣嶇疆 d02鍗ц浆绔� 閽㈠寲鍑虹墖 930
+ * A10鍑虹墖鐩爣浣嶇疆 d05鍗ц浆绔� 浜哄伐鍑虹墖 931
+ */
+ public static final Integer TEMPERING_OUT_TARGET_POSITION = 930;
+ public static final Integer ARTIFICIAL_OUT_TARGET_POSITION = 931;
+ public static final List<Integer> OUT_TARGET_POSITION_ALL = Arrays.asList(930, 931);
/**
* 鍗у紡鐞嗙墖绗艰鎯呰〃鐜荤拑鐘舵��
@@ -40,26 +50,39 @@
* 鍑虹墖浠诲姟101
* 浜哄伐涓嬬墖102
* 鍑虹墖涓�103
- * 鎷胯蛋200
- * 鐮存崯201
+ * 璋冨害涓�104
+ * 鐮存崯8
+ * 鎷胯蛋9
*/
public static final Integer GLASS_STATE_NEW = 0;
public static final Integer GLASS_STATE_IN = 100;
public static final Integer GLASS_STATE_OUT = 101;
public static final Integer GLASS_STATE_ARTIFICIAL = 102;
public static final Integer GLASS_STATE_OUT_ING = 103;
- public static final Integer GLASS_STATE_TAKE = 200;
- public static final Integer GLASS_STATE_DAMAGE = 201;
- public static final List<Integer> GLASS_STATE_IN_ALL = Arrays.asList(100, 102, 103);
+ public static final Integer GLASS_STATE_SCHEDULE_ING = 104;
+ public static final Integer GLASS_STATE_DAMAGE = 8;
+ public static final Integer GLASS_STATE_TAKE = 9;
+ public static final List<Integer> GLASS_STATE_DAMAGE_TAKE = Arrays.asList(8, 9);
+ public static final List<Integer> GLASS_STATE_IN_ALL = Arrays.asList(100, 102, 103, 104);
+ 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);
/**
@@ -72,7 +95,7 @@
public static final Integer EDG_GLASS_SUCCESS = 2;
/**
- * 纾ㄨ竟浠诲姟鐜荤拑鐘舵��
+ * 澶х悊鐗囩鐘舵��
* 1鍗曟満鑷姩鐘舵��
* 2鑱旀満鑷姩鐘舵��
* 3鎵嬪姩鐘舵��
@@ -80,6 +103,20 @@
public static final Integer BIG_STORAGE_STAND_ALONE = 1;
public static final Integer BIG_STORAGE_ONLINE = 2;
public static final Integer BIG_STORAGE_MT = 3;
+
+ /**
+ * 澶х悊鐗囩浠诲姟绫诲瀷
+ * 1銆侀挗鍖栧墠杩涚墖
+ * 2銆侀挗鍖栧墠鍑虹墖
+ * 3銆侀挗鍖栧悗杩涚墖
+ * 4銆侀挗鍖栧悗鍑虹墖
+ */
+ public static final Integer BIG_STORAGE_BEFORE_IN = 1;
+ public static final Integer BIG_STORAGE_BEFORE_OUT = 2;
+ public static final Integer BIG_STORAGE_BEFORE_DISPATCH = 3;
+ public static final Integer BIG_STORAGE_AFTER_IN = 4;
+ public static final Integer BIG_STORAGE_AFTER_OUT = 5;
+ public static final Integer BIG_STORAGE_AFTER_DISPATCH = 6;
/**
* 澶х悊鐗囩璇锋眰
@@ -95,29 +132,29 @@
* 2 鍗ц浆绔嬭繘鐗囧畬鎴�
* 3 澶ц溅杩涚墖瀹屾垚
* 4 澶х悊鐗囩杩涚墖瀹屾垚
- * 5 澶х悊鐗囩杩涚墖澶辫触
- * 6 澶х悊鐗囩杩涚墖鐮存崯
+ * 8 澶х悊鐗囩杩涚墖鐮存崯
+ * 9 澶х悊鐗囩杩涚墖鎷胯蛋
*/
public static final Integer BIG_STORAGE_IN_NEW = 1;
public static final Integer BIG_STORAGE_IN_UP = 2;
public static final Integer BIG_STORAGE_IN_CAR = 3;
public static final Integer BIG_STORAGE_IN_SLOT = 4;
- public static final Integer BIG_STORAGE_IN_ERROR = 5;
- public static final Integer BIG_STORAGE_IN_DAMAGE = 6;
+ // public static final Integer BIG_STORAGE_IN_DAMAGE = 8;
+// public static final Integer BIG_STORAGE_IN_ERROR = 9;
public static final List<Integer> BIG_STORAGE_IN_UP_ALL = Arrays.asList(1, 2);
/**
* 鍗ц浆绔嬪嚭鐗囪姹�
* 1 浠诲姟鐢熸垚
* 2 鐜荤拑杩涘ぇ杞﹀畬鎴�
* 3 澶ц溅鍑虹墖瀹屾垚
- * 4 澶х悊鐗囩杩涚墖澶辫触
- * 5 澶х悊鐗囩杩涚墖鐮存崯
+ * 8 澶х悊鐗囩杩涚墖鐮存崯
+ * 9 澶х悊鐗囩杩涚墖鎷胯蛋
*/
public static final Integer BIG_STORAGE_OUT_NEW = 1;
public static final Integer BIG_STORAGE_OUT_CAR = 2;
public static final Integer BIG_STORAGE_OUT_SUCCESS = 3;
- public static final Integer BIG_STORAGE_OUT_ERROR = 4;
- public static final Integer BIG_STORAGE_OUT_DAMAGE = 5;
+ // public static final Integer BIG_STORAGE_OUT_DAMAGE = 8;
+// public static final Integer BIG_STORAGE_OUT_ERROR = 9;
public static final List<Integer> BIG_STORAGE_OUT_ALL = Arrays.asList(2, 3);
/**
@@ -136,8 +173,8 @@
* 2 杩涚倝瀹屾垚
* 3 閽㈠寲瀹屾垚
* 4 鍑虹墖瀹屾垚
- * 5 鐮存崯
- * 6 鎷胯蛋
+ * 8 鐮存崯
+ * 9 鎷胯蛋
*/
public static final Integer TEMPERING_NEW = -1;
@@ -146,8 +183,8 @@
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 = 5;
- public static final Integer TEMPERING_TAKE = 6;
+// public static final Integer TEMPERING_DAMAGE = 8;
+// public static final Integer TEMPERING_TAKE = 9;
/**
* 涓嬬墖
@@ -157,7 +194,8 @@
*/
public static final List<Integer> G06_WORK_STATION = Arrays.asList(1, 2, 3);
public static final List<Integer> G11_WORK_STATION = Arrays.asList(4, 5, 6);
- public static final List<Integer> G13_WORK_STATION = Arrays.asList(7);
+ public static final int G13_WORK_STATION = 7;
+ public static final List<Integer> WORK_STATION_ALL = Arrays.asList(1, 2, 3, 4, 5, 6, 7);
/**
* 鍚敤 1
@@ -166,4 +204,76 @@
public static final Integer SLOT_ON = 1;
public static final Integer SLOT_OFF = 0;
+ /**
+ * 涓嬬墖浠诲姟鐜荤拑鐘舵��
+ * 鐢熸垚浠诲姟0
+ * 鍑虹墖浠诲姟2
+ */
+ public static final Integer UNLOAD_GLASS_CREATE = 0;
+ public static final Integer UNLOAD_GLASS_OUT = 1;
+ public static final Integer UNLOAD_GLASS_DOWN = 2;
+
+
+ /**
+ * 鍘熺墖浠撳偍浠诲姟绫诲瀷
+ * 杩涚墖浠诲姟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;
+ public static final Integer RAW_GLASS_TASK_TYPE_DISPATCH = 3;
+ public static final Integer RAW_GLASS_TASK_TYPE_IN_REQUEST = 4;
+ public static final Integer RAW_GLASS_TASK_TYPE_OUT_REQUEST = 5;
+
+ /**
+ * 鍘熺墖浠撳偍浠诲姟鐘舵��
+ * 鏂板缓0
+ * 宸插畬鎴�1
+ */
+ public static final Integer ENGINEERING_NEW = 0;
+ public static final Integer ENGINEERING_RUNNING = 1;
+
+ /**
+ * 鍘熺墖浠撳偍浠诲姟绫诲瀷
+ * 鍦ㄧ鍐�100
+ * 鍑虹101
+ * 鍑嗗鍑虹102
+ * 鎵ц涓�103
+ * 鍦ㄨ溅涓�104
+ */
+ 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 List<Integer> RAW_GLASS_STATE_IN_ALL = Arrays.asList(100, 102, 103);
+
+ public static final Integer RAW_GLASS_TASK_NEW = 0;
+ public static final Integer RAW_GLASS_TASK_SUCCESS = 1;
+ public static final Integer RAW_GLASS_TASK_FAILURE = 2;
+
+ /**
+ * 璁惧鍙�
+ */
+ 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;
+
+ /**
+ * 澶х悊鐗囩浠诲姟鍚姩淇″彿
+ * 0 绌轰换鍔�
+ * 1 鍚姩
+ */
+ public static final Integer BIG_STORAGE_TASK_EMPTY = 0;
+ public static final Integer BIG_STORAGE_TASK_RUNNING = 1;
+
}
--
Gitblit v1.8.0