From a851a0eb0b9c5a8a5e9e4b038fbd1f0bf5f58bbc Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 21 六月 2024 16:12:08 +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 | 15 +++++----------
1 files changed, 5 insertions(+), 10 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 d1589ea..b18d95d 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,8 +18,8 @@
* 纾ㄨ竟娓呮礂鍓�
*/
/**
- * A09鍑虹墖鐩爣浣嶇疆2001
- * A10鍑虹墖鐩爣浣嶇疆2002
+ * A09鍑虹墖鐩爣浣嶇疆 d02鍗ц浆绔� 閽㈠寲鍑虹墖 2001
+ * A10鍑虹墖鐩爣浣嶇疆 d05鍗ц浆绔� 浜哄伐鍑虹墖 2002
*/
public static final Integer A09_OUT_TARGET_POSITION = 2001;
public static final Integer A10_OUT_TARGET_POSITION = 2002;
@@ -73,8 +73,8 @@
* 0 澶х悊鐗囩鏃犺姹�
* 1 澶х悊鐗囩杩涚墖璇锋眰
*/
- public static final Integer BIG_STORAGE_REQUEST = 0;
- public static final Integer BIG_STORAGE_REQUEST_IN = 1;
+ public static final String BIG_STORAGE_REQUEST = "0";
+ public static final String BIG_STORAGE_REQUEST_IN = "1";
/**
* 澶х悊鐗囩璇︽儏鐘舵��
@@ -101,6 +101,7 @@
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 List<Integer> BIG_STORAGE_IN_UP_ALL = Arrays.asList(1, 2);
/**
* 鍗ц浆绔嬪嚭鐗囪姹�
* 1 浠诲姟鐢熸垚
@@ -118,12 +119,6 @@
*/
public static final Integer BIG_STORAGE_IN_WAIT = 1;
public static final Integer BIG_STORAGE_IN_RUN = 2;
-
- /**
- * 澶х悊鐗囩瀹藉害 鍙� 鐜荤拑闂磋窛
- */
- public static final Integer BIG_STORAGE_WIDTH = 5000;
- public static final Integer BIG_STORAGE_GAP = 20;
/**
* 閽㈠寲灏忕墖琛�
--
Gitblit v1.8.0