From 0c1f670d60c130a26b2d4273b3b858d8d6900541 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 10 12月 2024 11:20:34 +0800
Subject: [PATCH] 22
---
CC/iWareCC_ASRS/Handler/DeviceWarningHandler.cs | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/CC/iWareCC_ASRS/Handler/DeviceWarningHandler.cs b/CC/iWareCC_ASRS/Handler/DeviceWarningHandler.cs
index 7031278..b100a0d 100644
--- a/CC/iWareCC_ASRS/Handler/DeviceWarningHandler.cs
+++ b/CC/iWareCC_ASRS/Handler/DeviceWarningHandler.cs
@@ -54,7 +54,7 @@
/// <param name="deviceName"></param>
/// <param name="warningCode"></param>
/// <param name="warningContent"></param>
- public static void SaveWarning(EDevice device, LogType _LogType, string warningCode, int deviceAreaCode, string warningContent,int deviceWarningType)
+ public static void SaveWarning(EDevice device, LogType _LogType, string warningCode, int deviceAreaCode, string warningContent, int deviceWarningType)
{
Task.Run(() =>
{
@@ -69,7 +69,7 @@
WarningTime = DateTime.Now,
CreateUserName = SysGloble.WCSSystem,
DeviceAreaCode = deviceAreaCode,
- DeviceWarningType= deviceWarningType,
+ DeviceWarningType = deviceWarningType,
DurationTime = "",
CreateTime = DateTime.Now,
@@ -100,23 +100,22 @@
/// <param name="deviceId">璁惧鍖哄煙</param>
/// <param name="_LogType"></param>
/// <returns></returns>
- public static void AutoCloseWarning(EDevice device, LogType _LogType, System.Collections.Generic.List<string> warningAddressList)
+ public static void AutoCloseWarning(EDevice device, LogType _LogType, System.Collections.Generic.List<string> warningCodeList)
{
Task.Run(() =>
{
try
{
- string deviceCode = ((int)device).ToString();
using (WmsDBModel edm = new WmsDBModel())
{
- var dataList = edm.wms_record_device_warning.Where(x => x.WarningCode == deviceCode && x.DeviceWarningStatus == 0).ToList();
+ var dataList = edm.wms_record_device_warning.Where(x => x.DeviceWarningStatus == 0).ToList();
if (dataList != null && dataList.Count > 0)
{
var msg = "";
var nowDate = DateTime.Now;
foreach (var detail in dataList)
{
- if (!warningAddressList.Contains(detail.WarningCode))
+ if (!warningCodeList.Contains(detail.WarningCode))
{
nowDate = DateTime.Now;
detail.DeviceWarningStatus = 1; //鐘舵�侊紙0锛氭柊寤� 1锛氬凡澶勭悊锛�
--
Gitblit v1.9.3