From 0aacd330fca570ab3350aef5bda901f23aee23b3 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 20 十一月 2024 13:51:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java | 37 ++++++++++++++++++++++++++++++++++---
1 files changed, 34 insertions(+), 3 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 29c8e17..a05dfe6 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
@@ -30,8 +30,18 @@
* A09鍑虹墖鐩爣浣嶇疆 d02鍗ц浆绔� 閽㈠寲鍑虹墖 3001
* A10鍑虹墖鐩爣浣嶇疆 d05鍗ц浆绔� 浜哄伐鍑虹墖 3002
*/
- public static final Integer TEMPERING_OUT_TARGET_POSITION = 3001;
- public static final Integer ARTIFICIAL_OUT_TARGET_POSITION = 3002;
+// public static final Integer TEMPERING_OUT_TARGET_POSITION = 3001;
+// public static final Integer ARTIFICIAL_OUT_TARGET_POSITION = 3002;
+// public static final List<Integer> OUT_TARGET_POSITION_ALL = Arrays.asList(3001, 3002);
+
+ /**
+ * 涔変箤纾ㄨ竟绾�
+ * A09鍑虹墖鐩爣浣嶇疆 d02鍗ц浆绔� 閽㈠寲鍑虹墖 930
+ * A10鍑虹墖鐩爣浣嶇疆 d05鍗ц浆绔� 浜哄伐鍑虹墖 931
+ */
+ public static final Integer TEMPERING_OUT_TARGET_POSITION = 930;
+ public static final Integer ARTIFICIAL_OUT_TARGET_POSITION = 931;
+ public static final List<Integer> OUT_TARGET_POSITION_ALL = Arrays.asList(930, 931);
/**
* 鍗у紡鐞嗙墖绗艰鎯呰〃鐜荤拑鐘舵��
@@ -85,7 +95,7 @@
public static final Integer EDG_GLASS_SUCCESS = 2;
/**
- * 纾ㄨ竟浠诲姟鐜荤拑鐘舵��
+ * 澶х悊鐗囩鐘舵��
* 1鍗曟満鑷姩鐘舵��
* 2鑱旀満鑷姩鐘舵��
* 3鎵嬪姩鐘舵��
@@ -93,6 +103,20 @@
public static final Integer BIG_STORAGE_STAND_ALONE = 1;
public static final Integer BIG_STORAGE_ONLINE = 2;
public static final Integer BIG_STORAGE_MT = 3;
+
+ /**
+ * 澶х悊鐗囩浠诲姟绫诲瀷
+ * 1銆侀挗鍖栧墠杩涚墖
+ * 2銆侀挗鍖栧墠鍑虹墖
+ * 3銆侀挗鍖栧悗杩涚墖
+ * 4銆侀挗鍖栧悗鍑虹墖
+ */
+ public static final Integer BIG_STORAGE_BEFORE_IN = 1;
+ public static final Integer BIG_STORAGE_BEFORE_OUT = 2;
+ public static final Integer BIG_STORAGE_BEFORE_DISPATCH = 3;
+ public static final Integer BIG_STORAGE_AFTER_IN = 4;
+ public static final Integer BIG_STORAGE_AFTER_OUT = 5;
+ public static final Integer BIG_STORAGE_AFTER_DISPATCH = 6;
/**
* 澶х悊鐗囩璇锋眰
@@ -244,5 +268,12 @@
public static final Integer LOAD_RAW_GLASS_NEW = 0;
public static final Integer LOAD_RAW_GLASS_SUCCESS = 100;
+ /**
+ * 澶х悊鐗囩浠诲姟鍚姩淇″彿
+ * 0 绌轰换鍔�
+ * 1 鍚姩
+ */
+ public static final Integer BIG_STORAGE_TASK_EMPTY = 0;
+ public static final Integer BIG_STORAGE_TASK_RUNNING = 1;
}
--
Gitblit v1.8.0