From f49517831adb72a6e72510e8b082ef9528909cf3 Mon Sep 17 00:00:00 2001
From: wangsr <gxhsoulstar@163.com>
Date: Mon, 18 Dec 2023 16:56:58 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E8=BE=93=E9=80=81=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LjDeliver/DeliverInitAction.cs            | 16 ++++-
 .../LjDeliver/Entity/DeliverEntity.cs         | 11 ++++
 .../Data/MCProject/nodeForm/LjDeliver.xml     | 59 +++++++++++++------
 3 files changed, 65 insertions(+), 21 deletions(-)

diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs
index 3cec664..b368c03 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs
@@ -52,7 +52,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver
 
         HslBottleEntity bottleE = new HslBottleEntity();
         SwitchLightEntity SwitchlightE = new SwitchLightEntity();
-        //JzfEntity JzfE = new JzfEntity();
+        JzfEntity JzfE = new JzfEntity();
         ThreeWayValveEntity ThreeWayValveE = new ThreeWayValveEntity();
         LjSwitchEntity LjSwitchE = new LjSwitchEntity();
         MCLabelEntity LabelE = new MCLabelEntity();
@@ -97,7 +97,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver
         {
             ControlsHelper.ControlImport<HslBottle>(bottleE, Controls);
             ControlsHelper.ControlImport<SwitchLight>(SwitchlightE, Controls);
-            //ControlsHelper.ControlImport<Jzf>(JzfE, Controls);
+            ControlsHelper.ControlImport<Jzf>(JzfE, Controls);
             ControlsHelper.ControlImport<ThreeWayValve>(ThreeWayValveE, Controls);
             ControlsHelper.ControlImport<LjSwith>(LjSwitchE, Controls);
             ControlsHelper.ControlImport<MCLabel>(LabelE, Controls);
@@ -123,10 +123,12 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver
             DB1GetData();
             DB90GetData();
             DB91GetData();
+            DBOtherGetData();
 
             DB1SetData();
             DB90SetData();
             DB91SetData();
+            DBOtherSetData();
 
             AlarmControl();
         }
@@ -420,6 +422,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver
             PlcTemp.DM3DSM01_Alarm = DB91.DM3DSM01.Alarm;
         }
 
+        private void DBOtherGetData()
+        {
+
+        }
+
         private void DB1SetData()
         {
             ControlsHelper.SetMCLabel(LabelE.PR1ASI01, (float)Math.Round(PlcTemp.PR1ASI01_Set, 2));
@@ -578,6 +585,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver
             ControlsHelper.SetSwitchLight(SwitchlightE.DM3DSM01, PlcTemp.DM3DSM01_Set, PlcTemp.DM3DSM01_Alarm);
         }
 
+        private void DBOtherSetData()
+        {
+
+        }
+
         #endregion
 
         #region 报警管理
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/Entity/DeliverEntity.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/Entity/DeliverEntity.cs
index 585b7ae..ca98120 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/Entity/DeliverEntity.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/Entity/DeliverEntity.cs
@@ -1,5 +1,6 @@
 using Mesnac.Controls.ChemicalWeighing;
 using Mesnac.Controls.Default;
+using Mesnac.Controls.Feeding;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -191,6 +192,16 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver.Entity
 
     }
 
+    internal class JzfEntity
+    {
+        public Jzf Excitation1 { get; set; }
+        public Jzf Excitation2 { get; set; }
+        public Jzf Excitation3 { get; set; }
+        public Jzf SideBlowing1 { get; set; }
+        public Jzf SideBlowing2 { get; set; }
+        public Jzf SideBlowing3 { get; set; }
+    }
+
     internal class HslBottleEntity
     {
         public HslBottle Bottle1 { get; set; }
diff --git a/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml b/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml
index eae6fb7..9608f56 100644
--- a/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml
+++ b/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml
@@ -1,6 +1,27 @@
 
   <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">
+        <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">285, 109</Property>
+        <Property name="Name">
+        </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">
         <Property name="StatusName" />
         <Property name="Location">324, 656</Property>
@@ -199,46 +220,46 @@
         <Property name="Name">PR2DBT02</Property>
         <Property name="Size">11, 12</Property>
       </Object>
-      <Object type="Mesnac.Controls.Feeding.Jzf, Mesnac.Controls.Feeding, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="Jzf5" children="Controls">
+      <Object type="Mesnac.Controls.Feeding.Jzf, Mesnac.Controls.Feeding, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="SideBlowing3" children="Controls">
         <Property name="StatusName" />
         <Property name="Status">TurnOff</Property>
         <Property name="Location">337, 686</Property>
-        <Property name="Name">Jzf5</Property>
+        <Property name="Name">SideBlowing3</Property>
         <Property name="Size">13, 11</Property>
       </Object>
-      <Object type="Mesnac.Controls.Feeding.Jzf, Mesnac.Controls.Feeding, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="Jzf6" children="Controls">
+      <Object type="Mesnac.Controls.Feeding.Jzf, Mesnac.Controls.Feeding, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="Excitation3" children="Controls">
         <Property name="StatusName" />
         <Property name="Status">TurnOff</Property>
         <Property name="Location">330, 676</Property>
-        <Property name="Name">Jzf6</Property>
+        <Property name="Name">Excitation3</Property>
         <Property name="Size">13, 11</Property>
       </Object>
-      <Object type="Mesnac.Controls.Feeding.Jzf, Mesnac.Controls.Feeding, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="Jzf3" children="Controls">
+      <Object type="Mesnac.Controls.Feeding.Jzf, Mesnac.Controls.Feeding, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="SideBlowing2" children="Controls">
         <Property name="StatusName" />
         <Property name="Status">TurnOff</Property>
         <Property name="Location">337, 405</Property>
-        <Property name="Name">Jzf3</Property>
+        <Property name="Name">SideBlowing2</Property>
         <Property name="Size">13, 11</Property>
       </Object>
-      <Object type="Mesnac.Controls.Feeding.Jzf, Mesnac.Controls.Feeding, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="Jzf4" children="Controls">
+      <Object type="Mesnac.Controls.Feeding.Jzf, Mesnac.Controls.Feeding, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="Excitation2" children="Controls">
         <Property name="StatusName" />
         <Property name="Status">TurnOff</Property>
         <Property name="Location">330, 395</Property>
-        <Property name="Name">Jzf4</Property>
+        <Property name="Name">Excitation2</Property>
         <Property name="Size">13, 11</Property>
       </Object>
-      <Object type="Mesnac.Controls.Feeding.Jzf, Mesnac.Controls.Feeding, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="Jzf2" children="Controls">
+      <Object type="Mesnac.Controls.Feeding.Jzf, Mesnac.Controls.Feeding, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="SideBlowing1" children="Controls">
         <Property name="StatusName" />
         <Property name="Status">TurnOff</Property>
         <Property name="Location">337, 121</Property>
-        <Property name="Name">Jzf2</Property>
+        <Property name="Name">SideBlowing1</Property>
         <Property name="Size">13, 11</Property>
       </Object>
-      <Object type="Mesnac.Controls.Feeding.Jzf, Mesnac.Controls.Feeding, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="Jzf1" children="Controls">
+      <Object type="Mesnac.Controls.Feeding.Jzf, Mesnac.Controls.Feeding, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="Excitation1" children="Controls">
         <Property name="StatusName" />
         <Property name="Status">TurnOff</Property>
         <Property name="Location">330, 111</Property>
-        <Property name="Name">Jzf1</Property>
+        <Property name="Name">Excitation1</Property>
         <Property name="Size">13, 11</Property>
       </Object>
       <Object type="Mesnac.Controls.ChemicalWeighing.ThreeWayValve, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="DV1PCP19" children="Controls">
@@ -289,22 +310,22 @@
         <Property name="Name">AS1DBT07</Property>
         <Property name="Size">14, 12</Property>
       </Object>
-      <Object type="Mesnac.Controls.ChemicalWeighing.SwitchLight, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="SwitchLight2147483644" children="Controls">
+      <Object type="Mesnac.Controls.ChemicalWeighing.SwitchLight, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="HighLevel3" children="Controls">
         <Property name="StatusName" />
         <Property name="Location">352, 656</Property>
-        <Property name="Name">SwitchLight2147483644</Property>
+        <Property name="Name">HighLevel3</Property>
         <Property name="Size">13, 13</Property>
       </Object>
-      <Object type="Mesnac.Controls.ChemicalWeighing.SwitchLight, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="SwitchLight2147483645" children="Controls">
+      <Object type="Mesnac.Controls.ChemicalWeighing.SwitchLight, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="HighLevel2" children="Controls">
         <Property name="StatusName" />
         <Property name="Location">352, 375</Property>
-        <Property name="Name">SwitchLight2147483645</Property>
+        <Property name="Name">HighLevel2</Property>
         <Property name="Size">13, 13</Property>
       </Object>
-      <Object type="Mesnac.Controls.ChemicalWeighing.SwitchLight, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="SwitchLight2147483646" children="Controls">
+      <Object type="Mesnac.Controls.ChemicalWeighing.SwitchLight, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="HighLevel1" children="Controls">
         <Property name="StatusName" />
         <Property name="Location">352, 91</Property>
-        <Property name="Name">SwitchLight2147483646</Property>
+        <Property name="Name">HighLevel1</Property>
         <Property name="Size">13, 13</Property>
       </Object>
       <Object type="Mesnac.Controls.Default.SpecialLabelBlue, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="SpecialLabelBlue503" children="Controls">
@@ -641,7 +662,7 @@
         <Property name="ZLDName" />
         <Property name="ALMTName" />
         <Property name="ALMDName" />
-        <Property name="Location">557, 96</Property>
+        <Property name="Location">557, 94</Property>
         <Property name="Name">DV1PCP04</Property>
         <Property name="Size">22, 12</Property>
       </Object>