From b21caa5499c50384f3a3a5dd795a7a0ad197d36f Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 06 十一月 2025 21:26:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java | 18 +++++++++++++++++-
1 files changed, 17 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 014aec6..dd01336 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
@@ -25,6 +25,22 @@
public static final Integer A09_OUT_TARGET_POSITION = 2001;
public static final Integer A10_OUT_TARGET_POSITION = 2002;
+ /**
+ * 鍗у紡鐞嗙墖鍑虹墖鐩爣鏂瑰悜
+ */
+ public static final Integer ONE_OUT_TARGET_POSITION = 1;
+ public static final Integer TWO_OUT_TARGET_POSITION = 2;
+ /**
+ * 鍗у紡鐞嗙墖 纾ㄨ竟鍓嶇墖鍙扮姸鎬�
+ * 绌洪棽 0
+ * 蹇欑 1
+ * 绂佺敤 2
+ */
+ public static final Integer OUT_FREE = 0;
+ public static final Integer OUT_BUSY = 1;
+ public static final Integer OUT_DISABLE = 2;
+ public static final List<Integer> OUT_DISABLE_ALL = Arrays.asList(1, 2);
+
/**
* A09鍑虹墖鐩爣浣嶇疆 d02鍗ц浆绔� 閽㈠寲鍑虹墖 3001
@@ -41,7 +57,7 @@
*/
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);
+ public static final List<Integer> OUT_TARGET_POSITION_ALL = Arrays.asList(930, 931, 932);
/**
* 鍗у紡鐞嗙墖绗艰鎯呰〃鐜荤拑鐘舵��
--
Gitblit v1.8.0