diff --git a/Aucma.Core.CodeBinding/Aucma.Core.CodeBinding.csproj b/Aucma.Core.CodeBinding/Aucma.Core.CodeBinding.csproj
index 499c8941..c722d4c6 100644
--- a/Aucma.Core.CodeBinding/Aucma.Core.CodeBinding.csproj
+++ b/Aucma.Core.CodeBinding/Aucma.Core.CodeBinding.csproj
@@ -78,6 +78,7 @@
+
diff --git a/Aucma.Core.CodeBinding/Startup.cs b/Aucma.Core.CodeBinding/Startup.cs
index 7ac47453..97613316 100644
--- a/Aucma.Core.CodeBinding/Startup.cs
+++ b/Aucma.Core.CodeBinding/Startup.cs
@@ -8,6 +8,7 @@ using Admin.Core.Repository;
using Admin.Core.Service;
using Admin.Core.Socket;
using Admin.Core.Tasks;
+using Aucma.Core.DataCollector;
using Aucma.Core.RunPlc;
using Aucma.Core.Scanner;
using Aucma.Core.ScannerGun;
@@ -114,6 +115,8 @@ namespace Aucma.Core.CodeBinding
app.UsePlcMildd(runPlcService);
// Socketɨ
app.UseTouchSocketMildd(socket);
+
+ app.UseDataCollectorExtensions();
}
#region ע
diff --git a/Aucma.Core.CodeBinding/appsettings.json b/Aucma.Core.CodeBinding/appsettings.json
index 45595cba..e7610a5b 100644
--- a/Aucma.Core.CodeBinding/appsettings.json
+++ b/Aucma.Core.CodeBinding/appsettings.json
@@ -212,6 +212,9 @@
"Name": "sn扫码器"
}
],
+ "StationInfo": {
+ "StationCode": "1010"
+ },
"PLCServer": [
{
"Id": 1,
@@ -219,9 +222,57 @@
"PlcType": "Melsec",
"Enabled": true,
//"IP": "127.0.0.1",
- // "Port": 6000
- "IP": "10.10.92.70",
+ // "Port": 6000
+ "IP": "10.10.92.72",
"Port": 2014
+ },
+ {
+ "Id": 2,
+ "EquipName": "ShellStore",
+ "PlcType": "Melsec",
+ "Enabled": true,
+ "IP": "10.10.92.22",
+ "Port": 2015
+ },
+ {
+ "Id": 3,
+ "EquipName": "LinerStore",
+ "PlcType": "Melsec",
+ "Enabled": true,
+ "IP": "10.10.92.29",
+ "Port": 2015
+ },
+ {
+ "Id": 4,
+ "EquipName": "ShellPreassemble",
+ "PlcType": "Melsec",
+ "Enabled": true,
+ "IP": "10.10.92.10",
+ "Port": 2015
+ },
+ {
+ "Id": 5,
+ "EquipName": "LinerPreassemble",
+ "PlcType": "Melsec",
+ "Enabled": true,
+ "IP": "10.10.92.1",
+ "Port": 2015
+ },
+ {
+ "Id": 6,
+ "EquipName": "FoamBack",
+ "PlcType": "Melsec",
+ "Enabled": true,
+ "IP": "10.10.92.49",
+ "Port": 2015
+ },
+ {
+ "Id": 7,
+ "EquipName": "Palletiz",
+ "PlcType": "Melsec",
+ "Enabled": true,
+ "IP": "10.10.92.80", //10.10.92.80
+ "Port": 2015
}
],
diff --git a/Aucma.Core.DataCollector/DataCollectorFactory.cs b/Aucma.Core.DataCollector/DataCollectorFactory.cs
index 223f0cad..011ff764 100644
--- a/Aucma.Core.DataCollector/DataCollectorFactory.cs
+++ b/Aucma.Core.DataCollector/DataCollectorFactory.cs
@@ -25,7 +25,7 @@ namespace Aucma.Core.DataCollector
public readonly IRecordDeviceElectricityServices _deviceElectricityServices;
public int AlarmReadTimer = (1000 * 5);
- public int EleReadTimer = (1000 * 20);
+ public int EleReadTimer = (1000 * 5);
public DataCollectorFactory(IBaseDeviceParamServices deviceParamServices, IRecordDeviceAlarmInfoServices deviceAlarmInfoServices, IRecordDeviceElectricityServices deviceElectricityServices)
{