From 3123dbd3a5be75999f368fbe4aa722e3877074ab Mon Sep 17 00:00:00 2001 From: wuyouming666 <2265557248@qq.com> Date: 星期五, 14 六月 2024 15:52:28 +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 | 76 +++++++++++++++++++++++++++++++++++++ 1 files changed, 75 insertions(+), 1 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 7b756d8..73763d9 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 @@ -34,7 +34,7 @@ public static final Integer GLASS_STATE_IN = 100; public static final Integer GLASS_STATE_OUT = 101; 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; /** * 鍗у紡鐞嗙墖绗艰鎯呰〃鐜荤拑鐘舵�� @@ -56,4 +56,78 @@ 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 Integer BIG_STORAGE_REQUEST = 0; + public static final Integer BIG_STORAGE_REQUEST_IN = 1; + + /** + * 鍗ц浆绔嬭繘鐗囪姹� + * 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; + /** + * 鍗ц浆绔嬪嚭鐗囪姹� + * 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; + + /** + * 澶х悊鐗囩瀹藉害 鍙� 鐜荤拑闂磋窛 + */ + public static final Integer BIG_STORAGE_WIDTH = 5000; + public static final Integer BIG_STORAGE_GAP = 20; + + /** + * 閽㈠寲灏忕墖琛� + * -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