From 461ef6c5aac44da10ca579cd7d14ae6686f4a4b5 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 11 12月 2024 17:58:45 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine

---
 CC/iWareCC_ASRS/DeviceThreadFactory/DeviceThreadService/RgvThreadService/RgvTaskThreadService.cs |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CC/iWareCC_ASRS/DeviceThreadFactory/DeviceThreadService/RgvThreadService/RgvTaskThreadService.cs b/CC/iWareCC_ASRS/DeviceThreadFactory/DeviceThreadService/RgvThreadService/RgvTaskThreadService.cs
index 2442caa..82b405b 100644
--- a/CC/iWareCC_ASRS/DeviceThreadFactory/DeviceThreadService/RgvThreadService/RgvTaskThreadService.cs
+++ b/CC/iWareCC_ASRS/DeviceThreadFactory/DeviceThreadService/RgvThreadService/RgvTaskThreadService.cs
@@ -76,7 +76,7 @@
                 {
                     IssueTaskHandle(i_deviceId, out errMsg);
                 }
-                SystemWarningMsg._lbl_Alert_RgvRelease = errMsg;
+                SystemWarningMsg._lbl_Alert_PushPaperCutToMes = errMsg;
                 Thread.Sleep(2000);//2绉掍竴娆�
             }
 
@@ -536,7 +536,7 @@
                 {
                     ConfirmFinishTaskHandle(i_deviceId, out errMsg);
                 }
-                SystemWarningMsg._lbl_Alert_RgvReleaseFinish = errMsg;
+                SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_ModeChange = errMsg;
                 Thread.Sleep(2000);
             }
 

--
Gitblit v1.9.3