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

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

@@ -74,7 +74,7 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl.Entity
         public int ValueWeight1 { get; set; }
         public int ValueWeight2 { get; set; }
         public int ValueWeight3 { get; set; }
-        public int ValueWeight4 { get; set; }
+        public string ValueWeight4 { get; set; }
 
         public float topPressure_V1_Set { get; set; }
         public float topPressure_V2_Set { get; set; }

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

@@ -1442,25 +1442,27 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl
             //yang 4特殊处理下 采用2107
 
 
-            if (!PlcReadTemp.DM2DSF01L_Set && !PlcReadTemp.DM2DSF01R_Set)
+            //if (!PlcReadTemp.DM2DSF01L_Set && !PlcReadTemp.DM2DSF01R_Set)
-            {
+            //{
-                PlcReadTemp.ValueWeight4 = 0;
+            //    PlcReadTemp.ValueWeight4 = "0";
-            }
+            //}
-            else
+            //else
-            {
+            //{
-               
-            }
                
+            //}
             if (PlcReadTemp.DM2DSF01L_Set)
             {
-                PlcReadTemp.ValueWeight4 = Convert.ToInt32(DB2107.Weter[6].FeedValue.ToString());
+
+                PlcReadTemp.ValueWeight4 = DB2107.Weter[6].FeedValue.ToString("0.#");
             }
             else
             {
-                PlcReadTemp.ValueWeight4 = Convert.ToInt32(DB2107.Weter[7].FeedValue.ToString());
+
+                PlcReadTemp.ValueWeight4 = DB2107.Weter[7].FeedValue.ToString("0.#");
             }
 
 
+
             SetMCLabel(LabelE.ValueWeight1, PlcReadTemp.ValueWeight1);
             SetMCLabel(LabelE.ValueWeight2, PlcReadTemp.ValueWeight2);
             SetMCLabel(LabelE.ValueWeight3, PlcReadTemp.ValueWeight3);