@ -78,6 +78,7 @@
<ItemGroup>
<ProjectReference Include="..\Admin.Core.Extensions\Admin.Core.Extensions.csproj" />
<ProjectReference Include="..\Aucma.Core.BoxFoam\Aucma.Core.BoxFoam.csproj" />
<ProjectReference Include="..\Aucma.Core.DataCollector\Aucma.Core.DataCollector.csproj" />
</ItemGroup>
@ -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 注册服务
@ -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",
"IP": "10.10.92.72",
"Port": 2014
"Id": 2,
"EquipName": "ShellStore",
"IP": "10.10.92.22",
"Port": 2015
"Id": 3,
"EquipName": "LinerStore",
"IP": "10.10.92.29",
"Id": 4,
"EquipName": "ShellPreassemble",
"IP": "10.10.92.10",
"Id": 5,
"EquipName": "LinerPreassemble",
"IP": "10.10.92.1",
"Id": 6,
"EquipName": "FoamBack",
"IP": "10.10.92.49",
"Id": 7,
"EquipName": "Palletiz",
"IP": "10.10.92.80", //10.10.92.80
@ -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)