From 5e82a6f55d6f306a15fbf5d3f1855a647df7a105 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 04 七月 2024 16:55:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java | 48 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 36 insertions(+), 12 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 b18d95d..89dbb29 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
@@ -18,17 +18,25 @@
* 纾ㄨ竟娓呮礂鍓�
*/
/**
- * A09鍑虹墖鐩爣浣嶇疆 d02鍗ц浆绔� 閽㈠寲鍑虹墖 2001
- * A10鍑虹墖鐩爣浣嶇疆 d05鍗ц浆绔� 浜哄伐鍑虹墖 2002
+ * A09鍑虹墖鐩爣浣嶇疆 d02鍗ц浆绔� 2001
+ * A10鍑虹墖鐩爣浣嶇疆 d05鍗ц浆绔� 2002
*/
public static final Integer A09_OUT_TARGET_POSITION = 2001;
public static final Integer A10_OUT_TARGET_POSITION = 2002;
+
+
+ /**
+ * A09鍑虹墖鐩爣浣嶇疆 d02鍗ц浆绔� 閽㈠寲鍑虹墖 3001
+ * A10鍑虹墖鐩爣浣嶇疆 d05鍗ц浆绔� 浜哄伐鍑虹墖 3002
+ */
+ public static final Integer TEMPERING_OUT_TARGET_POSITION = 3001;
+ public static final Integer ARTIFICIAL_OUT_TARGET_POSITION = 3002;
/**
* 鍗у紡鐞嗙墖绗艰鎯呰〃鐜荤拑鐘舵��
* 璇嗗埆鍚庢垚鍔熺姸鎬�100
* 鍑虹墖浠诲姟101
- * 浜哄伐涓嬬墖101
+ * 浜哄伐涓嬬墖102
* 鎷胯蛋200
* 鐮存崯201
*/
@@ -41,7 +49,6 @@
/**
* 鍗у紡鐞嗙墖绗艰鎯呰〃鐜荤拑鐘舵��
* 杩涚墖浠诲姟1
- * 鍑虹墖浠诲姟2
* 鍑虹墖浠诲姟2
*/
public static final Integer GLASS_CACHE_TYPE_IN = 1;
@@ -132,13 +139,30 @@
* 6 鎷胯蛋
*/
- public static final Integer TEMPERING_NEW =-1;
- public static final Integer TEMPERING_OUT =0;
- public static final Integer TEMPERING_DROP =1;
- 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_NEW = -1;
+ public static final Integer TEMPERING_OUT = 0;
+ public static final Integer TEMPERING_DROP = 1;
+ 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 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);
+
+ /**
+ * 鍚敤 1
+ * 绂佺敤 0
+ */
+ public static final Integer SLOT_ON = 1;
+ public static final Integer SLOT_OFF = 0;
}
--
Gitblit v1.8.0