From 33308e16bbb153d9aac76fd703ec0f38ea7e344a Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 09 十月 2024 15:47:59 +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 | 57 +++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 39 insertions(+), 18 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..6b9a1de 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;
@@ -34,17 +35,26 @@
/**
* 鍗у紡鐞嗙墖绗艰鎯呰〃鐜荤拑鐘舵��
- * 璇嗗埆鍚庢垚鍔熺姸鎬�100
+ * 璇嗗埆鍚庢垚鍔熺姸鎬�0
+ * 璇嗗埆鍚庢垚鍔熻繘绗肩殑鐘舵��100
* 鍑虹墖浠诲姟101
* 浜哄伐涓嬬墖102
- * 鎷胯蛋200
- * 鐮存崯201
+ * 鍑虹墖涓�103
+ * 璋冨害涓�104
+ * 鐮存崯8
+ * 鎷胯蛋9
*/
+ public static final Integer GLASS_STATE_NEW = 0;
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_TAKE = 200;
- public static final Integer GLASS_STATE_DAMAGE = 201;
+ public static final Integer GLASS_STATE_OUT_ING = 103;
+ public static final Integer GLASS_STATE_SCHEDULE_ING = 104;
+ public static final Integer GLASS_STATE_DAMAGE = 8;
+ public static final Integer GLASS_STATE_TAKE = 9;
+ public static final List<Integer> GLASS_STATE_DAMAGE_TAKE = Arrays.asList(8, 9);
+ public static final List<Integer> GLASS_STATE_IN_ALL = Arrays.asList(100, 102, 103, 104);
+ public static final List<Integer> GLASS_STATE_IN_ALL_ZERO = Arrays.asList(0, 100, 102, 103, 104);
/**
* 鍗у紡鐞嗙墖绗艰鎯呰〃鐜荤拑鐘舵��
@@ -89,29 +99,30 @@
* 2 鍗ц浆绔嬭繘鐗囧畬鎴�
* 3 澶ц溅杩涚墖瀹屾垚
* 4 澶х悊鐗囩杩涚墖瀹屾垚
- * 5 澶х悊鐗囩杩涚墖澶辫触
- * 6 澶х悊鐗囩杩涚墖鐮存崯
+ * 8 澶х悊鐗囩杩涚墖鐮存崯
+ * 9 澶х悊鐗囩杩涚墖鎷胯蛋
*/
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;
- public static final Integer BIG_STORAGE_IN_ERROR = 5;
- public static final Integer BIG_STORAGE_IN_DAMAGE = 6;
+ // public static final Integer BIG_STORAGE_IN_DAMAGE = 8;
+// public static final Integer BIG_STORAGE_IN_ERROR = 9;
public static final List<Integer> BIG_STORAGE_IN_UP_ALL = Arrays.asList(1, 2);
/**
* 鍗ц浆绔嬪嚭鐗囪姹�
* 1 浠诲姟鐢熸垚
* 2 鐜荤拑杩涘ぇ杞﹀畬鎴�
* 3 澶ц溅鍑虹墖瀹屾垚
- * 4 澶х悊鐗囩杩涚墖澶辫触
- * 5 澶х悊鐗囩杩涚墖鐮存崯
+ * 8 澶х悊鐗囩杩涚墖鐮存崯
+ * 9 澶х悊鐗囩杩涚墖鎷胯蛋
*/
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;
- public static final Integer BIG_STORAGE_OUT_ERROR = 4;
- public static final Integer BIG_STORAGE_OUT_DAMAGE = 5;
+ // public static final Integer BIG_STORAGE_OUT_DAMAGE = 8;
+// public static final Integer BIG_STORAGE_OUT_ERROR = 9;
+ public static final List<Integer> BIG_STORAGE_OUT_ALL = Arrays.asList(2, 3);
/**
* 鍗ц浆绔嬪嚭鐗囪姹�
@@ -129,8 +140,8 @@
* 2 杩涚倝瀹屾垚
* 3 閽㈠寲瀹屾垚
* 4 鍑虹墖瀹屾垚
- * 5 鐮存崯
- * 6 鎷胯蛋
+ * 8 鐮存崯
+ * 9 鎷胯蛋
*/
public static final Integer TEMPERING_NEW = -1;
@@ -139,8 +150,8 @@
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;
+// public static final Integer TEMPERING_DAMAGE = 8;
+// public static final Integer TEMPERING_TAKE = 9;
/**
* 涓嬬墖
@@ -150,7 +161,8 @@
*/
public static final List<Integer> G06_WORK_STATION = Arrays.asList(1, 2, 3);
public static final List<Integer> G11_WORK_STATION = Arrays.asList(4, 5, 6);
- public static final List<Integer> G13_WORK_STATION = Arrays.asList(7);
+ public static final int G13_WORK_STATION = 7;
+ public static final List<Integer> WORK_STATION_ALL = Arrays.asList(1, 2, 3, 4, 5, 6, 7);
/**
* 鍚敤 1
@@ -159,4 +171,13 @@
public static final Integer SLOT_ON = 1;
public static final Integer SLOT_OFF = 0;
+ /**
+ * 涓嬬墖浠诲姟鐜荤拑鐘舵��
+ * 鐢熸垚浠诲姟0
+ * 鍑虹墖浠诲姟2
+ */
+ public static final Integer UNLOAD_GLASS_CREATE = 0;
+ public static final Integer UNLOAD_GLASS_OUT = 1;
+ public static final Integer UNLOAD_GLASS_DOWN = 2;
+
}
--
Gitblit v1.8.0