yangw
/
lj_plc
2
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add - 添加报警指示灯 日志文字后拼接机台号

Browse Source
dep
wangsr 12 months ago
parent 3ba815785e
commit 0b6e85a04c
7 changed files with 50 additions and 21 deletions
Show Stats Download Patch File Download Diff File

12
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/AutoControl.cs
Unescape Escape View File

@ -192,7 +192,8 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
}
else
{
LjLogControl.ManualLogControl("手动下粉料", ControlsHelper.SingleSelect(RadioE), 3);
int i = ControlsHelper.SingleSelect(RadioE);
LjLogControl.ManualLogControl("手动下粉料向" + i, i, 3);
MessageBox.Show("信号下达成功！");
}
@ -214,7 +215,8 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
}
else
{
LjLogControl.ManualLogControl("手动下冷水", ControlsHelper.SingleSelect(RadioE), 1);
int i = ControlsHelper.SingleSelect(RadioE);
LjLogControl.ManualLogControl("手动下冷水向" + i, i, 1);
MessageBox.Show("信号下达成功！");
}
@ -237,7 +239,8 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
}
else
{
LjLogControl.ManualLogControl("手动下热水", ControlsHelper.SingleSelect(RadioE), 1);
int i = ControlsHelper.SingleSelect(RadioE);
LjLogControl.ManualLogControl("手动下热水向" + i, i, 1);
MessageBox.Show("信号下达成功！");
}
@ -280,7 +283,8 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
if (b)
{
LjLogControl.ManualLogControl("手动下黑粉料", 3, Convert.ToInt32(TextE.ManualWeight.MCValue.ToString()), ControlsHelper.SingleSelect(RadioE), 2);
int i = ControlsHelper.SingleSelect(RadioE);
LjLogControl.ManualLogControl("手动下黑粉料向" + i, 3, Convert.ToInt32(TextE.ManualWeight.MCValue.ToString()), i, 2);
MessageBox.Show("数据下传成功！");
}

2
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/DeviceDetailEntity.cs
Unescape Escape View File

@ -282,6 +282,8 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl.Entity
public SwitchLight DMWETER77 { get; set; }
public SwitchLight DMWETER8 { get; set; }
public SwitchLight DMWETER88 { get; set; }
public SwitchLight AlarmIndicate { get; set; }
}
public class RSCREWBIGEntity

11
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs
Unescape Escape View File

@ -44,7 +44,7 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl
private Timer timer;
private string AlarmString = "报警信息 ";
private string AlarmString = "";
int LineKindFlag = 0;
@ -614,6 +614,15 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl
}
string str = sb.ToString();
if (string.IsNullOrWhiteSpace(str))
{
ControlsHelper.SetSwitchLight(LightE.AlarmIndicate, true, false);
}
else
{
ControlsHelper.SetSwitchLight(LightE.AlarmIndicate, false, true);
}
LightE.AlarmIndicate.BackColor = Color.Transparent;
str = str.Replace("\r\n", string.Empty);
if (str != AlarmString)
{

13
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/ManualControlAction.cs
Unescape Escape View File

@ -1,33 +1,20 @@
using DataBlockHelper;
using DevExpress.DataAccess.Native.Json;
using DevExpress.Utils.About;
using ICSharpCode.Core;
using Mesnac.Action.Base;
using Mesnac.Action.ChemicalWeighing.Entity;
using Mesnac.Action.ChemicalWeighing.FreeDb;
using Mesnac.Action.ChemicalWeighing.InterfaceDocking;
using Mesnac.Action.ChemicalWeighing.InterfaceDocking.DockingEntity;
using Mesnac.Action.ChemicalWeighing.LjReport.DayWhiteEmbryo;
using Mesnac.Basic;
using Mesnac.Controls.Base;
using Mesnac.Controls.Default;
using Mesnac.Core.Service;
using System;
using System.Collections.Generic;
using System.Data;
using System.IO;
using System.Linq;
using System.Net;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using Mesnac.Action.ChemicalWeighing.LjMaterial;
using Mesnac.Action.ChemicalWeighing.MinAn;
using System.Xml.Serialization;
using System.Threading;
using DataBlockHelper.DBHelpers;
using System.Diagnostics;
using DevExpress.XtraRichEdit.Commands.Internal;
using Mesnac.Action.ChemicalWeighing.Report;
using Mesnac.Action.ChemicalWeighing.Report.Entity;

2
Main/MCEdit/Data/MCProject/nodeForm/LjLogForm.xml
Unescape Escape View File

@ -3,7 +3,7 @@
<Object type="Mesnac.Controls.Default.MCDataGridView, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="LogForm" children="Controls">
<Property name="DisplayAllColumn">False</Property>
<Property name="DgvColumn">
<Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAABAAAAHQAAAAHAwAAAAABAAAACAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAA0EBQQAAAAoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAKX2ZpbGVkRGF0YQxfZGlzcGxheU5hbWUBAQIAAAAGCAAAAAdsb2d0ZXh0BgkAAAAM5pel5b+X5YaF5a65AQUAAAAEAAAABgoAAAAFdmFsdWUGCwAAAAPlgLwBBgAAAAQAAAAGDAAAAAdsb2d0aW1lBg0AAAAM5pel5b+X5pel5pyfAQcAAAAEAAAABg4AAAAIZGV2aWNlbm8GDwAAAAzorr7lpIfnvJblj7cL</Binary>
<Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAABAAAAHkAAAAHAwAAAAABAAAACAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAA0EBQQAAAAoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAKX2ZpbGVkRGF0YQxfZGlzcGxheU5hbWUBAQIAAAAGCAAAAAdsb2d0ZXh0BgkAAAAM5pel5b+X5YaF5a65AQUAAAAEAAAABgoAAAAIZGV2aWNlbm8GCwAAAAzorr7lpIfnvJblj7cBBgAAAAQAAAAGDAAAAAV2YWx1ZQYNAAAAA+WAvAEHAAAABAAAAAYOAAAAB2xvZ3RpbWUGDwAAAAzml6Xlv5fml6XmnJ8L</Binary>
</Property>
<Property name="ClickActionList">
<Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary>

29
Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml
Unescape Escape View File

@ -1,6 +1,33 @@
<Object type="Mesnac.Gui.Common.FrmRunTemplate, Mesnac.Gui.Common, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MainDetail" children="Controls">
<Object type="System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="Panel1" children="Controls">
<Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabel238" children="Controls">
<Property name="Format" />
<Property name="TextName" />
<Property name="NewFillColor">Red</Property>
<Property name="OldFillColor">DarkGray</Property>
<Property name="MCKey" />
<Property name="MCDataSourceID" />
<Property name="IsDbControl">False</Property>
<Property name="InitDataSource" />
<Property name="ActionDataSource" />
<Property name="BindDataSource" />
<Property name="DbOptionType">None</Property>
<Property name="MCVisible">True</Property>
<Property name="MCEnabled">True</Property>
<Property name="Text">报警指示</Property>
<Property name="Font">宋体, 9pt</Property>
<Property name="ForeColor">ButtonHighlight</Property>
<Property name="Location">1798, 879</Property>
<Property name="Name">MCLabel238</Property>
<Property name="Size">53, 12</Property>
</Object>
<Object type="Mesnac.Controls.ChemicalWeighing.SwitchLight, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="AlarmIndicate" children="Controls">
<Property name="StatusName" />
<Property name="Location">1862, 872</Property>
<Property name="Name">AlarmIndicate</Property>
<Property name="Size">27, 28</Property>
</Object>
<Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabel236" children="Controls">
<Property name="Format" />
<Property name="TextName" />
@ -928,7 +955,7 @@
<Object type="Mesnac.Controls.ChemicalWeighing.HslMoveText, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="AlarmMoveText" children="Controls">
<Property name="Location">46, 872</Property>
<Property name="Name">AlarmMoveText</Property>
<Property name="Size">1830, 28</Property>
<Property name="Size">1735, 28</Property>
</Object>
<Object type="Mesnac.Controls.ChemicalWeighing.HslLedDisplay, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="RGVWaitDisPlay8" children="Controls">
<Property name="Location">1776, 805</Property>

2
Main/MCEdit/Data/MCProject/nodeForm/ManualWaterControl.xml
Unescape Escape View File

@ -195,7 +195,7 @@
<Object type="Mesnac.Controls.Default.MCDataGridView, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCDataGridView3" children="Controls">
<Property name="DisplayAllColumn">False</Property>
<Property name="DgvColumn">
<Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAABAAAAHQAAAAHAwAAAAABAAAACAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAA0EBQQAAAAoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAKX2ZpbGVkRGF0YQxfZGlzcGxheU5hbWUBAQIAAAAGCAAAAAdsb2d0ZXh0BgkAAAAM5pel5b+X5YaF5a65AQUAAAAEAAAABgoAAAAFdmFsdWUGCwAAAAPlgLwBBgAAAAQAAAAGDAAAAAdsb2d0aW1lBg0AAAAM5pel5b+X5pel5pyfAQcAAAAEAAAABg4AAAAIZGV2aWNlbm8GDwAAAAzorr7lpIfnvJblj7cL</Binary>
<Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAABAAAAHkAAAAHAwAAAAABAAAACAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAA0EBQQAAAAoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAKX2ZpbGVkRGF0YQxfZGlzcGxheU5hbWUBAQIAAAAGCAAAAAdsb2d0ZXh0BgkAAAAM5pel5b+X5YaF5a65AQUAAAAEAAAABgoAAAAIZGV2aWNlbm8GCwAAAAzorr7lpIfnvJblj7cBBgAAAAQAAAAGDAAAAAV2YWx1ZQYNAAAAA+WAvAEHAAAABAAAAAYOAAAAB2xvZ3RpbWUGDwAAAAzml6Xlv5fml6XmnJ8L</Binary>
</Property>
<Property name="ClickActionList">
<Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary>

Write Preview
Loading…
Cancel
Save