Merge branch 'main' of http://175.27.215.92:3000/liulb/AUCMA_SCADA

Aucma.Core.BoxFoam/ViewModels/FoamMonitorPageViewModel.cs

@@ -302,8 +302,8 @@ namespace Aucma.Core.BoxFoam.ViewModels
                     if (item.Status == 0) StatusColor.Add("Red");
                     if (!string.IsNullOrEmpty(item.FixtureBoxType)) FixtureName.Add(item.FixtureBoxType);
                     if (!string.IsNullOrEmpty(item.Yield.ToString())) Production.Add(item.Yield.ToString());
-                    if (!string.IsNullOrEmpty(item.InternalTemperature.ToString())) InternalTemperature.Add(item.InternalTemperature.ToString());
-                    if (!string.IsNullOrEmpty(item.OutsideTemperature.ToString())) OutsideTemperature.Add(item.OutsideTemperature.ToString());
+              //      if (!string.IsNullOrEmpty(item.InternalTemperature.ToString())) InternalTemperature.Add(item.InternalTemperature.ToString());
+              //      if (!string.IsNullOrEmpty(item.OutsideTemperature.ToString())) OutsideTemperature.Add(item.OutsideTemperature.ToString());
                     if (!string.IsNullOrEmpty(item.ProductionCycle.ToString())) Beat.Add(item.ProductionCycle.ToString());
 
                     totalAmount = totalAmount + item.Yield;

Aucma.Core.BoxFoam/appsettings.json

@@ -210,11 +210,19 @@
       "EquipName": "foamLine1Plc",
       "PlcType": "Siemens",
       "Enabled": true,
-      "IP": "10.10.93.1",
-      "Port": 102
+      "IP": "127.0.0.1",
+      "Port": 103
     },
     {
       "Id": 3,
+      "EquipName": "foamLine2Plc",
+      "PlcType": "Siemens",
+      "Enabled": true,
+      "IP": "127.0.0.1",
+      "Port": 104
+    },
+    {
+      "Id": 4,
       "EquipName": "foamMachinePlc",
       "PlcType": "Siemens",
       "Enabled": true,