合并

ProductionSystem/Forms/HomeFormInfo.cs

@@ -554,6 +554,9 @@ namespace ProductionSystem.Forms
             EditonType editonType;
             while (!cancellationTokenSource.IsCancellationRequested && middleIsCanRound)
             {
+
+                Step1();
+
                 if (!Program.canSaveDb)
                 {
                     continue;
@@ -1393,7 +1396,7 @@ namespace ProductionSystem.Forms
                     {
                         t.Electricity = GetPlcValue("D1202");
                         t.Voltage = GetPlcValue("D1200");
-                        if (t.Electricity != "0.000" || t.Voltage != "0.000")
+                        if (t.Electricity.ToDouble()>0 && t.Voltage.ToDouble()>0)
                         {
                             _result2Service.AddTResult2(t);
                         }
@@ -1404,7 +1407,7 @@ namespace ProductionSystem.Forms
                     {
                         t.Electricity = GetPlcValue("D1206");
                         t.Voltage = GetPlcValue("D1204");
-                        if (t.Electricity != "0.000" || t.Voltage != "0.000")
+                        if (t.Electricity.ToDouble() > 0 && t.Voltage.ToDouble() > 0)
                         {
                             _result2Service.AddTResult2(t);
                         }
@@ -1414,7 +1417,7 @@ namespace ProductionSystem.Forms
                     {
                         t.Electricity = GetPlcValue("D1210");
                         t.Voltage = GetPlcValue("D1208");
-                        if (t.Electricity != "0.000" || t.Voltage != "0.000")
+                        if (t.Electricity.ToDouble() > 0 && t.Voltage.ToDouble() > 0)
                         {
                             _result2Service.AddTResult2(t);
                         }
@@ -1424,7 +1427,7 @@ namespace ProductionSystem.Forms
                     {
                         t.Xll = GetPlcValue("D1224");
                         t.Xllzt = GetPlcValue("D1226");
-                        if (t.Xll != "0.000" || t.Xllzt != "0.000")
+                        if (t.Xll.ToDouble()>0 )
                         {
                             _result2Service.AddTResult2(t);
                         }
@@ -1437,7 +1440,7 @@ namespace ProductionSystem.Forms
 
                         t.Xll = GetPlcValue("D1214");
                         t.Xllzt = GetPlcValue("D1114");
-                        if (t.Xll != "0.000" || t.Xllzt != "0.000")
+                        if (t.Xll.ToDouble() > 0 )
                         {
                             _result2Service.AddTResult2(t);
                         }
@@ -1449,7 +1452,7 @@ namespace ProductionSystem.Forms
                     {
                         t.Xll = GetPlcValue("D1216");
                         t.Xllzt = GetPlcValue("D1116");
-                        if (t.Xll != "0.000" || t.Xllzt != "0.000")
+                        if (t.Xll.ToDouble() > 0 )
                         {
                             _result2Service.AddTResult2(t);
                         }
@@ -1459,7 +1462,7 @@ namespace ProductionSystem.Forms
                     {
                         t.Xll = GetPlcValue("D1212");
                         t.Xllzt = GetPlcValue("D1112");
-                        if (t.Xll != "0.000" || t.Xllzt != "0.000")
+                        if (t.Xll.ToDouble() > 0)
                         {
                             _result2Service.AddTResult2(t);
                         }

ProductionSystem/Program.cs

@@ -22,6 +22,7 @@ using NewLife.Log;
 
 namespace ProductionSystem
 {
+    //杨
     internal static class Program
     {
         #region 使用的Win32函数的声明