Merge branch 'dep_deliver' into dep

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

@@ -603,10 +603,10 @@ 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);
+            ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP16, PlcTemp.DV1PCP16_AlarmL, PlcTemp.DV1PCP16_SetL, PlcTemp.DV1PCP16_AlarmR, PlcTemp.DV1PCP16_SetR, 2);
             ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP17, PlcTemp.DV1PCP17_AlarmR, PlcTemp.DV1PCP17_SetR, PlcTemp.DV1PCP17_AlarmL, PlcTemp.DV1PCP17_SetL, 0);
             ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP18, PlcTemp.DV1PCP18_AlarmR, PlcTemp.DV1PCP18_SetR, PlcTemp.DV1PCP18_AlarmL, PlcTemp.DV1PCP18_SetL, 0);
             ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP19, PlcTemp.DV1PCP19_AlarmR, PlcTemp.DV1PCP19_SetR, PlcTemp.DV1PCP19_AlarmL, PlcTemp.DV1PCP19_SetL, 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,50 @@
+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 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,65 @@
+using DataBlockHelper.DBHelpers;
+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
+    {
+        DB112Helper DB122 = new DB112Helper();
+        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()
+        {
+            BoxE.ASetValue1.MCValue = DB122.PressureA.SetValue1;
+            BoxE.ASetValue2.MCValue = DB122.PressureA.SetValue2;
+            BoxE.ASetValue3.MCValue = DB122.PressureA.SetValue3;
+            BoxE.ASetValue4.MCValue = DB122.PressureA.SetValue4;
+            BoxE.ASetValue5.MCValue = DB122.PressureA.SetValue5;
+            BoxE.ASetValue6.MCValue = DB122.PressureA.SetValue6;
+            BoxE.ASetValue7.MCValue = DB122.PressureA.SetValue7;
+            BoxE.ASetValue8.MCValue = DB122.PressureA.SetValue8;
+            BoxE.BSetValue1.MCValue = DB122.PressureB.SetValue1;
+            BoxE.BSetValue2.MCValue = DB122.PressureB.SetValue2;
+            BoxE.BSetValue3.MCValue = DB122.PressureB.SetValue3;
+            BoxE.BSetValue4.MCValue = DB122.PressureB.SetValue4;
+            BoxE.BSetValue5.MCValue = DB122.PressureB.SetValue5;
+            BoxE.BSetValue6.MCValue = DB122.PressureB.SetValue6;
+            BoxE.BSetValue7.MCValue = DB122.PressureB.SetValue7;
+            BoxE.BSetValue8.MCValue = DB122.PressureB.SetValue8;
+            BoxE.CSetValue1.MCValue = DB122.PressureC.SetValue1;
+            BoxE.CSetValue2.MCValue = DB122.PressureC.SetValue2;
+            BoxE.CSetValue3.MCValue = DB122.PressureC.SetValue3;
+            BoxE.CSetValue4.MCValue = DB122.PressureC.SetValue4;
+            BoxE.CSetValue5.MCValue = DB122.PressureC.SetValue5;
+            BoxE.CSetValue6.MCValue = DB122.PressureC.SetValue6;
+            BoxE.CSetValue7.MCValue = DB122.PressureC.SetValue7;
+            BoxE.CSetValue8.MCValue = DB122.PressureC.SetValue8;
+            BoxE.ATimeSetValue1.MCValue = DB122.LineTimeA.SetValue1;
+            BoxE.ATimeSetValue2.MCValue = DB122.LineTimeA.SetValue2;
+            BoxE.BTimeSetValue1.MCValue = DB122.LineTimeB.SetValue1;
+            BoxE.BTimeSetValue2.MCValue = DB122.LineTimeB.SetValue2;
+            BoxE.CTimeSetValue1.MCValue = DB122.LineTimeC.SetValue1;
+            BoxE.CTimeSetValue2.MCValue = DB122.LineTimeC.SetValue2;
+        }
+    }
+}

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

@@ -0,0 +1,151 @@
+using DataBlockHelper.DBHelpers;
+using Mesnac.Action.ChemicalWeighing.LjDeliverPressureSetting.Entity;
+using System;
+using System.Collections.Generic;
+using System.Drawing.Text;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Mesnac.Action.ChemicalWeighing.LjDeliverPressureSetting
+{
+    public class PlcDownload
+    {
+        public static void PressureSettingDownload(MCTextboxEntity BoxE)
+        {
+            Conveyor conveyorA = new Conveyor();
+            Conveyor conveyorB = new Conveyor();
+            Conveyor conveyorC = new Conveyor();
+            ConveyorTimer conveyorTimerA = new ConveyorTimer();
+            ConveyorTimer conveyorTimerB = new ConveyorTimer();
+            ConveyorTimer conveyorTimerC = new ConveyorTimer();
+
+            string Alarm = "组数值超出取值范围！（大于0小于50）";
+
+            if (!SetValueWithJudge(conveyorA,
+                            Convert.ToSingle(BoxE.ASetValue1.MCValue.ToString()),
+                            Convert.ToSingle(BoxE.ASetValue2.MCValue.ToString()),
+                            Convert.ToSingle(BoxE.ASetValue3.MCValue.ToString()),
+                            Convert.ToSingle(BoxE.ASetValue4.MCValue.ToString()),
+                            Convert.ToSingle(BoxE.ASetValue5.MCValue.ToString()),
+                            Convert.ToSingle(BoxE.ASetValue6.MCValue.ToString()),
+                            Convert.ToSingle(BoxE.ASetValue7.MCValue.ToString()),
+                            Convert.ToSingle(BoxE.ASetValue8.MCValue.ToString())))
+            {
+                MessageBox.Show("A" + Alarm);
+                return;
+            }
+
+            if (!SetValueWithJudge(conveyorB,
+                            Convert.ToSingle(BoxE.BSetValue1.MCValue.ToString()),
+                            Convert.ToSingle(BoxE.BSetValue2.MCValue.ToString()),
+                            Convert.ToSingle(BoxE.BSetValue3.MCValue.ToString()),
+                            Convert.ToSingle(BoxE.BSetValue4.MCValue.ToString()),
+                            Convert.ToSingle(BoxE.BSetValue5.MCValue.ToString()),
+                            Convert.ToSingle(BoxE.BSetValue6.MCValue.ToString()),
+                            Convert.ToSingle(BoxE.BSetValue7.MCValue.ToString()),
+                            Convert.ToSingle(BoxE.BSetValue8.MCValue.ToString())))
+            {
+                MessageBox.Show("B" + Alarm);
+                return;
+            }
+
+            if (!SetValueWithJudge(conveyorC,
+                            Convert.ToSingle(BoxE.CSetValue1.MCValue.ToString()),
+                            Convert.ToSingle(BoxE.CSetValue2.MCValue.ToString()),
+                            Convert.ToSingle(BoxE.CSetValue3.MCValue.ToString()),
+                            Convert.ToSingle(BoxE.CSetValue4.MCValue.ToString()),
+                            Convert.ToSingle(BoxE.CSetValue5.MCValue.ToString()),
+                            Convert.ToSingle(BoxE.CSetValue6.MCValue.ToString()),
+                            Convert.ToSingle(BoxE.CSetValue7.MCValue.ToString()),
+                            Convert.ToSingle(BoxE.CSetValue8.MCValue.ToString())))
+            {
+                MessageBox.Show("C" + Alarm);
+                return;
+            }
+
+            if (!SetValueWithJudge(conveyorTimerA,
+                            Convert.ToInt16(BoxE.ATimeSetValue1.MCValue.ToString()),
+                            Convert.ToInt16(BoxE.ATimeSetValue2.MCValue.ToString())))
+            {
+                MessageBox.Show("时间设定A" + Alarm);
+                return;
+            }
+
+            if (!SetValueWithJudge(conveyorTimerB,
+                            Convert.ToInt16(BoxE.BTimeSetValue1.MCValue.ToString()),
+                            Convert.ToInt16(BoxE.BTimeSetValue2.MCValue.ToString())))
+            {
+                MessageBox.Show("时间设定B" + Alarm);
+                return;
+            }
+
+            if (!SetValueWithJudge(conveyorTimerC,
+                            Convert.ToInt16(BoxE.CTimeSetValue1.MCValue.ToString()),
+                            Convert.ToInt16(BoxE.CTimeSetValue2.MCValue.ToString())))
+            {
+                MessageBox.Show("时间设定C" + Alarm);
+                return;
+            }
+
+            DB112WriterHelper.AddConveyorA(conveyorA);
+            DB112WriterHelper.AddConveyorB(conveyorB);
+            DB112WriterHelper.AddConveyorC(conveyorC);
+
+            DB112WriterHelper.AddConveyorTimerA(conveyorTimerA);
+            DB112WriterHelper.AddConveyorTimerB(conveyorTimerB);
+            DB112WriterHelper.AddConveyorTimerC(conveyorTimerC);
+
+            MessageBox.Show("数据下达成功！");
+
+        }
+
+        private static bool SetValueWithJudge(Conveyor conveyor, float v1, float v2, float v3, float v4, float v5, float v6, float v7, float v8)
+        {
+            if (JudgeValue(v1) && JudgeValue(v2) && JudgeValue(v3) && JudgeValue(v4) && JudgeValue(v5) && JudgeValue(v6) && JudgeValue(v7) && JudgeValue(v8))
+            {
+                conveyor.SetValue1 = v1;
+                conveyor.SetValue2 = v2;
+                conveyor.SetValue3 = v3;
+                conveyor.SetValue4 = v4;
+                conveyor.SetValue5 = v5;
+                conveyor.SetValue6 = v6;
+                conveyor.SetValue7 = v7;
+                conveyor.SetValue8 = v8;
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        private static bool SetValueWithJudge(ConveyorTimer conveyor, short v1, short v2)
+        {
+            if (JudgeValue(v1) && JudgeValue(v2))
+            {
+                conveyor.SetValue1 = v1;
+                conveyor.SetValue2 = v2;
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        private static bool JudgeValue(float value)
+        {
+            if (value < 0 || value > 50)
+            {
+                return false;
+            }
+            else
+            {
+                return true;
+            }
+        }
+
+    }
+}

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

@@ -0,0 +1,56 @@
+using DataBlockHelper.DBHelpers;
+using DevExpress.Utils.Taskbar;
+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();
+
+            ButtonAction(runtime);
+        }
+
+        public void SetAllControus()
+        {
+            ControlsHelper.ControlImport<MCButton>(ButtonE, Controls);
+            ControlsHelper.ControlImport<MCTextBox>(BoxE, Controls);
+        }
+
+        public void ButtonAction(RuntimeParameter runtime)
+        {
+            
+
+            if (ButtonE.Download == runtime.Sender)
+            {
+                if(MessageBox.Show("确定要下传数据到PLC？", "下传数据确认", MessageBoxButtons.YesNo) == DialogResult.No)
+                {
+                    return;
+                }
+
+                PlcDownload.PressureSettingDownload(BoxE);
+            }
+        }
+
+    }
+}

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

@@ -301,6 +301,11 @@
       <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\PlcDownload.cs" />
+    <Compile Include="LjDeliverPressureSetting\PressureSettingButtonAction.cs" />
     <Compile Include="LjDeliver\ControlsHelper.cs" />
     <Compile Include="LjDeliver\DeliverInitAction.cs" />
     <Compile Include="LjDeliver\Entity\DeliverEntity.cs" />

DataBlockHelper/DBHelpers/DB112Helper.cs

@@ -0,0 +1,85 @@
+using HslCommunication;
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DataBlockHelper.DBHelpers
+{
+    public class DB112Helper : DBHelper
+
+    {
+        public DB112Helper()
+        {
+            OperateResult<byte[]> db112 = PlcConnect.Instance.Read("DB112.0.0", 151);
+            bytes = db112.Content;
+        }
+
+
+        public Conveyor PressureA => new Conveyor(2, bytes);
+
+        public Conveyor PressureB => new Conveyor(34, bytes);
+
+        public Conveyor PressureC => new Conveyor(66, bytes);
+
+        public ConveyorTimer LineTimeA => new ConveyorTimer(98, bytes);
+
+        public ConveyorTimer LineTimeB => new ConveyorTimer(102, bytes);
+
+        public ConveyorTimer LineTimeC => new ConveyorTimer(104, bytes);
+    }
+
+
+
+    public class Conveyor
+    {
+        public Conveyor() { }
+
+        public Conveyor(ushort startSet, byte[] bytes)
+        {
+            byte[] content = bytes.Skip(startSet).Take(32).ToArray();
+            var trans = PlcConnect.Instance.ByteTransform;
+            SetValue1 = trans.TransSingle(content, 0);
+            SetValue2 = trans.TransSingle(content, 4);
+            SetValue3 = trans.TransSingle(content, 8);
+            SetValue4 = trans.TransSingle(content, 12);
+            SetValue5 = trans.TransSingle(content, 16);
+            SetValue6 = trans.TransSingle(content, 20);
+            SetValue7 = trans.TransSingle(content, 24);
+            SetValue8 = trans.TransSingle(content, 28);
+        }
+
+        public float SetValue1 { get; set; }
+        public float SetValue2 { get; set; }
+        public float SetValue3 { get; set; }
+        public float SetValue4 { get; set; }
+        public float SetValue5 { get; set; }
+        public float SetValue6 { get; set; }
+        public float SetValue7 { get; set; }
+        public float SetValue8 { get; set; }
+    }
+
+
+
+    public class ConveyorTimer
+    {
+        public ConveyorTimer()
+        {
+
+        }
+
+        public ConveyorTimer(ushort startSet, byte[] bytes)
+        {
+            byte[] content = bytes.Skip(startSet).Take(4).ToArray();
+
+            var trans = PlcConnect.Instance.ByteTransform;
+            SetValue1 = trans.TransInt16(content, 0);
+            SetValue2 = trans.TransInt16(content, 2);
+        }
+
+        public short SetValue1 { get; set; }
+        public short SetValue2 { get; set; }
+    }
+}

DataBlockHelper/DBHelpers/DB112WriterHelper.cs

@@ -0,0 +1,88 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DataBlockHelper.DBHelpers
+{
+    public class DB112WriterHelper
+    {
+        private static readonly string DbName = "DB112";
+        //  var siemensS7Net = PlcConnect.Instance;
+
+
+
+        public static void AddConveyorA(Conveyor conveyor)
+        {
+
+            int start = 2;
+            AddConveyor(start, conveyor);
+
+        }
+
+        public static void AddConveyorB(Conveyor conveyor)
+        {
+
+            int start = 34;
+            AddConveyor(start, conveyor);
+
+        }
+
+        public static void AddConveyorC(Conveyor conveyor)
+        {
+
+            int start = 66;
+            AddConveyor(start, conveyor);
+
+        }
+
+
+        public static void AddConveyorTimerA(ConveyorTimer conveyor)
+        {
+            int start = 98;
+            AddConveyorTimer(start, conveyor);
+        }
+
+        public static void AddConveyorTimerB(ConveyorTimer conveyor)
+        {
+            int start = 102;
+            AddConveyorTimer(start, conveyor);
+        }
+
+
+        public static void AddConveyorTimerC(ConveyorTimer conveyor)
+        {
+            int start = 106;
+            AddConveyorTimer(start, conveyor);
+        }
+
+        private static void AddConveyor(int start, Conveyor conveyor)
+        {
+
+            var siemensS7Net = PlcConnect.Instance;
+            siemensS7Net.Write($"{DbName}.{start}.0", conveyor.SetValue1);
+            siemensS7Net.Write($"{DbName}.{start + 4}.0", conveyor.SetValue2);
+            siemensS7Net.Write($"{DbName}.{start + 8}.0", conveyor.SetValue3);
+            siemensS7Net.Write($"{DbName}.{start + 12}.0", conveyor.SetValue4);
+            siemensS7Net.Write($"{DbName}.{start + 16}.0", conveyor.SetValue5);
+            siemensS7Net.Write($"{DbName}.{start + 20}.0", conveyor.SetValue6);
+            siemensS7Net.Write($"{DbName}.{start + 24}.0", conveyor.SetValue7);
+            siemensS7Net.Write($"{DbName}.{start + 28}.0", conveyor.SetValue7);
+        }
+
+
+        private static void AddConveyorTimer(int start, ConveyorTimer conveyor)
+        {
+
+            var siemensS7Net = PlcConnect.Instance;
+            siemensS7Net.Write($"{DbName}.{start}.0", conveyor.SetValue1);
+            siemensS7Net.Write($"{DbName}.{start + 2}.0", conveyor.SetValue2);
+
+        }
+
+
+        //
+
+    }
+}

DataBlockHelper/DataBlockHelper.csproj

@@ -48,6 +48,8 @@
   <ItemGroup>
     <Compile Include="BitHelper.cs" />
     <Compile Include="Class1.cs" />
+    <Compile Include="DBHelpers\DB112Helper.cs" />
+    <Compile Include="DBHelpers\DB112WriterHelper.cs" />
     <Compile Include="DBHelpers\DB1Helper.cs" />
     <Compile Include="DBHelpers\DB2102Helper.cs" />
     <Compile Include="DBHelpers\DB2103Helper.cs" />

DataBlockHelper/PlcConnect.cs

@@ -21,19 +21,13 @@ namespace DataBlockHelper
             SiemensPLCS siemensPLCS = SiemensPLCS.S1500;
             SiemensS7Net s7 = new SiemensS7Net(siemensPLCS);
             s7.SetPersistentConnection();
-            s7.IpAddress = "172.18.4.100";
+            s7.IpAddress = "192.168.1.110";
             s7.Port = 102;
             var su = s7.ConnectServer();
 
             if (!su.IsSuccess)
             {
-                s7.IpAddress = "192.168.0.100";
-                s7.Port = 7788;
-                var fn = s7.ConnectServer();
-                if (!fn.IsSuccess)
-                {
-                    return new SiemensS7Net(siemensPLCS);
-                }
+               
             }
 
             return s7;

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/Data/MCProject/nodeForm/LjDeliver.xml

@@ -276,306 +276,6 @@
         <Property name="Name">SPV1DBT01</Property>
         <Property name="Size">11, 12</Property>
       </Object>
-      <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="HR1OSI02" 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">0</Property>
-        <Property name="ForeColor">White</Property>
-        <Property name="Location">1551, 415</Property>
-        <Property name="Name">HR1OSI02</Property>
-        <Property name="Size">11, 12</Property>
-      </Object>
-      <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="HR1NSI02" 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">0</Property>
-        <Property name="ForeColor">White</Property>
-        <Property name="Location">1464, 417</Property>
-        <Property name="Name">HR1NSI02</Property>
-        <Property name="Size">11, 12</Property>
-      </Object>
-      <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="HR1MSI02" 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">0</Property>
-        <Property name="ForeColor">White</Property>
-        <Property name="Location">1405, 417</Property>
-        <Property name="Name">HR1MSI02</Property>
-        <Property name="Size">11, 12</Property>
-      </Object>
-      <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="HR1LSI02" 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">0</Property>
-        <Property name="ForeColor">White</Property>
-        <Property name="Location">1346, 417</Property>
-        <Property name="Name">HR1LSI02</Property>
-        <Property name="Size">11, 12</Property>
-      </Object>
-      <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="HR1KSI02" 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">0</Property>
-        <Property name="ForeColor">White</Property>
-        <Property name="Location">1287, 420</Property>
-        <Property name="Name">HR1KSI02</Property>
-        <Property name="Size">11, 12</Property>
-      </Object>
-      <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="HR1JSI02" 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">0</Property>
-        <Property name="ForeColor">White</Property>
-        <Property name="Location">1194, 416</Property>
-        <Property name="Name">HR1JSI02</Property>
-        <Property name="Size">11, 12</Property>
-      </Object>
-      <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="HR1FSI02" 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">0</Property>
-        <Property name="ForeColor">White</Property>
-        <Property name="Location">925, 417</Property>
-        <Property name="Name">HR1FSI02</Property>
-        <Property name="Size">11, 12</Property>
-      </Object>
-      <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="HR1BSI02" 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">0</Property>
-        <Property name="ForeColor">White</Property>
-        <Property name="Location">653, 417</Property>
-        <Property name="Name">HR1BSI02</Property>
-        <Property name="Size">11, 12</Property>
-      </Object>
-      <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="HR1ASI02" 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">0</Property>
-        <Property name="ForeColor">White</Property>
-        <Property name="Location">594, 416</Property>
-        <Property name="Name">HR1ASI02</Property>
-        <Property name="Size">11, 12</Property>
-      </Object>
-      <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="HR1ISI02" 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">0</Property>
-        <Property name="ForeColor">White</Property>
-        <Property name="Location">1135, 416</Property>
-        <Property name="Name">HR1ISI02</Property>
-        <Property name="Size">11, 12</Property>
-      </Object>
-      <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="HR1HSI02" 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">0</Property>
-        <Property name="ForeColor">White</Property>
-        <Property name="Location">1076, 416</Property>
-        <Property name="Name">HR1HSI02</Property>
-        <Property name="Size">11, 12</Property>
-      </Object>
-      <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="HR1GSI02" 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">0</Property>
-        <Property name="ForeColor">White</Property>
-        <Property name="Location">1016, 416</Property>
-        <Property name="Name">HR1GSI02</Property>
-        <Property name="Size">11, 12</Property>
-      </Object>
-      <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="HR1ESI02" 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">0</Property>
-        <Property name="ForeColor">White</Property>
-        <Property name="Location">866, 417</Property>
-        <Property name="Name">HR1ESI02</Property>
-        <Property name="Size">11, 12</Property>
-      </Object>
-      <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="HR1DSI02" 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">0</Property>
-        <Property name="ForeColor">White</Property>
-        <Property name="Location">771, 417</Property>
-        <Property name="Name">HR1DSI02</Property>
-        <Property name="Size">11, 12</Property>
-      </Object>
-      <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="HR1CSI02" 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">0</Property>
-        <Property name="ForeColor">White</Property>
-        <Property name="Location">712, 417</Property>
-        <Property name="Name">HR1CSI02</Property>
-        <Property name="Size">11, 12</Property>
-      </Object>
       <Object type="Mesnac.Controls.Default.SpecialLabelBlue, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="SpecialLabelBlue508" children="Controls">
         <Property name="Format" />
         <Property name="TextName" />
@@ -689,9 +389,9 @@
         <Property name="ZLDName" />
         <Property name="ALMTName" />
         <Property name="ALMDName" />
-        <Property name="Location">458, 175</Property>
+        <Property name="Location">467, 174</Property>
         <Property name="Name">DV1PCP16</Property>
-        <Property name="Size">22, 12</Property>
+        <Property name="Size">13, 22</Property>
       </Object>
       <Object type="Mesnac.Controls.Default.SpecialLabelBlue, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="SpecialLabelBlue513" children="Controls">
         <Property name="Format" />

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>
@@ -652,6 +655,7 @@
   <ItemGroup>
     <Folder Include="Data\DeviceConfig\Mesnac.Equips\" />
     <Folder Include="Data\DeviceConfig\Mesnac.Maths\" />
+    <Folder Include="Data\EventConfig\榄菊输送\" />
     <Folder Include="Data\MesnacPlugIn\" />
     <Folder Include="Data\template\" />
   </ItemGroup>