From 1e862ae4a11072451fa9b0449f13f48c0d98e91d Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 22 七月 2024 10:06:12 +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 | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 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 c9c1d4d..fe5c038 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,23 +18,34 @@
* 纾ㄨ竟娓呮礂鍓�
*/
/**
- * A09鍑虹墖鐩爣浣嶇疆 d02鍗ц浆绔� 閽㈠寲鍑虹墖 2001
- * A10鍑虹墖鐩爣浣嶇疆 d05鍗ц浆绔� 浜哄伐鍑虹墖 2002
+ * A09鍑虹墖鐩爣浣嶇疆 d02鍗ц浆绔� 2001
+ * A10鍑虹墖鐩爣浣嶇疆 d05鍗ц浆绔� 2002
*/
+ public static final Integer OUT_TARGET_POSITION_ZERO = 0;
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
* 浜哄伐涓嬬墖102
+ * 鍑虹墖涓�103
* 鎷胯蛋200
* 鐮存崯201
*/
public static final Integer GLASS_STATE_IN = 100;
public static final Integer GLASS_STATE_OUT = 101;
public static final Integer GLASS_STATE_ARTIFICIAL = 102;
+ public static final Integer GLASS_STATE_OUT_ING = 103;
public static final Integer GLASS_STATE_TAKE = 200;
public static final Integer GLASS_STATE_DAMAGE = 201;
@@ -81,21 +92,30 @@
* 2 鍗ц浆绔嬭繘鐗囧畬鎴�
* 3 澶ц溅杩涚墖瀹屾垚
* 4 澶х悊鐗囩杩涚墖瀹屾垚
+ * 5 澶х悊鐗囩杩涚墖澶辫触
+ * 6 澶х悊鐗囩杩涚墖鐮存崯
*/
public static final Integer BIG_STORAGE_IN_NEW = 1;
public static final Integer BIG_STORAGE_IN_UP = 2;
public static final Integer BIG_STORAGE_IN_CAR = 3;
public static final Integer BIG_STORAGE_IN_SLOT = 4;
+ public static final Integer BIG_STORAGE_IN_ERROR = 5;
+ public static final Integer BIG_STORAGE_IN_DAMAGE = 6;
public static final List<Integer> BIG_STORAGE_IN_UP_ALL = Arrays.asList(1, 2);
/**
* 鍗ц浆绔嬪嚭鐗囪姹�
* 1 浠诲姟鐢熸垚
* 2 鐜荤拑杩涘ぇ杞﹀畬鎴�
* 3 澶ц溅鍑虹墖瀹屾垚
+ * 4 澶х悊鐗囩杩涚墖澶辫触
+ * 5 澶х悊鐗囩杩涚墖鐮存崯
*/
public static final Integer BIG_STORAGE_OUT_NEW = 1;
public static final Integer BIG_STORAGE_OUT_CAR = 2;
public static final Integer BIG_STORAGE_OUT_SUCCESS = 3;
+ public static final Integer BIG_STORAGE_OUT_ERROR = 4;
+ public static final Integer BIG_STORAGE_OUT_DAMAGE = 5;
+ public static final List<Integer> BIG_STORAGE_OUT_ALL = Arrays.asList(2, 3);
/**
* 鍗ц浆绔嬪嚭鐗囪姹�
--
Gitblit v1.8.0