From 7606618b32d522da823b5dd11f4ee64761be26dc Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 21 十月 2024 13:51:07 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java |   26 ++++++++++++++++++++++++++
 1 files changed, 26 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 46c9d01..2a9f2a9 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
@@ -189,6 +189,8 @@
     public static final Integer RAW_GLASS_TASK_TYPE_IN = 1;
     public static final Integer RAW_GLASS_TASK_TYPE_OUT = 2;
     public static final Integer RAW_GLASS_TASK_TYPE_DISPATCH = 3;
+    public static final Integer RAW_GLASS_TASK_TYPE_IN_REQUEST = 4;
+    public static final Integer RAW_GLASS_TASK_TYPE_OUT_REQUEST = 5;
 
     /**
      * 鍘熺墖浠撳偍浠诲姟绫诲瀷
@@ -198,5 +200,29 @@
     public static final Integer ENGINEERING_NEW = 0;
     public static final Integer ENGINEERING_RUNNING = 1;
 
+    /**
+     * 鍘熺墖浠撳偍浠诲姟绫诲瀷
+     * 鍦ㄧ鍐�100
+     * 鍑虹101
+     * 鍑嗗鍑虹102
+     * 鎵ц涓�103
+     * 鍦ㄨ溅涓�104
+     */
+    public static final Integer RAW_GLASS_STATE_IN = 100;
+    public static final Integer RAW_GLASS_STATE_OUT = 101;
+    public static final Integer RAW_GLASS_STATE_WAIT_OUT = 102;
+    public static final Integer RAW_GLASS_STATE_RUNNING = 103;
+    public static final Integer RAW_GLASS_STATE_CAR = 104;
+    public static final List<Integer> RAW_GLASS_STATE_IN_ALL = Arrays.asList(100, 102, 103);
+
+    public static final Integer RAW_GLASS_TASK_NEW = 0;
+    public static final Integer RAW_GLASS_TASK_SUCCESS = 1;
+    public static final Integer RAW_GLASS_TASK_FAILURE = 2;
+
+    /**
+     * 璁惧鍙�
+     */
+    public static final List<Integer> RAW_GLASS_DEVICE = Arrays.asList(1, 2, 3);
+
 
 }

--
Gitblit v1.8.0