From 041d9bd56e7e761af3df78a39e9c8f629868f360 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 18 十二月 2024 09:54:40 +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 | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 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 a05dfe6..731b871 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,18 +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 List<Integer> OUT_TARGET_POSITION_ALL = Arrays.asList(3001, 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);
+// /**
+// * 涔変箤纾ㄨ竟绾�
+// * 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);
/**
* 鍗у紡鐞嗙墖绗艰鎯呰〃鐜荤拑鐘舵��
--
Gitblit v1.8.0