Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/PlcReadTempEntity.cs

@@ -71,9 +71,9 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl.Entity
         public bool DMWETER7_Alarm { get; set; }
         public bool DMWETER8_Alarm { get; set; }
 
-        public int ValueWeight1 { get; set; }
-        public int ValueWeight2 { get; set; }
-        public int ValueWeight3 { get; set; }
+        public string ValueWeight1 { get; set; }
+        public string ValueWeight2 { get; set; }
+        public string ValueWeight3 { get; set; }
         public string ValueWeight4 { get; set; }
 
         public float topPressure_V1_Set { get; set; }
@@ -139,10 +139,13 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl.Entity
         public bool DM1MSF01_Set { get; set; }
         public bool DM1NSF01_Set { get; set; }
         public bool DM1OSF01_Set { get; set; }
+
+
         public bool DM2ASF01L_Set { get; set; }
         public bool DM2BSF01L_Set { get; set; }
         public bool DM2CSF01L_Set { get; set; }
         public bool DM2DSF01L_Set { get; set; }
+
         public bool DM2ASF01R_Set { get; set; }
         public bool DM2BSF01R_Set { get; set; }
         public bool DM2CSF01R_Set { get; set; }

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

@@ -23,11 +23,7 @@ using System.Reflection;
 using DataBlockHelper;
 using System.Drawing;
 using Mesnac.Action.ChemicalWeighing.MinAn;
-using HslCommunication.Core;
 using Mesnac.Action.ChemicalWeighing.FreeDb;
-using Mesnac.Action.ChemicalWeighing.ManualControl;
-using DevExpress.Pdf.Native;
-using DevExpress.Utils.Drawing.Helpers;
 using Mesnac.Action.ChemicalWeighing.InterfaceDocking;
 using Mesnac.Action.ChemicalWeighing.Report;
 
@@ -1023,7 +1019,7 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl
 
             if (DB2103.DM2ASF01.Running)
             {
-                if (DB2119.Spiral_A.Polarty)
+                if (DB2103.DM2ASF01.Polarity)
                 {
                     PlcReadTemp.DM2ASF01L_Set = true;
                     PlcReadTemp.DM2ASF01R_Set = false;
@@ -1042,9 +1038,11 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl
                 PlcReadTemp.DM2ASF01R_Set = false;
             }
 
+
+
             if (DB2103.DM2BSF01.Running)
             {
-                if (DB2119.Spiral_B.Polarty)
+                if (DB2103.DM2BSF01.Polarity)
                 {
                     PlcReadTemp.DM2BSF01L_Set = true;
                     PlcReadTemp.DM2BSF01R_Set = false;
@@ -1063,9 +1061,11 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl
                 PlcReadTemp.DM2BSF01R_Set = false;
             }
 
+
+
             if (DB2103.DM2CSF01.Running)
             {
-                if (DB2119.Spiral_C.Polarty)
+                if (DB2103.DM2CSF01.Polarity)
                 {
                     PlcReadTemp.DM2CSF01L_Set = true;
                     PlcReadTemp.DM2CSF01R_Set = false;
@@ -1084,6 +1084,10 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl
                 PlcReadTemp.DM2CSF01R_Set = false;
             }
 
+
+
+            
+
             if (DB2103.DM2DSF01.Running)
             {
                 if (DB2103.DM2DSF01.Polarity)
@@ -1398,9 +1402,9 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl
             PlcReadTemp.PM1KDF01_Set = DB2107.Valve.PM1KDF01;
             PlcReadTemp.PM1LDF01_Set = DB2107.Valve.PM1LDF01;
 
-            PlcReadTemp.ValueWeight1 = DB2119.Spiral_A.Value_Weight;
-            PlcReadTemp.ValueWeight2 = DB2119.Spiral_B.Value_Weight;
-            PlcReadTemp.ValueWeight3 = DB2119.Spiral_C.Value_Weight;
+            //PlcReadTemp.ValueWeight1 = DB2119.Spiral_A.Value_Weight;
+            //PlcReadTemp.ValueWeight2 = DB2119.Spiral_B.Value_Weight;
+            //PlcReadTemp.ValueWeight3 = DB2119.Spiral_C.Value_Weight;
 
             //yang 4特殊处理下 采用2107
 
@@ -1413,6 +1417,40 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl
             //{
 
             //}
+
+            //DM2ASF01L_Set
+
+            if (PlcReadTemp.DM2ASF01L_Set)
+            {
+                PlcReadTemp.ValueWeight1 = DB2107.Weter[0].FeedValue.ToString("0.#");
+            }
+            else
+            {
+                PlcReadTemp.ValueWeight1 = DB2107.Weter[1].FeedValue.ToString("0.#");
+            }
+
+            //
+            if (PlcReadTemp.DM2BSF01L_Set)
+            {
+                PlcReadTemp.ValueWeight2 = DB2107.Weter[2].FeedValue.ToString("0.#");
+            }
+            else
+            {
+                PlcReadTemp.ValueWeight2 = DB2107.Weter[3].FeedValue.ToString("0.#");
+            }
+
+            
+
+            if (PlcReadTemp.DM2CSF01L_Set)
+            {
+                PlcReadTemp.ValueWeight3 = DB2107.Weter[4].FeedValue.ToString("0.#");
+            }
+            else
+            {
+                PlcReadTemp.ValueWeight3 = DB2107.Weter[5].FeedValue.ToString("0.#");
+            }
+
+
             if (PlcReadTemp.DM2DSF01L_Set)
             {