yang 4特殊处理下 采用2107

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

@@ -1040,19 +1040,18 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl
 
             if (DB2103.DM2DSF01.Running)
             {
-                //if (DB2103.DM2DSF01.Polarity)
+                if (DB2103.DM2DSF01.Polarity)
-                //{
+                {
-                //    PlcReadTemp.DM2DSF01L_Set = true;
-                //    PlcReadTemp.DM2DSF01R_Set = false;
-                //}
-                //else
-                //{
-                //    PlcReadTemp.DM2DSF01L_Set = false;
-                //    PlcReadTemp.DM2DSF01R_Set = true;
-                //}
                     PlcReadTemp.DM2DSF01L_Set = true;
+                    PlcReadTemp.DM2DSF01R_Set = false;
+                }
+                else
+                {
+                    PlcReadTemp.DM2DSF01L_Set = false;
                     PlcReadTemp.DM2DSF01R_Set = true;
                 }
+                
+            }
             else
             {
                 PlcReadTemp.DM2DSF01L_Set = false;
@@ -1357,9 +1356,32 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl
             PlcReadTemp.ValueWeight2 = DB2119.Spiral_B.Value_Weight;
             PlcReadTemp.ValueWeight3 = DB2119.Spiral_C.Value_Weight;
 
+            //yang 4特殊处理下 采用2107
+
+
+            if(!PlcReadTemp.DM2DSF01L_Set&& !PlcReadTemp.DM2DSF01L_Set)
+            {
+                PlcReadTemp.ValueWeight4 = 0;
+            }
+            else
+            {
+                if (PlcReadTemp.DM2DSF01L_Set)
+                {
+                    PlcReadTemp.ValueWeight4 = Convert.ToInt32(DB2107.Weter[6].Speed.ToString());
+                }
+                else
+                {
+                    PlcReadTemp.ValueWeight4 = Convert.ToInt32(DB2107.Weter[7].Speed.ToString());
+                }
+            }
+
+
+
             SetMCLabel(LabelE.ValueWeight1, PlcReadTemp.ValueWeight1);
             SetMCLabel(LabelE.ValueWeight2, PlcReadTemp.ValueWeight2);
             SetMCLabel(LabelE.ValueWeight3, PlcReadTemp.ValueWeight3);
+            //yang 增加4的显示
+            SetMCLabel(LabelE.ValueWeight4, PlcReadTemp.ValueWeight4);
 
             SetStateButton(DetailE.WatchDog, PlcReadTemp.WatchDog_Set);
             SetSystemStateShow(DetailE.EMStop, PlcReadTemp.EMStop_Set);