From 10f3db53bfbc919ba79fb4e0878df84781c299ad Mon Sep 17 00:00:00 2001
From: wenjy <wenjy@mesnac.com>
Date: Mon, 7 Aug 2023 15:02:58 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E6=8A=A5=E8=AD=A6=E7=BB=B4?=
 =?UTF-8?q?=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Alarm/PmtAlarm/FrmInsert.cs                           | 1 +
 .../FinishBatch/SaveHelper/AlarmSaveHelper.cs             | 3 +++
 Main/MCEdit/Data/MCProject/nodeDataSource.xml             | 2 +-
 Main/MCEdit/Data/MCProject/nodeForm/FrmAlarmInfo.xml      | 8 ++++----
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Alarm/PmtAlarm/FrmInsert.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Alarm/PmtAlarm/FrmInsert.cs
index 91690c2..20ed1fc 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Alarm/PmtAlarm/FrmInsert.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Alarm/PmtAlarm/FrmInsert.cs
@@ -299,6 +299,7 @@ namespace Mesnac.Action.ChemicalWeighing.Alarm.PmtAlarm
         private void btnCancel_Click(object sender, EventArgs e)
         {
             this.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.Close();
         }
         #endregion
 
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FinishBatch/SaveHelper/AlarmSaveHelper.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FinishBatch/SaveHelper/AlarmSaveHelper.cs
index 07883f6..4317e58 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FinishBatch/SaveHelper/AlarmSaveHelper.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FinishBatch/SaveHelper/AlarmSaveHelper.cs
@@ -24,6 +24,9 @@ namespace Mesnac.Action.ChemicalWeighing.FinishBatch.SaveHelper
             List<Entity.AlarmInfo> _alarmInfoList = Cache.CacheHelper.AlarmInfoList;
             List<Entity.SimpleAlarmInfo> _alarmBlockWordList = Cache.CacheHelper.BlockWordList;
 
+
+            ICSharpCode.Core.LoggingService<AlarmSaveHelper>.Debug("报警参数-实时刷新自动保存报警...");
+
             #region 读取PLC的报警数据
 
             foreach (Entity.AlarmInfo info in _alarmInfoList)
diff --git a/Main/MCEdit/Data/MCProject/nodeDataSource.xml b/Main/MCEdit/Data/MCProject/nodeDataSource.xml
index 3600a0d..57415b2 100644
--- a/Main/MCEdit/Data/MCProject/nodeDataSource.xml
+++ b/Main/MCEdit/Data/MCProject/nodeDataSource.xml
@@ -1,3 +1,3 @@
 <DataSources>
-  <DataSourceItem Name="DataSource1" Driver="MS SQL Server" Server="127.0.0.1" UserName="sa" Password="123456" DataBase="CWSSHG" ConnectionTimeout="5" DriverAssembly="ICSharpCode.Data.SQLServer, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" DriverClass="ICSharpCode.Data.Core.DatabaseDrivers.SQLServer.SQLServerDatabaseDriver" DataSourceClass="ICSharpCode.Data.Core.DatabaseObjects.Database" />
+  <DataSourceItem Name="DataSource1" Driver="MS SQL Server" Server="10.11.41.62" UserName="sa" Password="123456" DataBase="CWSSHG" ConnectionTimeout="5" DriverAssembly="ICSharpCode.Data.SQLServer, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" DriverClass="ICSharpCode.Data.Core.DatabaseDrivers.SQLServer.SQLServerDatabaseDriver" DataSourceClass="ICSharpCode.Data.Core.DatabaseObjects.Database" />
 </DataSources>
\ No newline at end of file
diff --git a/Main/MCEdit/Data/MCProject/nodeForm/FrmAlarmInfo.xml b/Main/MCEdit/Data/MCProject/nodeForm/FrmAlarmInfo.xml
index b614b6c..d6997d5 100644
--- a/Main/MCEdit/Data/MCProject/nodeForm/FrmAlarmInfo.xml
+++ b/Main/MCEdit/Data/MCProject/nodeForm/FrmAlarmInfo.xml
@@ -28,9 +28,9 @@
       <Property name="AutoGenerateColumns">False</Property>
       <Property name="MultiSelect">False</Property>
       <Property name="Dock">Fill</Property>
-      <Property name="Location">0, 163</Property>
+      <Property name="Location">0, 149</Property>
       <Property name="Name">MCDataGridView1</Property>
-      <Property name="Size">1338, 397</Property>
+      <Property name="Size">1338, 411</Property>
       <Property name="TabIndex">20</Property>
     </Object>
     <Object type="System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="Panel1" children="Controls">
@@ -270,7 +270,7 @@
       </Object>
       <Object type="Mesnac.Controls.Default.MCButton, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCButton10" children="Controls">
         <Property name="ClickActionList">
-          <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAGAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEFERDYzQzU2NzM0NzQ1REY5RDZDMjg4NTI2Nzk2NkQ3BgYAAAAG5p+l6K+iBgcAAAAS5p+l6K+i5oql6K2m5Y+C5pWwCw==</Binary>
+          <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAIAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEFERDYzQzU2NzM0NzQ1REY5RDZDMjg4NTI2Nzk2NkQ3BgYAAAAG5p+l6K+iBgcAAAAS5p+l6K+i5oql6K2m5Y+C5pWwCw==</Binary>
         </Property>
         <Property name="MCKey" />
         <Property name="MCDataSourceID" />
@@ -764,7 +764,7 @@
       <Property name="Dock">Top</Property>
       <Property name="Location">0, 0</Property>
       <Property name="Name">Panel1</Property>
-      <Property name="Size">1338, 163</Property>
+      <Property name="Size">1338, 149</Property>
     </Object>
     <Property name="LoadActionList">
       <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAKAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDNFNTg2QjE3MzVGMzQ1NTU4OUJGNUM4OUQ1MTczM0M0BgYAAAAP56qX5L2T5Yid5aeL5YyWBgcAAAAP56qX5L2T5Yid5aeL5YyWCw==</Binary>