From 157f0b8a78b200bf68ce96a163d8d59432e78283 Mon Sep 17 00:00:00 2001
From: zongzhibin <zongzhibin@weben-smart.com>
Date: 周四, 28 11月 2024 14:38:07 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine
---
CC/iWareCC_ASRS/Common/SystemWarningMsg.cs | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/CC/iWareCC_ASRS/Common/SystemWarningMsg.cs b/CC/iWareCC_ASRS/Common/SystemWarningMsg.cs
index 2121757..e5efb8d 100644
--- a/CC/iWareCC_ASRS/Common/SystemWarningMsg.cs
+++ b/CC/iWareCC_ASRS/Common/SystemWarningMsg.cs
@@ -63,7 +63,7 @@
/// <summary>
/// RGV浠诲姟瀹屾垚纭鐨勮鍛婃秷鎭�
/// </summary>
- public static string _lbl_Alert_RgvReleaseFinish = string.Empty;
+ public static string _lbl_Alert_DataProcess_RobotBuffer_ModeChange = string.Empty;
/// <summary>
/// RGV浠诲姟瀹屾垚纭鐨勮鍛婃秷鎭紙琛ュ伩锛�
@@ -101,7 +101,7 @@
/// <summary>
/// 杈撻�佺嚎浠诲姟瀹屾垚纭鐨勮鍛婃秷鎭�
/// </summary>
- public static string _lbl_Alert_ConveyorsReleaseFinish = string.Empty;
+ public static string _lbl_Alert_DataProcess_ValidateQiTao = string.Empty;
/// <summary>
/// 娓呯悊鏁版嵁鐜板満 鐨勮鍛婃秷鎭�
@@ -111,7 +111,7 @@
/// <summary>
/// 绌烘墭鐩樿浆杩� 鐨勮鍛婃秷鎭�
/// </summary>
- public static string _lbl_Alert_EmptySalverTransfer = string.Empty;
+ public static string _lbl_Alert_DataProcess_RobotBuffer_AutoQiTaoOutbound = string.Empty;
/// <summary>
@@ -122,7 +122,10 @@
/// 鑷姩鐮佹澘浠诲姟 鐨勮鍛婃秷鎭�
/// </summary>
public static string _lbl_alert_DataProcess_BZ12 = string.Empty;
-
+ /// <summary>
+ /// 鑷姩鐮佹澘浠诲姟 鐨勮鍛婃秷鎭�
+ /// </summary>
+ public static string _lbl_alert_DataProcess_BZ21 = string.Empty;
/// <summary>
/// 鑷姩缁勭洏浠诲姟涓嬪彂 鐨勮鍛婃秷鎭�
/// </summary>
@@ -137,7 +140,7 @@
/// <summary>
/// 1014鍒�1020 鐨勮鍛婃秷鎭�
/// </summary>
- public static string _lbl_Alert_Place1014To1020TaskTask = string.Empty;
+ public static string _lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask = string.Empty;
/// <summary>
/// 鍑哄簱浠诲姟閫氱煡MES 鐨勮鍛婃秷鎭�
--
Gitblit v1.9.3