From 91d7afedf3ea51ee87ee47d4da2e1b6243f8fb84 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期日, 05 一月 2025 21:50:21 +0800
Subject: [PATCH] 1、大理片笼进片任务新增数量校验，当收到进片请求时，拿电气的玻璃数量与mes接收到的数量作比较，相同继续执行，不相同结束本次任务 2、李赛克文件优化，合中空玻璃每个间隔框的类型可能不同，需要在界面上做选择 3、中空设备号与格子号不匹配bug解决 4、自动报工存在接口调用异常，临时将调用接口回退原版本，待最新接口调用无异常后更新接口 5、fixbug:中空大理片详情界面删除接口异常
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java | 109 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 98 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 ccd0419..ea0cda4 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,8 +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 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);
/**
* 鍗у紡鐞嗙墖绗艰鎯呰〃鐜荤拑鐘舵��
@@ -57,14 +67,24 @@
public static final List<Integer> GLASS_STATE_IN_ALL_ZERO = Arrays.asList(0, 100, 102, 103, 104);
/**
- * 鍗у紡鐞嗙墖绗艰鎯呰〃鐜荤拑鐘舵��
- * 杩涚墖浠诲姟1
- * 鍑虹墖浠诲姟2
+ * 鍗х浠诲姟绫诲瀷
+ * 绌轰换鍔� 0
+ * 杩涚墖浠诲姟 1
+ * 鍑虹墖浠诲姟 2
+ * 鐩撮�氫换鍔� 3
+ * 杩涜涓� 4
+ * 缁撴潫 5
+ * 鍏朵粬 6
*/
+ public static final Integer GLASS_CACHE_TYPE_EMPTY = 0;
public static final Integer GLASS_CACHE_TYPE_IN = 1;
public static final Integer GLASS_CACHE_TYPE_OUT = 2;
public static final Integer GLASS_CACHE_TYPE_THROUGH = 3;
+ public static final Integer GLASS_CACHE_TYPE_RUNNING = 4;
+ public static final Integer GLASS_CACHE_TYPE_FINISH = 5;
+ public static final Integer GLASS_CACHE_TYPE_OTHER = 6;
public static final List<Integer> GLASS_CACHE_TYPE_OUT_ALL = Arrays.asList(2, 3);
+ public static final List<Integer> GLASS_CACHE_TYPE_IN_ALL = Arrays.asList(1, 3);
/**
* 纾ㄨ竟浠诲姟鐜荤拑鐘舵��
@@ -76,7 +96,7 @@
public static final Integer EDG_GLASS_SUCCESS = 2;
/**
- * 纾ㄨ竟浠诲姟鐜荤拑鐘舵��
+ * 澶х悊鐗囩鐘舵��
* 1鍗曟満鑷姩鐘舵��
* 2鑱旀満鑷姩鐘舵��
* 3鎵嬪姩鐘舵��
@@ -84,6 +104,20 @@
public static final Integer BIG_STORAGE_STAND_ALONE = 1;
public static final Integer BIG_STORAGE_ONLINE = 2;
public static final Integer BIG_STORAGE_MT = 3;
+
+ /**
+ * 澶х悊鐗囩浠诲姟绫诲瀷
+ * 1銆侀挗鍖栧墠杩涚墖
+ * 2銆侀挗鍖栧墠鍑虹墖
+ * 3銆侀挗鍖栧悗杩涚墖
+ * 4銆侀挗鍖栧悗鍑虹墖
+ */
+ public static final Integer BIG_STORAGE_BEFORE_IN = 1;
+ public static final Integer BIG_STORAGE_BEFORE_OUT = 2;
+ public static final Integer BIG_STORAGE_BEFORE_DISPATCH = 3;
+ public static final Integer BIG_STORAGE_AFTER_IN = 4;
+ public static final Integer BIG_STORAGE_AFTER_OUT = 5;
+ public static final Integer BIG_STORAGE_AFTER_DISPATCH = 6;
/**
* 澶х悊鐗囩璇锋眰
@@ -150,8 +184,9 @@
public static final Integer TEMPERING_START = 2;
public static final Integer TEMPERING_SUCCESS = 3;
public static final Integer TEMPERING_END = 4;
-// public static final Integer TEMPERING_DAMAGE = 8;
-// public static final Integer TEMPERING_TAKE = 9;
+ public static final Integer TEMPERING_PAUSE = 5;
+ public static final Integer TEMPERING_DAMAGE = 8;
+ public static final Integer TEMPERING_TAKE = 9;
/**
* 涓嬬墖
@@ -185,15 +220,20 @@
* 鍘熺墖浠撳偍浠诲姟绫诲瀷
* 杩涚墖浠诲姟1
* 鍑虹墖浠诲姟2
+ * 璋冨害浠诲姟3
+ * 杩涚墖璇锋眰4
+ * 鍑虹墖璇锋眰5
*/
public static final Integer RAW_GLASS_TASK_TYPE_IN = 1;
public static final Integer RAW_GLASS_TASK_TYPE_OUT = 2;
public static final Integer RAW_GLASS_TASK_TYPE_DISPATCH = 3;
+ public static final Integer RAW_GLASS_TASK_TYPE_IN_REQUEST = 4;
+ public static final Integer RAW_GLASS_TASK_TYPE_OUT_REQUEST = 5;
/**
- * 鍘熺墖浠撳偍浠诲姟绫诲瀷
- * 杩涚墖浠诲姟1
- * 鍑虹墖浠诲姟2
+ * 鍘熺墖浠撳偍浠诲姟鐘舵��
+ * 鏂板缓0
+ * 宸插畬鎴�1
*/
public static final Integer ENGINEERING_NEW = 0;
public static final Integer ENGINEERING_RUNNING = 1;
@@ -211,6 +251,53 @@
public static final Integer RAW_GLASS_STATE_WAIT_OUT = 102;
public static final Integer RAW_GLASS_STATE_RUNNING = 103;
public static final Integer RAW_GLASS_STATE_CAR = 104;
+ public static final List<Integer> RAW_GLASS_STATE_IN_ALL = Arrays.asList(100, 102, 103);
+ public static final Integer RAW_GLASS_TASK_NEW = 0;
+ public static final Integer RAW_GLASS_TASK_SUCCESS = 1;
+ public static final Integer RAW_GLASS_TASK_FAILURE = 2;
+
+ /**
+ * 璁惧鍙�
+ */
+ public static final List<Integer> RAW_GLASS_DEVICE = Arrays.asList(1, 2, 3);
+
+ /**
+ * 鍘熺墖涓婄墖鐘舵��
+ * 0 鏂板
+ * 100 宸插畬鎴�
+ */
+ public static final Integer LOAD_RAW_GLASS_NEW = 0;
+ public static final Integer LOAD_RAW_GLASS_SUCCESS = 100;
+
+ /**
+ * 澶х悊鐗囩浠诲姟鍚姩淇″彿
+ * 0 绌轰换鍔�
+ * 1 鍚姩
+ */
+ public static final Integer BIG_STORAGE_TASK_EMPTY = 0;
+ public static final Integer BIG_STORAGE_TASK_RUNNING = 1;
+
+ /**
+ * 涓┖澶х悊鐗囩鍑虹墖鐘舵�両
+ * 0 绌轰换鍔�
+ * 1 鍚姩
+ * 2 鏆傚仠
+ * 3 瀹屾垚
+ */
+ public static final Integer HOLLOW_FLOW_CARD_NEW = 0;
+ public static final Integer HOLLOW_FLOW_CARD_START = 1;
+ public static final Integer HOLLOW_FLOW_CARD_PAUSE = 2;
+ public static final Integer HOLLOW_FLOW_CARD_SUCCESS = 3;
+
+ /**
+ * 涓┖澶х悊鐗囩鍑虹墖鐘舵�両
+ * 0 鏈繘绗�
+ * 1 鍗犵敤
+ * 2 杩涚瀹屾垚
+ */
+ public static final Integer HOLLOW_RELATION_NEW = 0;
+ public static final Integer HOLLOW_RELATION_OCCUPY = 1;
+ public static final Integer HOLLOW_RELATION_SUCCESS = 2;
}
--
Gitblit v1.8.0