From 43a6eccb37602e27c56bf7c40a74c8350ecfd82e Mon Sep 17 00:00:00 2001 From: wang <3597712270@qq.com> Date: 星期三, 15 五月 2024 11:51:46 +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 | 39 +++++++++++++++++++++++++++++++++++++-- 1 files changed, 37 insertions(+), 2 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 bc344ce..2e03df0 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 @@ -11,8 +11,43 @@ //榛樿瑙掕壊 public static final Long DEFULT_ROLE = 1L; - //A09鍑虹墖鐩爣浣嶇疆 + /** + * 纾ㄨ竟娓呮礂鍓� + */ + /** + * A09鍑虹墖鐩爣浣嶇疆2001 + * A10鍑虹墖鐩爣浣嶇疆2002 + */ public static final Integer A09_OUT_TARGET_POSITION = 2001; - //A09鍑虹墖鐩爣浣嶇疆 public static final Integer A10_OUT_TARGET_POSITION = 2002; + + /** + * 鍗у紡鐞嗙墖绗艰鎯呰〃鐜荤拑鐘舵�� + * 璇嗗埆鍚庢垚鍔熺姸鎬�100 + * 鍑虹墖浠诲姟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_TAKE = 200; + public static final Integer A10_OUT_TARGET_DAMAGE = 201; + + /** + * 鍗у紡鐞嗙墖绗艰鎯呰〃鐜荤拑鐘舵�� + * 杩涚墖浠诲姟1 + * 鍑虹墖浠诲姟2 + */ + public static final Integer GLASS_CACHE_TYPE_IN = 1; + public static final Integer GLASS_CACHE_TYPE_OUT = 2; + + /** + * 纾ㄨ竟浠诲姟鐜荤拑鐘舵�� + * 杩涚墖浠诲姟1 + * 鍑虹墖浠诲姟2 + */ + public static final Integer EDG_GLASS_BEFORE = 0; + public static final Integer EDG_GLASS_START = 1; + public static final Integer EDG_GLASS_SUCCESS = 2; + } -- Gitblit v1.8.0