From 00fda34dd9bbe207583d7fac19b306ae32db18f0 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 31 3月 2025 11:00:32 +0800
Subject: [PATCH] 22
---
SDA/iWareSda/SdaMainForm.cs | 47 +++++++++++++++++++++++++----------------------
1 files changed, 25 insertions(+), 22 deletions(-)
diff --git a/SDA/iWareSda/SdaMainForm.cs b/SDA/iWareSda/SdaMainForm.cs
index c005de3..bfd8314 100644
--- a/SDA/iWareSda/SdaMainForm.cs
+++ b/SDA/iWareSda/SdaMainForm.cs
@@ -12,7 +12,7 @@
using System.Linq;
using iWareCommon;
using Newtonsoft.Json.Linq;
-
+using System.Threading.Tasks;
namespace iWareSda
{
@@ -89,9 +89,9 @@
InitializeComponent();
Control.CheckForIllegalCrossThreadCalls = false;
- this.lbl_Main1.Text = SysHelper.Language(WareSdaStruct.LanguageFlg, "娼嶆煷瑗挎腐鏁版嵁璁块棶鏈嶅姟", "Data service runing");
+ this.lbl_Main1.Text = SysHelper.Language(WareSdaStruct.LanguageFlg, "椴佷附鏈ㄤ笟鍖呰绾挎暟鎹闂湇鍔�", "Data service runing");
this.lbl_Main2.Text = SysHelper.Language(WareSdaStruct.LanguageFlg, "璇峰嬁鍏抽棴锛�", "Please do not close!");
- this.Text = SysHelper.Language(WareSdaStruct.LanguageFlg, "娼嶆煷瑗挎腐鏁版嵁璁块棶鏈嶅姟", "Data service");
+ this.Text = SysHelper.Language(WareSdaStruct.LanguageFlg, "椴佷附鏈ㄤ笟鍖呰绾挎暟鎹闂湇鍔�", "Data service");
this.tabPage_Main.Text = SysHelper.Language(WareSdaStruct.LanguageFlg, "鏈嶅姟", "Service");
}
@@ -108,8 +108,11 @@
{
#region 瀵瑰鍙戝竷WCF褰㈠紡鏁版嵁璁块棶鏈嶅姟
- var StationServiceHost = new ServiceHost(typeof(iWareSda.StationService));
- StationServiceHost.Open();
+ Task.Run(() =>
+ {
+ var StationServiceHost = new ServiceHost(typeof(iWareSda.StationService));
+ StationServiceHost.Open();
+ });
#endregion
@@ -355,7 +358,7 @@
}
//璧嬪�兼姤璀�
- s.View.R_WarningDBList = s.GetAlertDatas();
+ //s.View.R_WarningDBList = s.GetAlertDatas();
//s.IsConnected = s.plcService.IsConnected;
////鍖哄煙1
@@ -482,24 +485,24 @@
realtimePlcValueDict_Station[s.View.DeviceName] = "";
}
- foreach (var item in s.View.R_StationForReadCommList)
- {
- //鍒ゆ柇濡傛灉ACK=1锛屽垯鍐欏叆STB涓�0
- if (item.R_ACK == true)
- {
- var writeObj = s.View.W_StationForWriteCommList.Where(x => x.StationCode == item.StationCode).FirstOrDefault();
- var writeAddressObj = s.DBBlockForWrite.W_StationForWriteCommList.Where(x => x.StationCode == item.StationCode).FirstOrDefault();
- MessageModel fr = null;
- if (fr.result == false)
- {
- Log4NetHelper.WriteErrorLog(LogType.SrmTheadService, "鑾峰彇 Station鍜岃緭閫佺嚎 鐨勭姸鎬佷俊鎭椂锛屽垽鏂瑼CK=1锛屾洿鏂癝TB涓�0鏃堕敊璇�:" + fr.resMsg, null);
- }
- }
- }
+ //foreach (var item in s.View.R_StationForReadCommList)
+ //{
+ // //鍒ゆ柇濡傛灉ACK=1锛屽垯鍐欏叆STB涓�0
+ // if (item.R_ACK == true)
+ // {
+ // var writeObj = s.View.W_StationForWriteCommList.Where(x => x.StationCode == item.StationCode).FirstOrDefault();
+ // var writeAddressObj = s.DBBlockForWrite.W_StationForWriteCommList.Where(x => x.StationCode == item.StationCode).FirstOrDefault();
+ // MessageModel fr = null;
+ // if (fr.result == false)
+ // {
+ // Log4NetHelper.WriteErrorLog(LogType.SrmTheadService, "鑾峰彇 Station鍜岃緭閫佺嚎 鐨勭姸鎬佷俊鎭椂锛屽垽鏂瑼CK=1锛屾洿鏂癝TB涓�0鏃堕敊璇�:" + fr.resMsg, null);
+ // }
+ // }
+ //}
//璧嬪�兼姤璀�
//s.View.R_Line_WarningDBList = s.GetLineAlertDatas();
- s.View.R_Station_WarningDBList = s.GetStationAlertDatas();
+ // s.View.R_Station_WarningDBList = s.GetStationAlertDatas();
}
}
catch (Exception ex)
@@ -511,7 +514,7 @@
Log4NetHelper.WriteErrorLog(LogType.StationSdaService, "鑾峰彇 Station 鐨勭姸鎬佷俊鎭嚭鐜板紓甯�", ex);
}
- Thread.Sleep(1000);
+ Thread.Sleep(600);
}
}
--
Gitblit v1.9.3