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 | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 419a29e..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
@@ -36,10 +36,10 @@
* 蹇欑 1
* 绂佺敤 2
*/
- public static final String OUT_FREE = "0";
- public static final String OUT_BUSY = "1";
- public static final String OUT_DISABLE = "2";
- public static final List<String> OUT_DISABLE_ALL = Arrays.asList("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);
/**
@@ -57,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