From 73d21ea81a27defa77ea55d81ddd41d4a307c9b1 Mon Sep 17 00:00:00 2001
From: wangsr <gxhsoulstar@163.com>
Date: Mon, 18 Dec 2023 18:19:37 +0800
Subject: [PATCH] =?UTF-8?q?add=20-=20=E8=BE=93=E9=80=81=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=8A=A5=E8=AD=A6=E6=8C=87=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LjDeliver/DeliverInitAction.cs            |  9 ++++
 .../LjDeliver/Entity/DeliverEntity.cs         |  3 +-
 .../Data/MCProject/nodeForm/LjDeliver.xml     | 54 +++++++++++++++++--
 3 files changed, 61 insertions(+), 5 deletions(-)

diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs
index 2b9e77f..ed6aee3 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs
@@ -658,6 +658,15 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver
             }
 
             string str = sb.ToString();
+            if (string.IsNullOrWhiteSpace(str))
+            {
+                ControlsHelper.SetSwitchLight(SwitchlightE.AlarmIndicate, true, false);
+            }
+            else
+            {
+                ControlsHelper.SetSwitchLight(SwitchlightE.AlarmIndicate, false, true);
+            }
+            SwitchlightE.AlarmIndicate.BackColor = Color.Transparent;
             str = str.Replace("\r\n", string.Empty);
             if (str != AlarmString)
             {
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/Entity/DeliverEntity.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/Entity/DeliverEntity.cs
index 5a49a2a..28f5f84 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/Entity/DeliverEntity.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/Entity/DeliverEntity.cs
@@ -194,7 +194,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver.Entity
         public SwitchLight HighLevel1 { get; set; }
         public SwitchLight HighLevel2 { get; set; }
         public SwitchLight HighLevel3 { get; set; }
-
+        public SwitchLight AlarmIndicate { get; set; }
+        
     }
 
     internal class JzfEntity
diff --git a/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml b/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml
index 9608f56..0e1f4d0 100644
--- a/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml
+++ b/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml
@@ -1,7 +1,54 @@
 
   <Object type="Mesnac.Gui.Common.FrmRunTemplate, Mesnac.Gui.Common, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="LjDeliver" children="Controls">
     <Object type="System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="Panel15" children="Controls">
-      <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="" 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">1617, 881</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">1681, 874</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="agsfbsg" 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="ForeColor">ButtonHighlight</Property>
+        <Property name="Location">310, 126</Property>
+        <Property name="Name">agsfbsg</Property>
+        <Property name="Size">29, 12</Property>
+      </Object>
+      <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="fdsbfs" children="Controls">
         <Property name="Format" />
         <Property name="TextName" />
         <Property name="NewFillColor">Red</Property>
@@ -18,8 +65,7 @@
         <Property name="Text">激振器</Property>
         <Property name="ForeColor">ButtonHighlight</Property>
         <Property name="Location">285, 109</Property>
-        <Property name="Name">
-        </Property>
+        <Property name="Name">fdsbfs</Property>
         <Property name="Size">41, 12</Property>
       </Object>
       <Object type="Mesnac.Controls.ChemicalWeighing.SwitchLight, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="DM3DSM01" children="Controls">
@@ -439,7 +485,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">23, 874</Property>
         <Property name="Name">AlarmMoveText</Property>
-        <Property name="Size">1685, 30</Property>
+        <Property name="Size">1577, 30</Property>
       </Object>
       <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="PR3DBT01" children="Controls">
         <Property name="Format" />