From 9887fc7be1578f465eee608e55b65097fa417d4c Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 06 八月 2024 14:38:10 +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 | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 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 f8a310c..2c2763a 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,22 +30,30 @@
* A09鍑虹墖鐩爣浣嶇疆 d02鍗ц浆绔� 閽㈠寲鍑虹墖 3001
* A10鍑虹墖鐩爣浣嶇疆 d05鍗ц浆绔� 浜哄伐鍑虹墖 3002
*/
- public static final Integer TEMPERING_OUT_TARGET_POSITION = 3002;
+ public static final Integer TEMPERING_OUT_TARGET_POSITION = 3001;
public static final Integer ARTIFICIAL_OUT_TARGET_POSITION = 3002;
/**
* 鍗у紡鐞嗙墖绗艰鎯呰〃鐜荤拑鐘舵��
- * 璇嗗埆鍚庢垚鍔熺姸鎬�100
+ * 璇嗗埆鍚庢垚鍔熺姸鎬�0
+ * 璇嗗埆鍚庢垚鍔熻繘绗肩殑鐘舵��100
* 鍑虹墖浠诲姟101
* 浜哄伐涓嬬墖102
+ * 鍑虹墖涓�103
+ * 璋冨害涓�104
* 鎷胯蛋200
* 鐮存崯201
*/
+ public static final Integer GLASS_STATE_NEW = 0;
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_SCHEDULE_ING = 104;
public static final Integer GLASS_STATE_TAKE = 200;
public static final Integer GLASS_STATE_DAMAGE = 201;
+ public static final List<Integer> GLASS_STATE_IN_ALL = Arrays.asList(100, 102, 103, 104);
+ public static final List<Integer> GLASS_STATE_IN_ALL_ZERO = Arrays.asList(0, 100, 102, 103, 104);
/**
* 鍗у紡鐞嗙墖绗艰鎯呰〃鐜荤拑鐘舵��
@@ -113,6 +121,7 @@
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);
/**
* 鍗ц浆绔嬪嚭鐗囪姹�
@@ -151,7 +160,8 @@
*/
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);
+ public static final int G13_WORK_STATION = 7;
+ public static final List<Integer> WORK_STATION_ALL = Arrays.asList(1, 2, 3, 4, 5, 6, 7);
/**
* 鍚敤 1
--
Gitblit v1.8.0