From 272ea6040258a7adfc807123036378915860fb90 Mon Sep 17 00:00:00 2001
From: zongzhibin <zongzhibin@weben-smart.com>
Date: 周日, 24 11月 2024 14:23:31 +0800
Subject: [PATCH] add
---
CC/iWareCC_ASRS/DeviceThreadFactory/DeviceThreadService/RgvThreadService/RgvTaskThreadService.cs | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/CC/iWareCC_ASRS/DeviceThreadFactory/DeviceThreadService/RgvThreadService/RgvTaskThreadService.cs b/CC/iWareCC_ASRS/DeviceThreadFactory/DeviceThreadService/RgvThreadService/RgvTaskThreadService.cs
index 1d1ed75..aa477b0 100644
--- a/CC/iWareCC_ASRS/DeviceThreadFactory/DeviceThreadService/RgvThreadService/RgvTaskThreadService.cs
+++ b/CC/iWareCC_ASRS/DeviceThreadFactory/DeviceThreadService/RgvThreadService/RgvTaskThreadService.cs
@@ -536,7 +536,7 @@
{
ConfirmFinishTaskHandle(i_deviceId, out errMsg);
}
- SystemWarningMsg._lbl_Alert_RgvReleaseFinish = errMsg;
+ SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_ModeChange = errMsg;
Thread.Sleep(2000);
}
@@ -681,7 +681,7 @@
catch (Exception ex)
{
errMsg = "鍑虹幇寮傚父:" + ex.Message;
- Log4NetHelper.WriteErrorLog(LogType.RgvThreadService, errMsg, ex);
+ Log4NetHelper.WriteErrorLog(LogType.StationThreadService, errMsg, ex);
TaskRequestLogHandler.InsertTask(base.currentLogType, RequestStatusEnum.璇锋眰澶辫触, JsonConvert.SerializeObject(confirmTaskFinish), log, ex);
trans.Rollback();
return;
@@ -747,14 +747,14 @@
bool rgvFinishAck = FormCC.rgvView.W_RGV_FinishACK;
errMsg = $"RGV浠诲姟瀹屾垚纭琛ュ伩绾跨▼淇℃伅,鑾峰彇淇℃伅锛歳gvTaskId:{rgvTaskId},isRgvFinish:{isRgvFinish},rgvFinishAck:{rgvFinishAck}";
- Log4NetHelper.WriteInfoLog(LogType.RgvThreadService, errMsg);
+ Log4NetHelper.WriteInfoLog(LogType.StationThreadService, errMsg);
//濡傛灉ack涓篺alse锛宖inish涓簍rue锛屽苟涓� wms鐨勮浠诲姟涓� 宸插畬鎴愶紝鍒欒〃绀洪渶瑕佽ˉ鍋�
Task_Part currentTask = null;
if (rgvTaskId > 0 && rgvFinishAck == false && isRgvFinish == true)
{
errMsg = $"RGV浠诲姟瀹屾垚纭琛ュ伩绾跨▼淇℃伅,鍒濇绗﹀悎鏉′欢锛歳gvTaskId:{rgvTaskId},isRgvFinish:{isRgvFinish},rgvFinishAck:{rgvFinishAck}";
- Log4NetHelper.WriteInfoLog(LogType.RgvThreadService, errMsg);
+ Log4NetHelper.WriteInfoLog(LogType.StationThreadService, errMsg);
using (DbModel dbModel = new DbModel())
{
@@ -774,25 +774,25 @@
if (ts.Seconds > 10)
{//鍙湁 宸插畬鎴愪换鍔℃椂闂磋秴鍑哄綋鍓�3绉掑悗锛屾墠鑳藉鐞嗭紒
errMsg = $"RGV浠诲姟瀹屾垚纭琛ュ伩绾跨▼淇℃伅,鍑嗗澶勭悊锛歳gvTaskId:{rgvTaskId},isRgvFinish:{isRgvFinish},rgvFinishAck:{rgvFinishAck}";
- Log4NetHelper.WriteInfoLog(LogType.RgvThreadService, errMsg);
+ Log4NetHelper.WriteInfoLog(LogType.StationThreadService, errMsg);
var confirmTaskFinish = new RgvService.RgvServiceClient().WriteRGV_FinishACK((int)EDevice.RGV, true, Convert.ToInt32(currentTask.PlcTaskId));
if (!confirmTaskFinish.result)
{
errMsg = $"RGV浠诲姟瀹屾垚纭琛ュ伩绾跨▼澶辫触锛歳gvTaskId:{rgvTaskId},SDA杩斿洖:" + confirmTaskFinish.resMsg;
- Log4NetHelper.WriteErrorLog(LogType.RgvThreadService, errMsg, null);
+ Log4NetHelper.WriteErrorLog(LogType.StationThreadService, errMsg, null);
return;
}
else
{
errMsg = $"RGV浠诲姟瀹屾垚纭琛ュ伩绾跨▼鎴愬姛{rgvTaskId}锛歳gvTaskId:{rgvTaskId}";
- Log4NetHelper.WriteInfoLog(LogType.RgvThreadService, errMsg);
+ Log4NetHelper.WriteInfoLog(LogType.StationThreadService, errMsg);
}
}
else
{
errMsg = $"RGV浠诲姟瀹屾垚纭琛ュ伩绾跨▼淇℃伅,鏈秴杩�3绉掞紝涓嶅鐞嗭細rgvTaskId:{rgvTaskId},isRgvFinish:{isRgvFinish},rgvFinishAck:{rgvFinishAck}";
- Log4NetHelper.WriteInfoLog(LogType.RgvThreadService, errMsg);
+ Log4NetHelper.WriteInfoLog(LogType.StationThreadService, errMsg);
return;
}
}
@@ -818,7 +818,7 @@
catch (Exception ex)
{
errMsg = "RGV浠诲姟瀹屾垚纭琛ュ伩绾跨▼-鍑虹幇寮傚父:" + ex.Message;
- Log4NetHelper.WriteErrorLog(LogType.RgvThreadService, errMsg, ex);
+ Log4NetHelper.WriteErrorLog(LogType.StationThreadService, errMsg, ex);
return;
}
}
@@ -924,18 +924,18 @@
if (sdaResult.result == false)
{//缁橰gv涓嬪彂鎸囦护澶辫触
errMsg = sdaResult.resMsg;
- Log4NetHelper.WriteErrorLog(LogType.RgvThreadService, errMsg, null);
+ Log4NetHelper.WriteErrorLog(LogType.StationThreadService, errMsg, null);
return;
}
else
{
- Log4NetHelper.WriteInfoLog(LogType.RgvThreadService, "鍙戝姩鏈哄嚭搴擄紝缁欒タ娓疨LC鍙戦�佸彂鍔ㄦ満鏁版嵁,涓讳换鍔″彿:" + mainTask.Id);
+ Log4NetHelper.WriteInfoLog(LogType.StationThreadService, "鍙戝姩鏈哄嚭搴擄紝缁欒タ娓疨LC鍙戦�佸彂鍔ㄦ満鏁版嵁,涓讳换鍔″彿:" + mainTask.Id);
}
}
catch (Exception ex)
{
errMsg = "鍑虹幇寮傚父:" + ex.Message;
- Log4NetHelper.WriteErrorLog(LogType.RgvThreadService, errMsg, ex);
+ Log4NetHelper.WriteErrorLog(LogType.StationThreadService, errMsg, ex);
return;
}
}
--
Gitblit v1.9.3