change - 输送界面添加除尘控件 空间更改

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

@@ -59,6 +59,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver
         ThreeWayValveEntity ThreeWayValveE = new ThreeWayValveEntity();
         LjSwitchEntity LjSwitchE = new LjSwitchEntity();
         MCLabelEntity LabelE = new MCLabelEntity();
+        ControlCabinetEntity CabinetE = new ControlCabinetEntity();
+
         /// <summary>
         /// 报警滚动条
         /// </summary>
@@ -103,6 +105,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver
             ControlsHelper.ControlImport<ThreeWayValve>(ThreeWayValveE, Controls);
             ControlsHelper.ControlImport<LjSwith>(LjSwitchE, Controls);
             ControlsHelper.ControlImport<MCLabel>(LabelE, Controls);
+            ControlsHelper.ControlImport<ControlCabinet>(CabinetE, Controls);
 
             this.AlarmMoveText.Font = new Font("宋体", 15f, FontStyle.Regular, GraphicsUnit.Point, 134);
             this.AlarmMoveText.ForeColor = Color.White;
@@ -408,6 +411,19 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver
             PlcTemp.DM1DSM01_Alarm = DB91.DM1DSM01.Alarm;
             PlcTemp.DM2DSM01_Alarm = DB91.DM2DSM01.Alarm;
             PlcTemp.DM3DSM01_Alarm = DB91.DM3DSM01.Alarm;
+
+            PlcTemp.DM1ASIG01_Set = DB91.DM1ASIG01.Running;
+            PlcTemp.DM1BSIG01_Set = DB91.DM1BSIG01.Running;
+            PlcTemp.DM1CSIG01_Set = DB91.DM1CSIG01.Running;
+            PlcTemp.DM1DSIG01_Set = DB91.DM1DSIG01.Running;
+            PlcTemp.DM1ESIG01_Set = DB91.DM1ESIG01.Running;
+
+            PlcTemp.DM1ASIG01_Alarm = DB91.DM1ASIG01.Alarm;
+            PlcTemp.DM1BSIG01_Alarm = DB91.DM1BSIG01.Alarm;
+            PlcTemp.DM1CSIG01_Alarm = DB91.DM1CSIG01.Alarm;
+            PlcTemp.DM1DSIG01_Alarm = DB91.DM1DSIG01.Alarm;
+            PlcTemp.DM1ESIG01_Alarm = DB91.DM1ESIG01.Alarm;
+
         }
 
         private void DBOtherGetData()
@@ -607,6 +623,23 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver
             ControlsHelper.SetSwitchLight(SwitchlightE.DM1DSM01, PlcTemp.DM1DSM01_Set, PlcTemp.DM1DSM01_Alarm);
             ControlsHelper.SetSwitchLight(SwitchlightE.DM2DSM01, PlcTemp.DM2DSM01_Set, PlcTemp.DM2DSM01_Alarm);
             ControlsHelper.SetSwitchLight(SwitchlightE.DM3DSM01, PlcTemp.DM3DSM01_Set, PlcTemp.DM3DSM01_Alarm);
+
+            ControlsHelper.SetControlCabinet(CabinetE.DM1ASIG011, PlcTemp.DM1ASIG01_Set, PlcTemp.DM1ASIG01_Alarm);
+            ControlsHelper.SetControlCabinet(CabinetE.DM1ASIG012, PlcTemp.DM1ASIG01_Set, PlcTemp.DM1ASIG01_Alarm);
+            ControlsHelper.SetControlCabinet(CabinetE.DM1ASIG013, PlcTemp.DM1ASIG01_Set, PlcTemp.DM1ASIG01_Alarm);
+            ControlsHelper.SetControlCabinet(CabinetE.DM1ASIG014, PlcTemp.DM1ASIG01_Set, PlcTemp.DM1ASIG01_Alarm);
+            ControlsHelper.SetControlCabinet(CabinetE.DM1BSIG011, PlcTemp.DM1BSIG01_Set, PlcTemp.DM1BSIG01_Alarm);
+            ControlsHelper.SetControlCabinet(CabinetE.DM1BSIG012, PlcTemp.DM1BSIG01_Set, PlcTemp.DM1BSIG01_Alarm);
+            ControlsHelper.SetControlCabinet(CabinetE.DM1CSIG011, PlcTemp.DM1CSIG01_Set, PlcTemp.DM1CSIG01_Alarm);
+            ControlsHelper.SetControlCabinet(CabinetE.DM1CSIG012, PlcTemp.DM1CSIG01_Set, PlcTemp.DM1CSIG01_Alarm);
+            ControlsHelper.SetControlCabinet(CabinetE.DM1CSIG013, PlcTemp.DM1CSIG01_Set, PlcTemp.DM1CSIG01_Alarm);
+            ControlsHelper.SetControlCabinet(CabinetE.DM1CSIG014, PlcTemp.DM1CSIG01_Set, PlcTemp.DM1CSIG01_Alarm);
+            ControlsHelper.SetControlCabinet(CabinetE.DM1DSIG011, PlcTemp.DM1DSIG01_Set, PlcTemp.DM1DSIG01_Alarm);
+            ControlsHelper.SetControlCabinet(CabinetE.DM1DSIG012, PlcTemp.DM1DSIG01_Set, PlcTemp.DM1DSIG01_Alarm);
+            ControlsHelper.SetControlCabinet(CabinetE.DM1DSIG013, PlcTemp.DM1DSIG01_Set, PlcTemp.DM1DSIG01_Alarm);
+            ControlsHelper.SetControlCabinet(CabinetE.DM1DSIG014, PlcTemp.DM1DSIG01_Set, PlcTemp.DM1DSIG01_Alarm);
+            ControlsHelper.SetControlCabinet(CabinetE.DM1ESIG01, PlcTemp.DM1ESIG01_Set, PlcTemp.DM1ESIG01_Alarm);
+
         }
 
         private void DBOtherSetData()

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/Entity/DeliverEntity.cs

@@ -226,4 +226,23 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver.Entity
         public HslBottle Bottle14 { get; set; }
         public HslBottle Bottle15 { get; set; }
     }
+
+    internal class ControlCabinetEntity
+    {
+        public ControlCabinet DM1ASIG011 { get; set; }
+        public ControlCabinet DM1ASIG012 { get; set; }
+        public ControlCabinet DM1ASIG013 { get; set; }
+        public ControlCabinet DM1ASIG014 { get; set; }
+        public ControlCabinet DM1BSIG011 { get; set; }
+        public ControlCabinet DM1BSIG012 { get; set; }
+        public ControlCabinet DM1CSIG011 { get; set; }
+        public ControlCabinet DM1CSIG012 { get; set; }
+        public ControlCabinet DM1CSIG013 { get; set; }
+        public ControlCabinet DM1CSIG014 { get; set; }
+        public ControlCabinet DM1DSIG011 { get; set; }
+        public ControlCabinet DM1DSIG012 { get; set; }
+        public ControlCabinet DM1DSIG013 { get; set; }
+        public ControlCabinet DM1DSIG014 { get; set; }
+        public ControlCabinet DM1ESIG01 { get; set; }
+    }
 }

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/Entity/PlcTempEntity.cs

@@ -346,5 +346,16 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver.Entity
         public bool HighLevel1 { get; set; }
         public bool HighLevel2 { get; set; }
         public bool HighLevel3 { get; set; }
+
+        public bool DM1ASIG01_Set { get; set; }
+        public bool DM1BSIG01_Set { get; set; }
+        public bool DM1CSIG01_Set { get; set; }
+        public bool DM1DSIG01_Set { get; set; }
+        public bool DM1ESIG01_Set { get; set; }
+        public bool DM1ASIG01_Alarm { get; set; }
+        public bool DM1BSIG01_Alarm { get; set; }
+        public bool DM1CSIG01_Alarm { get; set; }
+        public bool DM1DSIG01_Alarm { get; set; }
+        public bool DM1ESIG01_Alarm { get; set; }
     }
 }

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs

@@ -1666,18 +1666,18 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl
             ControlsHelper.SetJzf(JzfE.AS8GET02, PlcReadTemp.AS8GET02_Set);
 
 
-            ControlsHelper.SetControlCabinet(ControlCabinetE.PM1ADF01, PlcReadTemp.PM1ADF01_Set);
+            ControlsHelper.SetControlCabinet(ControlCabinetE.PM1ADF01, PlcReadTemp.PM1ADF01_Set, false);
-            ControlsHelper.SetControlCabinet(ControlCabinetE.PM1BDF01, PlcReadTemp.PM1BDF01_Set);
+            ControlsHelper.SetControlCabinet(ControlCabinetE.PM1BDF01, PlcReadTemp.PM1BDF01_Set, false);
-            ControlsHelper.SetControlCabinet(ControlCabinetE.PM1CDF01, PlcReadTemp.PM1CDF01_Set);
+            ControlsHelper.SetControlCabinet(ControlCabinetE.PM1CDF01, PlcReadTemp.PM1CDF01_Set, false);
-            ControlsHelper.SetControlCabinet(ControlCabinetE.PM1DDF01, PlcReadTemp.PM1DDF01_Set);
+            ControlsHelper.SetControlCabinet(ControlCabinetE.PM1DDF01, PlcReadTemp.PM1DDF01_Set, false);
-            ControlsHelper.SetControlCabinet(ControlCabinetE.PM1EDF01, PlcReadTemp.PM1EDF01_Set);
+            ControlsHelper.SetControlCabinet(ControlCabinetE.PM1EDF01, PlcReadTemp.PM1EDF01_Set, false);
-            ControlsHelper.SetControlCabinet(ControlCabinetE.PM1FDF01, PlcReadTemp.PM1FDF01_Set);
+            ControlsHelper.SetControlCabinet(ControlCabinetE.PM1FDF01, PlcReadTemp.PM1FDF01_Set, false);
-            ControlsHelper.SetControlCabinet(ControlCabinetE.PM1GDF01, PlcReadTemp.PM1GDF01_Set);
+            ControlsHelper.SetControlCabinet(ControlCabinetE.PM1GDF01, PlcReadTemp.PM1GDF01_Set, false);
-            ControlsHelper.SetControlCabinet(ControlCabinetE.PM1HDF01, PlcReadTemp.PM1HDF01_Set);
+            ControlsHelper.SetControlCabinet(ControlCabinetE.PM1HDF01, PlcReadTemp.PM1HDF01_Set, false);
-            ControlsHelper.SetControlCabinet(ControlCabinetE.PM1IDF01, PlcReadTemp.PM1IDF01_Set);
+            ControlsHelper.SetControlCabinet(ControlCabinetE.PM1IDF01, PlcReadTemp.PM1IDF01_Set, false);
-            ControlsHelper.SetControlCabinet(ControlCabinetE.PM1JDF01, PlcReadTemp.PM1JDF01_Set);
+            ControlsHelper.SetControlCabinet(ControlCabinetE.PM1JDF01, PlcReadTemp.PM1JDF01_Set, false);
-            ControlsHelper.SetControlCabinet(ControlCabinetE.PM1KDF01, PlcReadTemp.PM1KDF01_Set);
+            ControlsHelper.SetControlCabinet(ControlCabinetE.PM1KDF01, PlcReadTemp.PM1KDF01_Set, false);
-            ControlsHelper.SetControlCabinet(ControlCabinetE.PM1LDF01, PlcReadTemp.PM1LDF01_Set);
+            ControlsHelper.SetControlCabinet(ControlCabinetE.PM1LDF01, PlcReadTemp.PM1LDF01_Set, false);
 
             ControlsHelper.SetMCLabel(LabelE.DryMode4, DB2107.Dryer[3].Mode, 1);
             ControlsHelper.SetMCLabel(LabelE.DryStatus4, DB2107.Dryer[3].Status, 2);

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Util/ControlsImprot.cs

@@ -244,9 +244,13 @@ namespace Mesnac.Action.ChemicalWeighing.Util
         /// </summary>
         /// <param name="obj"></param>
         /// <param name="set"></param>
-        public static void SetControlCabinet(ControlCabinet obj, bool set)
+        public static void SetControlCabinet(ControlCabinet obj, bool set, bool alarm)
         {
-            if (set == true)
+            if (alarm == true)
+            {
+                obj.Status = ControlCabinet.Statuses.Alarm;
+            }
+            else if (set == true)
             {
                 obj.Status = ControlCabinet.Statuses.TurnOn;
             }

Controls/Mesnac.Controls.ChemicalWeighing/ControlCabinet.cs

@@ -17,7 +17,8 @@ namespace Mesnac.Controls.ChemicalWeighing
         public enum Statuses
         {
             TurnOff = 0,
-            TurnOn = 1
+            TurnOn = 1,
+            Alarm = 2,
         }
         private bool bNewPic = false;
         private string _statusName;
@@ -39,9 +40,10 @@ namespace Mesnac.Controls.ChemicalWeighing
         {
             base.Init();
             _imageStream = null;
-            sImages = new string[2];
+            sImages = new string[3];
             sImages[0] = "Mesnac.Controls.ChemicalWeighing.Resources.controlCabinet.png";//zsTurnOff
             sImages[1] = "Mesnac.Controls.ChemicalWeighing.Resources.controlCabinet1.png";//zsTurnOn
+            sImages[2] = "Mesnac.Controls.ChemicalWeighing.Resources.controlCabinet0.png";//zsAlarm
             _status = Statuses.TurnOff;
         }
 
@@ -90,7 +92,7 @@ namespace Mesnac.Controls.ChemicalWeighing
                 {
                     _status = (Statuses)0;
                 }
-                else if ((int)value > 1)
+                else if ((int)value > 2)
                 {
                     _status = (Statuses)1;
                 }

DataBlockHelper/DBHelpers/DB91Helper.cs

@@ -21,17 +21,18 @@ namespace DataBlockHelper.DBHelpers
         public ForMotorEntity DM1BSIG01 => new ForMotorEntity(4, bytes);
         public ForMotorEntity DM1CSIG01 => new ForMotorEntity(6, bytes);
         public ForMotorEntity DM1DSIG01 => new ForMotorEntity(8, bytes);
-        public ForMotorEntity DM1GDS01 => new ForMotorEntity(10, bytes);
+        public ForMotorEntity DM1ESIG01 => new ForMotorEntity(10, bytes);
-        public ForMotorEntity DM1GDS02 => new ForMotorEntity(12, bytes);
+        public ForMotorEntity DM1GDS01 => new ForMotorEntity(12, bytes);
+        public ForMotorEntity DM1GDS02 => new ForMotorEntity(14, bytes);
 
-        public ForMotorEntity DM1GDS03 => new ForMotorEntity(14, bytes);
+        public ForMotorEntity DM1GDS03 => new ForMotorEntity(16, bytes);
 
-        public ForMotorEntity DM1GDS04 => new ForMotorEntity(16, bytes);
+        public ForMotorEntity DM1GDS04 => new ForMotorEntity(18, bytes);
 
-        public ForMotorEntity DM1GDS05 => new ForMotorEntity(18, bytes);
+        public ForMotorEntity DM1GDS05 => new ForMotorEntity(20, bytes);
 
 
-        public ForMotorEntity DM1GDS06 => new ForMotorEntity(20, bytes);
+        public ForMotorEntity DM1GDS06 => new ForMotorEntity(22, bytes);
 
         public ForMotorEntity DM1GDS07 => new ForMotorEntity(24, bytes);