From 31553fc8b224d70f4415e9edf4098587dea44e3f Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 27 六月 2024 13:27:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 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 86b915f..936d473 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
@@ -42,7 +42,6 @@
* 鍗у紡鐞嗙墖绗艰鎯呰〃鐜荤拑鐘舵��
* 杩涚墖浠诲姟1
* 鍑虹墖浠诲姟2
- * 鍑虹墖浠诲姟2
*/
public static final Integer GLASS_CACHE_TYPE_IN = 1;
public static final Integer GLASS_CACHE_TYPE_OUT = 2;
@@ -77,6 +76,20 @@
public static final String BIG_STORAGE_REQUEST_IN = "1";
/**
+ * 澶х悊鐗囩璇︽儏鐘舵��
+ * 0 澶х悊鐗囩杩涚墖涓�
+ * 1 澶х悊鐗囩鍦ㄧ鍐�
+ * 2 澶х悊鐗囩鍑虹墖涓�
+ * 3 澶х悊鐗囩鍑虹墖瀹屾垚
+ * 4 澶х悊鐗囩鎵嬪姩鍑虹墖
+ */
+ public static final Integer BIG_STORAGE_IN = 0;
+ public static final Integer BIG_STORAGE_INSIDE = 1;
+ public static final Integer BIG_STORAGE_OUT = 2;
+ public static final Integer BIG_STORAGE_OUTSIDE = 3;
+ public static final Integer BIG_STORAGE_MANUAL = 4;
+
+ /**
* 鍗ц浆绔嬭繘鐗囪姹�
* 1 浠诲姟鐢熸垚
* 2 鍗ц浆绔嬭繘鐗囧畬鎴�
@@ -105,12 +118,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