From 248201a7262e952f7e4a88b37d937cf1a7237644 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 03 12月 2024 14:44:51 +0800
Subject: [PATCH] 2
---
CC/iWareCC_ASRS/DeviceThreadFactory/DeviceThreadService/SrmThreadService/SrmTaskThreadService.cs | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/CC/iWareCC_ASRS/DeviceThreadFactory/DeviceThreadService/SrmThreadService/SrmTaskThreadService.cs b/CC/iWareCC_ASRS/DeviceThreadFactory/DeviceThreadService/SrmThreadService/SrmTaskThreadService.cs
index 13eac56..15dcb96 100644
--- a/CC/iWareCC_ASRS/DeviceThreadFactory/DeviceThreadService/SrmThreadService/SrmTaskThreadService.cs
+++ b/CC/iWareCC_ASRS/DeviceThreadFactory/DeviceThreadService/SrmThreadService/SrmTaskThreadService.cs
@@ -89,9 +89,9 @@
{
IssueTaskHandle(i_deviceId, out errMsg4);
}
- SystemWarningMsg._lbl_Alert_Srm1Release = errMsg1;
+ SystemWarningMsg._lbl_Alert_DataProcess_BZ39_IssueInboundTask = errMsg1;
SystemWarningMsg._lbl_Alert_Srm2Release = errMsg2;
- SystemWarningMsg._lbl_Alert_Srm3Release = errMsg3;
+
SystemWarningMsg._lbl_Alert_Srm4Release = errMsg4;
Thread.Sleep(2000);//2绉掍竴娆�
}
@@ -577,9 +577,9 @@
ConfirmFinishTaskHandle(i_deviceId, out errMsg4);
}
SystemWarningMsg._lbl_Alert_Srm1ReleaseFinish = errMsg1;
- SystemWarningMsg._lbl_Alert_Srm2ReleaseFinish = errMsg2;
- SystemWarningMsg._lbl_Alert_Srm3ReleaseFinish = errMsg3;
- SystemWarningMsg._lbl_Alert_Srm4ReleaseFinish = errMsg4;
+ SystemWarningMsg._lbl_Alert_DataProcess_BZ12_FinishTask = errMsg2;
+ SystemWarningMsg._lbl_Alert_DataProcess_BZ21_FinishTask = errMsg3;
+ SystemWarningMsg._lbl_Alert_DataProcess_BZ21 = errMsg4;
Thread.Sleep(2000);//璁剧疆2绉掍竴娆�
}
}
@@ -700,18 +700,18 @@
if (!sdaResult.result)
{
- Log4NetHelper.WriteInfoLog(iWareCommon.Utils.LogType.SrmTheadService, "鍒ゆ柇鏄汉宸ュ彂閫佺殑浠诲姟锛屽崟鐙粰鍫嗗灈鏈哄彂閫佷换鍔″畬鎴愪俊鍙凤紝銆愬け璐ャ�戯紝璁惧鍙�:" + deviceId + ",浠诲姟鍙�:" + taskId);
+ Log4NetHelper.WriteInfoLog(iWareCommon.Utils.LogType.DataProcess_BZ39_IssueInboundTask, "鍒ゆ柇鏄汉宸ュ彂閫佺殑浠诲姟锛屽崟鐙粰鍫嗗灈鏈哄彂閫佷换鍔″畬鎴愪俊鍙凤紝銆愬け璐ャ�戯紝璁惧鍙�:" + deviceId + ",浠诲姟鍙�:" + taskId);
return false;
}
else
{
- Log4NetHelper.WriteInfoLog(iWareCommon.Utils.LogType.SrmTheadService, "鍒ゆ柇鏄汉宸ュ彂閫佺殑浠诲姟锛屽崟鐙粰鍫嗗灈鏈哄彂閫佷换鍔″畬鎴愪俊鍙凤紝銆愭垚鍔熴�戯紝璁惧鍙�:" + deviceId + ",浠诲姟鍙�:" + taskId);
+ Log4NetHelper.WriteInfoLog(iWareCommon.Utils.LogType.DataProcess_BZ39_IssueInboundTask, "鍒ゆ柇鏄汉宸ュ彂閫佺殑浠诲姟锛屽崟鐙粰鍫嗗灈鏈哄彂閫佷换鍔″畬鎴愪俊鍙凤紝銆愭垚鍔熴�戯紝璁惧鍙�:" + deviceId + ",浠诲姟鍙�:" + taskId);
return true;
}
}
catch (Exception ex)
{
- Log4NetHelper.WriteErrorLog(iWareCommon.Utils.LogType.SrmTheadService, "鍒ゆ柇鏄汉宸ュ彂閫佺殑浠诲姟锛屽崟鐙粰鍫嗗灈鏈哄彂閫佷换鍔″畬鎴愪俊鍙凤紝銆愬紓甯搞�戯紝璁惧鍙�:" + deviceId + ",浠诲姟鍙�:" + taskId + ",ex:" + ex.Message, ex);
+ Log4NetHelper.WriteErrorLog(iWareCommon.Utils.LogType.DataProcess_BZ39_IssueInboundTask, "鍒ゆ柇鏄汉宸ュ彂閫佺殑浠诲姟锛屽崟鐙粰鍫嗗灈鏈哄彂閫佷换鍔″畬鎴愪俊鍙凤紝銆愬紓甯搞�戯紝璁惧鍙�:" + deviceId + ",浠诲姟鍙�:" + taskId + ",ex:" + ex.Message, ex);
throw ex;
}
}
--
Gitblit v1.9.3