add - 添加输送参数设置

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs

@@ -603,7 +603,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver
             ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP10, PlcTemp.DV1PCP10_AlarmR, PlcTemp.DV1PCP10_SetR, PlcTemp.DV1PCP10_AlarmL, PlcTemp.DV1PCP10_SetL, 1);
             ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP11, PlcTemp.DV1PCP11_AlarmL, PlcTemp.DV1PCP11_SetL, PlcTemp.DV1PCP11_AlarmR, PlcTemp.DV1PCP11_SetR, 0);
             ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP12, PlcTemp.DV1PCP12_AlarmR, PlcTemp.DV1PCP12_SetR, PlcTemp.DV1PCP12_AlarmL, PlcTemp.DV1PCP12_SetL, 0);
-            ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP13, PlcTemp.DV1PCP13_AlarmR, PlcTemp.DV1PCP13_SetR, true/*PlcTemp.DV1PCP13_AlarmL*/, PlcTemp.DV1PCP13_SetL, 1);
+            ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP13, PlcTemp.DV1PCP13_AlarmR, PlcTemp.DV1PCP13_SetR, PlcTemp.DV1PCP13_AlarmL, PlcTemp.DV1PCP13_SetL, 1);
             ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP14, PlcTemp.DV1PCP14_AlarmR, PlcTemp.DV1PCP14_SetR, PlcTemp.DV1PCP14_AlarmL, PlcTemp.DV1PCP14_SetL, 1);
             ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP15, PlcTemp.DV1PCP15_AlarmR, PlcTemp.DV1PCP15_SetR, PlcTemp.DV1PCP15_AlarmL, PlcTemp.DV1PCP15_SetL, 0);
             ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP16, PlcTemp.DV1PCP16_AlarmL, PlcTemp.DV1PCP16_SetL, PlcTemp.DV1PCP16_AlarmR, PlcTemp.DV1PCP16_SetR, 0);

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliverPressureSetting/ControlsHelper.cs

@@ -0,0 +1,20 @@
+using Mesnac.Action.ChemicalWeighing.AutoControl.Entity;
+using Mesnac.Action.ChemicalWeighing.LjDeliver.Entity;
+using Mesnac.Action.ChemicalWeighing.Util;
+using Mesnac.Controls.ChemicalWeighing;
+using Mesnac.Controls.Default;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Mesnac.Action.ChemicalWeighing.LjDeliverPressureSetting
+{
+    public class ControlsHelper : ControlsImprot
+    {
+
+    }
+}

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliverPressureSetting/Entity/DeliverPressureEntity.cs

@@ -0,0 +1,51 @@
+using Mesnac.Controls.Default;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Mesnac.Action.ChemicalWeighing.LjDeliverPressureSetting.Entity
+{
+    public class MCButtonEntity
+    {
+        public MCButton UpLoad { get; set; }
+        public MCButton DownLoad { get; set; }
+        public MCButton Refresh { get; set; }
+    }
+
+    public class MCTextboxEntity
+    {
+        public MCTextBox ASetValue1 { get; set; }
+        public MCTextBox ASetValue2 { get; set; }
+        public MCTextBox ASetValue3 { get; set; }
+        public MCTextBox ASetValue4 { get; set; }
+        public MCTextBox ASetValue5 { get; set; }
+        public MCTextBox ASetValue6 { get; set; }
+        public MCTextBox ASetValue7 { get; set; }
+        public MCTextBox ASetValue8 { get; set; }
+        public MCTextBox BSetValue1 { get; set; }
+        public MCTextBox BSetValue2 { get; set; }
+        public MCTextBox BSetValue3 { get; set; }
+        public MCTextBox BSetValue4 { get; set; }
+        public MCTextBox BSetValue5 { get; set; }
+        public MCTextBox BSetValue6 { get; set; }
+        public MCTextBox BSetValue7 { get; set; }
+        public MCTextBox BSetValue8 { get; set; }
+        public MCTextBox CSetValue1 { get; set; }
+        public MCTextBox CSetValue2 { get; set; }
+        public MCTextBox CSetValue3 { get; set; }
+        public MCTextBox CSetValue4 { get; set; }
+        public MCTextBox CSetValue5 { get; set; }
+        public MCTextBox CSetValue6 { get; set; }
+        public MCTextBox CSetValue7 { get; set; }
+        public MCTextBox CSetValue8 { get; set; }
+        public MCTextBox ATimeSetValue1 { get; set; }
+        public MCTextBox ATimeSetValue2 { get; set; }
+        public MCTextBox BTimeSetValue1 { get; set; }
+        public MCTextBox BTimeSetValue2 { get; set; }
+        public MCTextBox CTimeSetValue1 { get; set; }
+        public MCTextBox CTimeSetValue2 { get; set; }
+
+    }
+}

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliverPressureSetting/InitAction.cs

@@ -0,0 +1,34 @@
+using Mesnac.Action.Base;
+using Mesnac.Action.ChemicalWeighing.LjDeliverPressureSetting.Entity;
+using Mesnac.Controls.Default;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Mesnac.Action.ChemicalWeighing.LjDeliverPressureSetting
+{
+    public class InitAction : ChemicalWeighingAction, IAction
+    {
+        MCTextboxEntity BoxE = new MCTextboxEntity();
+
+        List<Control> Controls;
+        public void Run(RuntimeParameter runtime)
+        {
+            base.RunIni(runtime);
+
+            Controls = GetAllControls();
+
+            ControlsHelper.ControlImport<MCTextBox>(BoxE, Controls);
+
+            SetValueFromPlc();
+        }
+
+        private void SetValueFromPlc()
+        {
+
+        }
+    }
+}

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliverPressureSetting/PressureSettingButtonAction.cs

@@ -0,0 +1,57 @@
+using ICSharpCode.Core;
+using Mesnac.Action.Base;
+using Mesnac.Action.ChemicalWeighing.LjDeliverPressureSetting.Entity;
+using Mesnac.Controls.Default;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Mesnac.Action.ChemicalWeighing.LjDeliverPressureSetting
+{
+    public class PressureSettingButtonAction : ChemicalWeighingAction, IAction
+    {
+        MCButtonEntity ButtonE = new MCButtonEntity();
+        MCTextboxEntity BoxE = new MCTextboxEntity();
+
+        List<Control> Controls;
+
+        public void Run(RuntimeParameter runtime)
+        {
+            base.RunIni(runtime);
+
+            Controls = GetAllControls();
+
+            SetAllControus();
+
+
+        }
+
+        public void SetAllControus()
+        {
+            ControlsHelper.ControlImport<MCButton>(ButtonE, Controls);
+            ControlsHelper.ControlImport<MCTextBox>(BoxE, Controls);
+        }
+
+        public void ButtonSelect(RuntimeParameter runtime)
+        {
+            if (ButtonE.DownLoad == runtime.Sender)
+            {
+
+            }
+
+            if (ButtonE.UpLoad == runtime.Sender)
+            {
+
+            }
+
+            if (ButtonE.Refresh == runtime.Sender)
+            {
+
+            }
+        }
+
+    }
+}

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj

@@ -301,6 +301,10 @@
       <DependentUpon>FormClientManager.cs</DependentUpon>
     </Compile>
     <Compile Include="LjClick\InitFormAction.cs" />
+    <Compile Include="LjDeliverPressureSetting\ControlsHelper.cs" />
+    <Compile Include="LjDeliverPressureSetting\Entity\DeliverPressureEntity.cs" />
+    <Compile Include="LjDeliverPressureSetting\InitAction.cs" />
+    <Compile Include="LjDeliverPressureSetting\PressureSettingButtonAction.cs" />
     <Compile Include="LjDeliver\ControlsHelper.cs" />
     <Compile Include="LjDeliver\DeliverInitAction.cs" />
     <Compile Include="LjDeliver\Entity\DeliverEntity.cs" />

Main/MCEdit/Data/EventConfig/榄菊输送/榄菊输送参数设置.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<ActionService>
+  <Design>
+
+    <Path path="榄菊输送参数设置">
+
+      <Action action="F0A999BEE295487DAEA2FCF3E01084FD">
+        <Caption>初始化参数</Caption>
+        <Remark>初始化参数</Remark>
+      </Action>
+      <Action action="6AA00CDA3B3E498A9C698DCAD45F8B4B">
+        <Caption>参数设置按钮事件</Caption>
+        <Remark>参数设置按钮事件</Remark>
+      </Action>
+      
+    </Path>
+  </Design>
+
+  <DesignToRuntime>
+    
+    <Design action="F0A999BEE295487DAEA2FCF3E01084FD">
+      <Runtime action="9BF03BD807DD4D0297A7C69A0ADA5A96"/>
+    </Design>
+    <Design action="6AA00CDA3B3E498A9C698DCAD45F8B4B">
+      <Runtime action="83945A0CCE1142A29ADD47CF865452C7"/>
+    </Design>
+
+  </DesignToRuntime>
+
+  <Runtime>
+    <Import assembly = "Data/Action/ChemicalWeighing/Mesnac.Action.ChemicalWeighing.dll">
+      <Action action="9BF03BD807DD4D0297A7C69A0ADA5A96" class="Mesnac.Action.ChemicalWeighing.LjDeliverPressureSetting.InitAction"/>
+      <Action action="83945A0CCE1142A29ADD47CF865452C7" class="Mesnac.Action.ChemicalWeighing.LjDeliverPressureSetting.PressureSettingButtonAction"/>
+    </Import>
+  </Runtime>
+</ActionService>

Main/MCEdit/Data/MCProject/SCWSProject2.mprj

@@ -34,6 +34,7 @@
       <Node Name="WeterTimeCount" Text="湿混机等待时间统计" ToolTipText="WeterTimeCount" Tag="WeterTimeCount" ImageIndex="3" SelectedImageIndex="3" />
       <Node Name="WaterForceControl" Text="水称强制控制" ToolTipText="WaterForceControl" Tag="WaterForceControl" ImageIndex="3" SelectedImageIndex="3" />
       <Node Name="LjLogForm" Text="榄菊生产日志" ToolTipText="LjLogForm" Tag="LjLogForm" ImageIndex="3" SelectedImageIndex="3" />
+      <Node Name="DeliverPressureSetting" Text="输送压送罐参数设置" ToolTipText="DeliverPressureSetting" Tag="DeliverPressureSetting" ImageIndex="3" SelectedImageIndex="3" />
     </Node>
     <Node Name="nodeDevice" Text="设备" ToolTipText="" Tag="nodeDevice" ImageIndex="2" SelectedImageIndex="2" />
     <Node Name="nodeDataSource" Text="数据源" ToolTipText="" Tag="nodeDataSource" ImageIndex="6" SelectedImageIndex="6">

Main/MCEdit/MCEdit.csproj

@@ -403,6 +403,9 @@
     <Content Include="Data\EventConfig\小料称量\配方类别管理.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Data\EventConfig\榄菊输送\榄菊输送参数设置.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Data\MCProject\nodeDataSource.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>