From 0c5a980cb6d203c2987a070ae746df871edc38a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=94=84=E5=A4=B4?= <yangw@mesnac.com>
Date: Sat, 22 Jun 2024 09:40:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89dacang?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Entity/HslControlsEntity.cs               |  3 ++
 .../MainDetailControlAction.cs                | 14 ++++++++++
 .../Util/UserJudge.cs                         |  4 ++-
 .../Data/MCProject/nodeForm/MainDetail.xml    | 28 ++++++++++++++++++-
 Main/MCRun/App.config                         |  4 +--
 5 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/HslControlsEntity.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/HslControlsEntity.cs
index 7be5a8d..11f896e 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/HslControlsEntity.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/HslControlsEntity.cs
@@ -108,6 +108,9 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl.Entity
         public HslLanternSimple DryDpause { get; set; }
         public HslLanternSimple DryDready { get; set; }
 
+
+        public HslLanternSimple HslCaiJi { get; set; }
+
         //daybin1
 
         public HslLanternSimple DayBin1 { get; set; }
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs
index 677bc3b..fad46a3 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs
@@ -416,6 +416,20 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl
 
 
 
+
+
+            var hslCaiji = HslLanternSimpleE.HslCaiJi;
+            var b = UserJudge.IsSettingNormalUser;
+            if (b)
+            {
+                hslCaiji.LanternBackground = Color.Lime;
+            }
+            else
+            {
+                hslCaiji.LanternBackground = Color.Gray;
+            }
+
+
             SetHslLanternSimple9(HslLanternSimpleE.DayBin1, dB2108.Daybin1);
             SetHslLanternSimple9(HslLanternSimpleE.DayBin2, dB2108.Daybin2);
             SetHslLanternSimple9(HslLanternSimpleE.DayBin3, dB2108.Daybin3);
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Util/UserJudge.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Util/UserJudge.cs
index 2689cb0..c5b9b5a 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Util/UserJudge.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Util/UserJudge.cs
@@ -27,8 +27,10 @@ namespace Mesnac.Action.ChemicalWeighing.Util
                 return false;
             }
         }
+        
 
-       
+
+        //
 
 
         public static bool IsSettingNormalUser
diff --git a/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml b/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml
index de1ef87..6362bf7 100644
--- a/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml
+++ b/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml
@@ -1,6 +1,32 @@
 
   <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="FeededGelM255" children="Controls">
+      <Object type="Mesnac.Controls.ChemicalWeighing.HslLanternSimple, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="HslCaiJi" children="Controls">
+        <Property name="Location">1871, 55</Property>
+        <Property name="Name">HslCaiJi</Property>
+        <Property name="Size">15, 17</Property>
+      </Object>
+      <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabel267" 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">1808, 37</Property>
+        <Property name="Name">MCLabel267</Property>
+        <Property name="Size">89, 12</Property>
+      </Object>
       <Object type="Mesnac.Controls.Default.SpecialLabelBlue, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="SpecialLabelBlue215" children="Controls">
         <Property name="Format" />
         <Property name="TextName" />
@@ -7629,7 +7655,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">1735, 28</Property>
+        <Property name="Size">1742, 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">1764, 800</Property>
diff --git a/Main/MCRun/App.config b/Main/MCRun/App.config
index 3e0d4fd..fe23815 100644
--- a/Main/MCRun/App.config
+++ b/Main/MCRun/App.config
@@ -4,9 +4,7 @@
         <section name="log4net" type="System.Configuration.IgnoreSectionHandler" />
     </configSections>
     <appSettings>
-
-		<add key="IsDaPing" value="false"/>
-		
+	
         <!--控件属性列表文件-->
         <add key="componentsPropertyFile" value="\data\ComponentProperty.xml" />
         <!--控件动画列表文件-->