From 8a76767b0a7ad271c8487a02063590b956deb5df Mon Sep 17 00:00:00 2001 From: 严智鑫 <test> Date: 星期四, 25 七月 2024 14:30:30 +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 | 4 ++++ 1 files changed, 4 insertions(+), 0 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 5423c6e..fe5c038 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 @@ -21,6 +21,7 @@ * A09鍑虹墖鐩爣浣嶇疆 d02鍗ц浆绔� 2001 * A10鍑虹墖鐩爣浣嶇疆 d05鍗ц浆绔� 2002 */ + public static final Integer OUT_TARGET_POSITION_ZERO = 0; public static final Integer A09_OUT_TARGET_POSITION = 2001; public static final Integer A10_OUT_TARGET_POSITION = 2002; @@ -37,12 +38,14 @@ * 璇嗗埆鍚庢垚鍔熺姸鎬�100 * 鍑虹墖浠诲姟101 * 浜哄伐涓嬬墖102 + * 鍑虹墖涓�103 * 鎷胯蛋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_OUT_ING = 103; public static final Integer GLASS_STATE_TAKE = 200; public static final Integer GLASS_STATE_DAMAGE = 201; @@ -112,6 +115,7 @@ 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 List<Integer> BIG_STORAGE_OUT_ALL = Arrays.asList(2, 3); /** * 鍗ц浆绔嬪嚭鐗囪姹� -- Gitblit v1.8.0