From 09a010c5dc11c68a866a6075a74bd1bbefb4a9a8 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 24 六月 2024 16:38:23 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java | 95 ++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 92 insertions(+), 3 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 af09ed0..b18d95d 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
@@ -1,5 +1,8 @@
package com.mes.common.config;
+import java.util.Arrays;
+import java.util.List;
+
/**
* @Author : zhoush
* @Date: 2024/4/24 10:33
@@ -15,8 +18,8 @@
* 纾ㄨ竟娓呮礂鍓�
*/
/**
- * A09鍑虹墖鐩爣浣嶇疆2001
- * A10鍑虹墖鐩爣浣嶇疆2002
+ * A09鍑虹墖鐩爣浣嶇疆 d02鍗ц浆绔� 閽㈠寲鍑虹墖 2001
+ * A10鍑虹墖鐩爣浣嶇疆 d05鍗ц浆绔� 浜哄伐鍑虹墖 2002
*/
public static final Integer A09_OUT_TARGET_POSITION = 2001;
public static final Integer A10_OUT_TARGET_POSITION = 2002;
@@ -25,13 +28,15 @@
* 鍗у紡鐞嗙墖绗艰鎯呰〃鐜荤拑鐘舵��
* 璇嗗埆鍚庢垚鍔熺姸鎬�100
* 鍑虹墖浠诲姟101
+ * 浜哄伐涓嬬墖101
* 鎷胯蛋200
* 鐮存崯201
*/
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_TAKE = 200;
- public static final Integer A10_OUT_TARGET_DAMAGE = 201;
+ public static final Integer GLASS_STATE_DAMAGE = 201;
/**
* 鍗у紡鐞嗙墖绗艰鎯呰〃鐜荤拑鐘舵��
@@ -42,6 +47,7 @@
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 List<Integer> GLASS_CACHE_TYPE_OUT_ALL = Arrays.asList(2, 3);
/**
* 纾ㄨ竟浠诲姟鐜荤拑鐘舵��
@@ -52,4 +58,87 @@
public static final Integer EDG_GLASS_START = 1;
public static final Integer EDG_GLASS_SUCCESS = 2;
+ /**
+ * 纾ㄨ竟浠诲姟鐜荤拑鐘舵��
+ * 1鍗曟満鑷姩鐘舵��
+ * 2鑱旀満鑷姩鐘舵��
+ * 3鎵嬪姩鐘舵��
+ */
+ 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;
+
+ /**
+ * 澶х悊鐗囩璇锋眰
+ * 0 澶х悊鐗囩鏃犺姹�
+ * 1 澶х悊鐗囩杩涚墖璇锋眰
+ */
+ public static final String BIG_STORAGE_REQUEST = "0";
+ public static final String BIG_STORAGE_REQUEST_IN = "1";
+
+ /**
+ * 澶х悊鐗囩璇︽儏鐘舵��
+ * 0 澶х悊鐗囩杩涚墖涓�
+ * 1 澶х悊鐗囩鍦ㄧ鍐�
+ * 2 澶х悊鐗囩鍑虹墖涓�
+ * 3 澶х悊鐗囩鍑虹墖瀹屾垚
+ * 4 澶х悊鐗囩鎵嬪姩鍑虹墖
+ */
+ public static final Integer BIG_STORAGE_IN = 0;
+ public static final Integer BIG_STORAGE_INSIDE = 1;
+ public static final Integer BIG_STORAGE_OUT = 2;
+ public static final Integer BIG_STORAGE_OUTSIDE = 3;
+ public static final Integer BIG_STORAGE_MANUAL = 4;
+
+ /**
+ * 鍗ц浆绔嬭繘鐗囪姹�
+ * 1 浠诲姟鐢熸垚
+ * 2 鍗ц浆绔嬭繘鐗囧畬鎴�
+ * 3 澶ц溅杩涚墖瀹屾垚
+ * 4 澶х悊鐗囩杩涚墖瀹屾垚
+ */
+ 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 List<Integer> BIG_STORAGE_IN_UP_ALL = Arrays.asList(1, 2);
+ /**
+ * 鍗ц浆绔嬪嚭鐗囪姹�
+ * 1 浠诲姟鐢熸垚
+ * 2 鐜荤拑杩涘ぇ杞﹀畬鎴�
+ * 3 澶ц溅鍑虹墖瀹屾垚
+ */
+ 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;
+
+ /**
+ * 鍗ц浆绔嬪嚭鐗囪姹�
+ * 1 涓婅溅绛夊緟
+ * 2 涓婅溅鍚姩
+ */
+ public static final Integer BIG_STORAGE_IN_WAIT = 1;
+ public static final Integer BIG_STORAGE_IN_RUN = 2;
+
+ /**
+ * 閽㈠寲灏忕墖琛�
+ * -1 鐢熸垚浠诲姟
+ * 0 鍑虹墖瀹屾垚
+ * 1 鎽嗙墖瀹屾垚
+ * 2 杩涚倝瀹屾垚
+ * 3 閽㈠寲瀹屾垚
+ * 4 鍑虹墖瀹屾垚
+ * 5 鐮存崯
+ * 6 鎷胯蛋
+ */
+
+ public static final Integer TEMPERING_NEW =-1;
+ public static final Integer TEMPERING_OUT =0;
+ public static final Integer TEMPERING_DROP =1;
+ 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;
+
}
--
Gitblit v1.8.0