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 | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/CC/iWareCC_ASRS/Common/SystemWarningMsg.cs b/CC/iWareCC_ASRS/Common/SystemWarningMsg.cs
index d1fb8f6..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浠诲姟瀹屾垚纭鐨勮鍛婃秷鎭紙琛ュ伩锛�
@@ -78,7 +78,7 @@
/// <summary>
/// 澶勭悊铏氭嫙鍑哄簱鐨勫嚭搴撹鍒掍换鍔＄殑璀﹀憡娑堟伅
/// </summary>
- public static string _lbl_Alert_VirtualTaskNoOutPlanTaskHandler = string.Empty;
+ public static string _lbl_Alert_DataProcess_RobotBuffer_FinishTask = string.Empty;
/// <summary>
/// 浠诲姟鍒嗚В绾跨▼鐨勬秷鎭�
@@ -90,7 +90,7 @@
/// </summary>
public static string _lbl_Alert_MainTaskDecompose_ZPRK = string.Empty;
- public static string _lbl_Alert_LineInScan = string.Empty;
+ public static string _lbl_Alert_DataProcess_RobotBuffer_FinishTaskForOutbound = string.Empty;
/// <summary>
@@ -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,30 +111,36 @@
/// <summary>
/// 绌烘墭鐩樿浆杩� 鐨勮鍛婃秷鎭�
/// </summary>
- public static string _lbl_Alert_EmptySalverTransfer = string.Empty;
+ public static string _lbl_Alert_DataProcess_RobotBuffer_AutoQiTaoOutbound = string.Empty;
/// <summary>
/// 鑷姩缁勭洏浠诲姟 鐨勮鍛婃秷鎭�
/// </summary>
- public static string _lbl_alert_AutoSalverMaterialBindTask = string.Empty;
-
-
+ public static string _lbl_alert_DataProcess_BZ39 = string.Empty;
+ /// <summary>
+ /// 鑷姩鐮佹澘浠诲姟 鐨勮鍛婃秷鎭�
+ /// </summary>
+ public static string _lbl_alert_DataProcess_BZ12 = string.Empty;
+ /// <summary>
+ /// 鑷姩鐮佹澘浠诲姟 鐨勮鍛婃秷鎭�
+ /// </summary>
+ public static string _lbl_alert_DataProcess_BZ21 = string.Empty;
/// <summary>
/// 鑷姩缁勭洏浠诲姟涓嬪彂 鐨勮鍛婃秷鎭�
/// </summary>
- public static string _lbl_alert_AutoIssueInStoreTask = string.Empty;
+ public static string _lbl_alert_DataProcess_BZ01 = string.Empty;
/// <summary>
/// 閲嶆柊鑾峰彇鍙戝姩鏈轰俊鎭� 鐨勮鍛婃秷鎭�
/// </summary>
- public static string _lbl_alert_AutoUpdateEngineInfoTask = string.Empty;
+ public static string _lbl_alert_DataProcess_269 = string.Empty;
/// <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