From 3c1646a85f085cb0dd8dd386cdcdcd5a221adc4d Mon Sep 17 00:00:00 2001
From: zongzhibin <zongzhibin@weben-smart.com>
Date: 周五, 22 11月 2024 13:11:58 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine
---
CC/iWareCC_ASRS/Common/SystemWarningMsg.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/CC/iWareCC_ASRS/Common/SystemWarningMsg.cs b/CC/iWareCC_ASRS/Common/SystemWarningMsg.cs
index d1fb8f6..fa60209 100644
--- a/CC/iWareCC_ASRS/Common/SystemWarningMsg.cs
+++ b/CC/iWareCC_ASRS/Common/SystemWarningMsg.cs
@@ -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>
@@ -117,18 +117,18 @@
/// <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_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>
--
Gitblit v1.9.3