From 903adb90f70518fce4bc22d69008c3eee30e4f89 Mon Sep 17 00:00:00 2001 From: 严智鑫 <test> Date: 星期四, 01 八月 2024 16:35:06 +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, 3 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 5a0bd8a..f5bda8f 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 @@ -40,6 +40,7 @@ * 鍑虹墖浠诲姟101 * 浜哄伐涓嬬墖102 * 鍑虹墖涓�103 + * 璋冨害涓�104 * 鎷胯蛋200 * 鐮存崯201 */ @@ -48,9 +49,10 @@ 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_SCHEDULE_ING = 104; 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 List<Integer> GLASS_STATE_IN_ALL = Arrays.asList(100, 102, 103, 104); /** * 鍗у紡鐞嗙墖绗艰鎯呰〃鐜荤拑鐘舵�� -- Gitblit v1.8.0