推送

ProductionSystem/Forms/HomeFormInfo.Designer.cs

@@ -1,6 +1,6 @@
 namespace ProductionSystem.Forms
 {
-    partial class HomeForm
+    partial class HomeFormInfo
     {
         /// <summary>
         /// Required designer variable.

ProductionSystem/Forms/HomeFormInfo.cs

@@ -38,7 +38,7 @@ using System.Collections;
 
 namespace ProductionSystem.Forms
 {
-    public partial class HomeForm : XtraForm
+    public partial class HomeFormInfo : XtraForm
     {
         private readonly DicService _dicService = new DicService();
         private readonly ParaColumnConfigService _paraColumnConfigService = new ParaColumnConfigService();
@@ -60,7 +60,7 @@ namespace ProductionSystem.Forms
 
         CancellationToken cureCancellationToken;
 
-        public HomeForm()
+        public HomeFormInfo()
         {
             InitializeComponent();
             // Program.ProtocolDeviceHelper = new ProtocolDeviceHelper();
@@ -1992,9 +1992,68 @@ namespace ProductionSystem.Forms
                                             {
                                                 head = GetPlcValue("D1100").ToDouble().ToInt();
                                             }
+                                            //电流采集值
+                                            if (testResultPoint.Address == "D1202")
+                                            {
+                                                head = GetPlcValue("D1102").ToDouble().ToInt();
+                                            }
+                                        }
+                                        else if(paraCategory == "BZ2")
+                                        {
+                                            //电压采集值
+                                            if (testResultPoint.Address == "D1204")
+                                            {
+                                                head = GetPlcValue("D1104").ToDouble().ToInt();
+                                            }
+                                            //电流采集值
+                                            if (testResultPoint.Address == "D1206")
+                                            {
+                                                head = GetPlcValue("D1106").ToDouble().ToInt();
+                                            }
+                                        }
+                                        else if (paraCategory == "BZ3")
+                                        {
+                                            //电压采集值
+                                            if (testResultPoint.Address == "D1208")
+                                            {
+                                                head = GetPlcValue("D1108").ToDouble().ToInt();
+                                            }
+                                            //电流采集值
+                                            if (testResultPoint.Address == "D1210")
+                                            {
+                                                head = GetPlcValue("D1110").ToDouble().ToInt();
+                                            }
+                                        }
+                                        else if (paraCategory == "BZ4")
+                                        {
+                                            if (testResultPoint.Address == "D1224")
+                                            {
+                                                head = GetPlcValue("D1226").ToDouble().ToInt();
+                                            }                                          
                                         }
-                                        
-                                        
+                                        else if (paraCategory == "BZ5")
+                                        {
+                                            if (testResultPoint.Address == "D1214")
+                                            {
+                                                head = GetPlcValue("D1114").ToDouble().ToInt();
+                                            }
+                                        }
+                                        else if (paraCategory == "BZ6")
+                                        {
+                                            if (testResultPoint.Address == "D1216")
+                                            {
+                                                head = GetPlcValue("D1116").ToDouble().ToInt();
+                                            }
+                                        }
+                                        else if (paraCategory == "BZ7")
+                                        {
+                                            if (testResultPoint.Address == "D1212")
+                                            {
+                                                head = GetPlcValue("D1112").ToDouble().ToInt();
+                                            }
+                                        }
+
+
                                         var testResult = OmronHelper.GetPlcVal(testResultPoint.DataType, testResultPoint.Address);
                                         testResultPoint.Val = testResult.val;
                                         result = testResult.val;
@@ -2113,7 +2172,7 @@ namespace ProductionSystem.Forms
                     control.TestResultText = "NG";
                     break;
             }
-            
+            //control.TestResultBackColor = Color.Red;
         }
 
 

ProductionSystem/Forms/MainForm.cs

@@ -177,7 +177,7 @@ namespace ProductionSystem.Forms
                 case "bar_BtnShowIndex"://首页
                     if (!CheckHasMdiChildForm("HomeForm"))
                     {
-                        HomeForm homeForm = new HomeForm
+                        HomeFormInfo homeForm = new HomeFormInfo
                         {
                             MdiParent = this,
                             Dock = DockStyle.Fill

ProductionSystem/ProductionSystem.csproj

@@ -234,11 +234,11 @@
     <Compile Include="Forms\CommonForms\MyBaseForm.Designer.cs">
       <DependentUpon>MyBaseForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="Forms\HomeForm.cs">
+    <Compile Include="Forms\HomeFormInfo.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Forms\HomeForm.Designer.cs">
-      <DependentUpon>HomeForm.cs</DependentUpon>
+    <Compile Include="Forms\HomeFormInfo.Designer.cs">
+      <DependentUpon>HomeFormInfo.cs</DependentUpon>
     </Compile>
     <Compile Include="Forms\MainForm.cs">
       <SubType>Form</SubType>
@@ -435,8 +435,8 @@
     <EmbeddedResource Include="Forms\CommonForms\MyBaseForm.resx">
       <DependentUpon>MyBaseForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Forms\HomeForm.resx">
-      <DependentUpon>HomeForm.cs</DependentUpon>
+    <EmbeddedResource Include="Forms\HomeFormInfo.resx">
+      <DependentUpon>HomeFormInfo.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Forms\MainForm.resx">
       <DependentUpon>MainForm.cs</DependentUpon>