RIZO/Valeo_Line_MES_backend
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

进站

Browse Source
This commit is contained in:
gcw_MV9p2JJN 2026-01-31 13:14:19 +08:00
parent 93f27b6bfd
commit 60b493e2a3
25 changed files with 1005 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

232
RIZO.Admin.WebApi/appsettings.json
View File

@ -119,11 +119,11 @@
"PlcType": "S71500",
"IpAddress": "192.168.10.41",
"IntoStation": {
"Heartbeat": "待定.DBW0", // 心跳地址
"IntoStationAsk": "DB1001.DBW2002", // 进站请求地址
"Heartbeat": "DB1000.DBW0", // 心跳地址
"IntoStationAsk": "DB1001.DBW2000", // 进站请求地址
"ProductModel": "DB1001.DBB1000",
"ProductSN": "DB1001.DBB1054",
"IntoStationResp": "待定.DBW2002" // 进站回复结果地址
"IntoStationResp": "DB1000.DBW2002" // 进站回复结果地址
}
},
{
@ -133,11 +133,11 @@
"PlcType": "S71500",
"IpAddress": "192.168.10.56",
"IntoStation": {
"Heartbeat": "待定.DBW0", // 心跳地址
"IntoStationAsk": "待定", // 进站请求地址
"ProductModel": "待定.DBB1016",
"ProductSN": "待定",
"IntoStationResp": "待定.DBW2002" // 进站回复结果地址
"Heartbeat": "DB1000.DBW0", // 心跳地址
"IntoStationAsk": "DB1001.DBW2000", // 进站请求地址
"ProductModel": "DB1001.DBB4060",
"ProductSN": "DB1001.DBB2300",
"IntoStationResp": "DB1000.DBW2000" // 进站回复结果地址
}
},
{
@ -147,11 +147,11 @@
"PlcType": "S71500",
"IpAddress": "192.168.10.71",
"IntoStation": {
"Heartbeat": "DB1001.DBW0", // 心跳地址
"IntoStationAsk": "DB1001.DBW2002", // 进站请求地址
"Heartbeat": "DB1000.DBW0", // 心跳地址
"IntoStationAsk": "DB1001.DBW2000", // 进站请求地址
"ProductModel": "DB1001.DBB1000",
"ProductSN": "DB1001.DBB1054",
"IntoStationResp": "待定DBW2002" // 进站回复结果地址
"ProductSN": "DB1001.DBB2230",
"IntoStationResp": "DB1000.DBW2000" // 进站回复结果地址
}
},
{
@ -161,11 +161,11 @@
"PlcType": "S71500",
"IpAddress": "192.168.10.1",
"IntoStation": {
"Heartbeat": "待定", // 心跳地址
"IntoStationAsk": "DB300.DBW2002", // 进站请求地址
"Heartbeat": "DB300.DBW0", // 心跳地址
"IntoStationAsk": "DB300.DBW42", // 进站请求地址
"ProductModel": "DB300.DBB728",
"ProductSN": "DB300.DBB778",
"IntoStationResp": "待定DBW46" // 进站回复结果地址
"IntoStationResp": "DB300.DBW46" // 进站回复结果地址
}
},
{
@ -175,13 +175,28 @@
"PlcType": "S71500",
"IpAddress": "192.168.10.147",
"IntoStation": {
"Heartbeat": "待定", // 心跳地址
"IntoStationAsk": "DB1001.待定", // 进站请求地址
"Heartbeat": "DB1000.DBW0", // 心跳地址
"IntoStationAsk": "DB1001.DBW2000", // 进站请求地址
"ProductModel": "DB1001.DBB1000",
"ProductSN": "DB1001.DBB1054",
"ProductSN": "DB1001.DBB778",
"IntoStationResp": "DB1000.DBW2000" // 进站回复结果地址
}
},
{
"Id": 41,
"WorkStationCode": "OP51扫码",
"WorkStationName": "OP51扫码 Coating扫码",
"PlcType": "S71500",
"IpAddress": "待定",
"IntoStation": {
"Heartbeat": "待定", // 心跳地址
"IntoStationAsk": "待定", // 进站请求地址
"ProductModel": "待定",
"ProductSN": "待定",
"IntoStationResp": "待定" // 进站回复结果地址
}
},
{
"Id": 6,
"WorkStationCode": "OP057",
@ -189,27 +204,14 @@
"PlcType": "S71500",
"IpAddress": "192.168.10.177",
"IntoStation": {
"Heartbeat": "DB1020.DBW0", // 心跳地址
"Heartbeat": "DB1000.DBW0", // 心跳地址
"IntoStationAsk": "DB1001.DBW2000", // 进站请求地址
"ProductModel": "DB1001.DBB1000",
"ProductSN": "DB1001.DBB1054",
"IntoStationResp": "DB1020.DBW2000" // 进站回复结果地址
}
},
{
"Id": 6,
"WorkStationCode": "OP057",
"WorkStationName": "OP057 压装定位销&激光打标",
"PlcType": "S71500",
"IpAddress": "192.168.10.177",
"IntoStation": {
"Heartbeat": "DB1020.DBW0", // 心跳地址
"IntoStationAsk": "DB1001.DBW2000", // 进站请求地址
"ProductModel": "DB1001.DBB1000",
"ProductSN": "DB1001.DBB1054",
"IntoStationResp": "DB1020.DBW2000" // 进站回复结果地址
"IntoStationResp": "DB1000.DBW2000" // 进站回复结果地址
}
},
{
"Id": 7,
"WorkStationCode": "OP058",
@ -217,11 +219,11 @@
"PlcType": "S71500",
"IpAddress": "192.168.10.177",
"IntoStation": {
"Heartbeat": "DB1021.DBW0", // 心跳地址
"IntoStationAsk": "DB1001.DBW2000", // 进站请求地址
"ProductModel": "DB1001.DBB1000",
"ProductSN": "DB1001.DBB1054",
"IntoStationResp": "DB1021.DBW2000" // 进站回复结果地址
"Heartbeat": "DB1003.DBW0", // 心跳地址
"IntoStationAsk": "DB1004.DBW2000", // 进站请求地址
"ProductModel": "DB1004.DBB1000",
"ProductSN": "DB1004.DBB1054",
"IntoStationResp": "DB1003.DBW2000" // 进站回复结果地址
}
},
{
@ -231,11 +233,11 @@
"PlcType": "S71500",
"IpAddress": "192.168.10.207",
"IntoStation": {
"Heartbeat": "DB1001.DBW0", // 心跳地址
"Heartbeat": "DB1000.DBW0", // 心跳地址
"IntoStationAsk": "DB1001.DBW2000", // 进站请求地址
"ProductModel": "DB1001.DBB1000",
"ProductSN": "DB1001.DBB1054",
"IntoStationResp": "DB1001.DBW2000" // 进站回复结果地址
"IntoStationResp": "DB1000.DBW2000" // 进站回复结果地址
}
},
{
@ -260,11 +262,11 @@
"PlcType": "S71500",
"IpAddress": "192.168.10.222",
"IntoStation": {
"Heartbeat": "DB1010.DBW0", // 心跳地址
"Heartbeat": "DB1000.DBW0", // 心跳地址
"IntoStationAsk": "DB1001.DBW2000", // 进站请求地址
"ProductModel": "DB1001.DBB1000",
"ProductSN": "DB1001.DBB1054",
"IntoStationResp": "DB1010.DBW2000" // 进站回复结果地址
"IntoStationResp": "DB1000.DBW2000" // 进站回复结果地址
}
},
{
@ -274,11 +276,11 @@
"PlcType": "S71500",
"IpAddress": "192.168.11.11",
"IntoStation": {
"Heartbeat": "DB1010.DBW0", // 心跳地址
"IntoStationAsk": "DB1020.DBW2000", // 进站请求地址
"ProductModel": "DB1020.DBB待定",
"ProductSN": "DB1020.DBB待定",
"IntoStationResp": "DB1010.DBW2000" // 进站回复结果地址
"Heartbeat": "DB1000.DBW0", // 心跳地址
"IntoStationAsk": "DB1001.DBW2000", // 进站请求地址
"ProductModel": "DB1001.DBB1000",
"ProductSN": "DB1001.DBB1054",
"IntoStationResp": "DB1000.DBW2000" // 进站回复结果地址
}
},
{
@ -302,11 +304,11 @@
"PlcType": "S71500",
"IpAddress": "192.168.11.41",
"IntoStation": {
"Heartbeat": "DB1010.DBW0", // 心跳地址
"Heartbeat": "DB1000.DBW0", // 心跳地址
"IntoStationAsk": "DB1001.DBW2000", // 进站请求地址
"ProductModel": "DB1001.DBB1000",
"ProductSN": "DB1001.DBB1054",
"IntoStationResp": "DB1010.DBW2000" // 进站回复结果地址
"IntoStationResp": "DB1000.DBW2000" // 进站回复结果地址
}
},
{
@ -316,11 +318,11 @@
"PlcType": "S71500",
"IpAddress": "192.168.11.56",
"IntoStation": {
"Heartbeat": "DB1010.DBW0", // 心跳地址
"Heartbeat": "DB1000.DBW0", // 心跳地址
"IntoStationAsk": "DB1001.DBW2000", // 进站请求地址
"ProductModel": "DB1001.DBB1000",
"ProductSN": "DB1001.DBB1054",
"IntoStationResp": "DB1010.DBW2000" // 进站回复结果地址
"IntoStationResp": "DB1000.DBW2000" // 进站回复结果地址
}
},
{
@ -329,6 +331,34 @@
"WorkStationName": "OP080-2 PCBA拧紧",
"PlcType": "S71500",
"IpAddress": "192.168.11.71",
"IntoStation": {
"Heartbeat": "DB1000.DBW0", // 心跳地址
"IntoStationAsk": "DB1001.DBW2000", // 进站请求地址
"ProductModel": "DB1001.DBB1000",
"ProductSN": "DB1001.DBB1054",
"IntoStationResp": "DB1000.DBW2000" // 进站回复结果地址
}
},
//{
// "Id": 15,
// "WorkStationCode": "OP080-2",
// "WorkStationName": "OP080-2 PCBA拧紧",
// "PlcType": "S71500",
// "IpAddress": "192.168.11.71",
// "IntoStation": {
// "Heartbeat": "DB1000.DBW0", // 心跳地址
// "IntoStationAsk": "DB1001.DBW2002", // 进站请求地址
// "ProductModel": "DB1001.DBB1000",
// "ProductSN": "DB1001.DBB1054",
// "IntoStationResp": "DB1000.DBW2000" // 进站回复结果地址
// }
//},
{
"Id": 16,
"WorkStationCode": "OP080-3",
"WorkStationName": "OP080-3 PWM压装&CUP上料&拧紧",
"PlcType": "S71500",
"IpAddress": "192.168.11.86",
"IntoStation": {
"Heartbeat": "DB1010.DBW0", // 心跳地址
"IntoStationAsk": "DB1001.DBW2000", // 进站请求地址
@ -337,48 +367,20 @@
"IntoStationResp": "DB1010.DBW2000" // 进站回复结果地址
}
},
{
"Id": 15,
"WorkStationCode": "OP080-2",
"WorkStationName": "OP080-2 PCBA拧紧",
"PlcType": "S71500",
"IpAddress": "192.168.11.71",
"IntoStation": {
"Heartbeat": "DB1010.DBW0", // 心跳地址
"IntoStationAsk": "DB1001.DBW2002", // 进站请求地址
"ProductModel": "DB1001.DBB1000",
"ProductSN": "DB1001.DBB1054",
"IntoStationResp": "DB1010.DBW2000" // 进站回复结果地址
}
},
{
"Id": 16,
"WorkStationCode": "OP080-3",
"WorkStationName": "OP080-3 PWM压装&CUP上料&拧紧",
"PlcType": "S71500",
"IpAddress": "192.168.11.86",
"IntoStation": {
"Heartbeat": "DB1010.DBW0", // 心跳地址
"IntoStationAsk": "DB1001.DBW2002", // 进站请求地址
"ProductModel": "DB1001.DBB1000",
"ProductSN": "DB1001.DBB1054",
"IntoStationResp": "DB1010.DBW2000" // 进站回复结果地址
}
},
{
"Id": 16,
"WorkStationCode": "OP080-3",
"WorkStationName": "OP080-3 PWM压装&CUP上料&拧紧",
"PlcType": "S71500",
"IpAddress": "192.168.11.86",
"IntoStation": {
"Heartbeat": "DB1010.DBW0", // 心跳地址
"IntoStationAsk": "DB1001.DBW2002", // 进站请求地址
"ProductModel": "DB1001.DBB1000",
"ProductSN": "DB1001.DBB1054",
"IntoStationResp": "DB1010.DBW2000" // 进站回复结果地址
}
},
//{
// "Id": 16,
// "WorkStationCode": "OP080-3",
// "WorkStationName": "OP080-3 PWM压装&CUP上料&拧紧",
// "PlcType": "S71500",
// "IpAddress": "192.168.11.86",
// "IntoStation": {
// "Heartbeat": "DB1000.DBW0", // 心跳地址
// "IntoStationAsk": "DB1001.DBW2000", // 进站请求地址
// "ProductModel": "DB1001.DBB1000",
// "ProductSN": "DB1001.DBB1054",
// "IntoStationResp": "DB1000.DBW2000" // 进站回复结果地址
// }
//},
{
"Id": 16,
"WorkStationCode": "OP085",
@ -386,11 +388,11 @@
"PlcType": "S71500",
"IpAddress": "192.168.11.101",
"IntoStation": {
"Heartbeat": "DB1010.DBW0", // 心跳地址
"IntoStationAsk": "DB1001.DBW2002", // 进站请求地址
"Heartbeat": "DB1000.DBW0", // 心跳地址
"IntoStationAsk": "DB1001.DBW2000", // 进站请求地址
"ProductModel": "DB1001.DBB1000",
"ProductSN": "DB1001.DBB1054",
"IntoStationResp": "DB1010.DBW2000" // 进站回复结果地址
"IntoStationResp": "DB1000.DBW2000" // 进站回复结果地址
}
},
{
@ -400,11 +402,11 @@
"PlcType": "S71500",
"IpAddress": "192.168.11.101",
"IntoStation": {
"Heartbeat": "DB1010.DBW0", // 心跳地址
"Heartbeat": "DB1000.DBW0", // 心跳地址
"IntoStationAsk": "DB1001.DBW2000", // 进站请求地址
"ProductModel": "DB1001.DBB1000",
"ProductSN": "DB1001.DBB1054",
"IntoStationResp": "DB1010.DBW2000" // 进站回复结果地址
"IntoStationResp": "DB1000.DBW2000" // 进站回复结果地址
}
},
{
@ -414,11 +416,11 @@
"PlcType": "S71500",
"IpAddress": "192.168.1.21",
"IntoStation": {
"Heartbeat": "DB1010.DBW0", // 心跳地址
"Heartbeat": "DB1000.DBW0", // 心跳地址
"IntoStationAsk": "DB1001.DBW2000", // 进站请求地址
"ProductModel": "DB1001.DBB1000",
"ProductSN": "DB1001.DBB1054",
"IntoStationResp": "DB1010.DBW2000" // 进站回复结果地址
"IntoStationResp": "DB1000.DBW2000" // 进站回复结果地址
}
},
{
@ -428,11 +430,11 @@
"PlcType": "S71500",
"IpAddress": "192.168.1.140",
"IntoStation": {
"Heartbeat": "DB1010.DBW0", // 心跳地址
"Heartbeat": "DB1000.DBW0", // 心跳地址
"IntoStationAsk": "DB1001.DBW2000", // 进站请求地址
"ProductModel": "DB1001.DBB1000",
"ProductSN": "DB1001.DBB1054",
"IntoStationResp": "DB1010.DBW2000" // 进站回复结果地址
"IntoStationResp": "DB1000.DBW2000" // 进站回复结果地址
}
},
{
@ -498,11 +500,11 @@
"PlcType": "S71500",
"IpAddress": "192.168.11.231",
"IntoStation": {
"Heartbeat": "DB1010.DBW0", // 心跳地址
"IntoStationAsk": "DB1001.DBW2002", // 进站请求地址
"Heartbeat": "DB1000.DBW0", // 心跳地址
"IntoStationAsk": "DB1001.DBW2000", // 进站请求地址
"ProductModel": "DB1001.DBB1000",
"ProductSN": "DB1001.DBB1054",
"IntoStationResp": "DB1010.DBW2000" // 进站回复结果地址
"IntoStationResp": "DB1000.DBW2000" // 进站回复结果地址
}
},
{
@ -512,11 +514,11 @@
"PlcType": "S71500",
"IpAddress": "192.168.11.231",
"IntoStation": {
"Heartbeat": "DB1010.DBW0", // 心跳地址
"IntoStationAsk": "待定", // 进站请求地址
"Heartbeat": "DB1000.DBW0", // 心跳地址
"IntoStationAsk": "DB1001.DBW2000", // 进站请求地址
"ProductModel": "DB1001.DBB1000",
"ProductSN": "DB1001.DBB1054",
"IntoStationResp": "DB1010.DBW2000" // 进站回复结果地址
"IntoStationResp": "DB1000.DBW2000" // 进站回复结果地址
}
},
{
@ -526,11 +528,11 @@
"PlcType": "S71500",
"IpAddress": "192.168.12.46",
"IntoStation": {
"Heartbeat": "DB1001.DBW0", // 心跳地址
"IntoStationAsk": "DB1001.DBW2002", // 进站请求地址
"Heartbeat": "DB1000.DBW0", // 心跳地址
"IntoStationAsk": "DB1001.DBW2000", // 进站请求地址
"ProductModel": "DB1001.DBB1000",
"ProductSN": "DB1001.DBB1054",
"IntoStationResp": "DB1010.DBW2000" // 进站回复结果地址
"IntoStationResp": "DB1000.DBW2000" // 进站回复结果地址
}
},
{
@ -540,11 +542,11 @@
"PlcType": "S71500",
"IpAddress": "192.168.12.71",
"IntoStation": {
"Heartbeat": "DB1001.DBW0", // 心跳地址
"IntoStationAsk": "DB1001.DBW2002", // 进站请求地址
"Heartbeat": "DB1000.DBW0", // 心跳地址
"IntoStationAsk": "DB1001.DBW2000", // 进站请求地址
"ProductModel": "DB1001.DBB1000",
"ProductSN": "DB1001.DBB1054",
"IntoStationResp": "DB1010.DBW2000" // 进站回复结果地址
"IntoStationResp": "DB1000.DBW2000" // 进站回复结果地址
}
}
]

37
RIZO.Service/PLCBackground/Stations/Into/PlcIntoStationService_OP020-2.cs Normal file
View File

@ -0,0 +1,37 @@
using Infrastructure.Attribute;
using Infrastructure.Extensions;
using Infrastructure.Model;
using MDM.Model.Plant;
using MDM.Model.Process;
using Microsoft.AspNetCore.JsonPatch.Operations;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using NLog;
using RIZO.Model.Mes;
using RIZO.Model.MES.product_trace;
using RIZO.Repository;
using RIZO.Service.MES.product.IService;
using RIZO.Service.PLC;
using S7.Net;
using SqlSugar.IOC;
using System;
using System.Threading;
using System.Threading.Tasks;
namespace RIZO.Service.PLCBackground.Stations.Into
{
/// <summary>
/// OP点散热胶GF1500
/// </summary>
[AppService(ServiceType = typeof(PlcIntoStationService_OP020_2), ServiceLifetime = LifeTime.Singleton)]
public class PlcIntoStationService_OP020_2 : PlcIntoStationService_Common
{
public PlcIntoStationService_OP020_2(IOptions<OptionsSetting> options) : base(options)
{
WorkstationCode = "OP020_2";
}
}
}

37
RIZO.Service/PLCBackground/Stations/Into/PlcIntoStationService_OP020-3.cs Normal file
View File

@ -0,0 +1,37 @@
using Infrastructure.Attribute;
using Infrastructure.Extensions;
using Infrastructure.Model;
using MDM.Model.Plant;
using MDM.Model.Process;
using Microsoft.AspNetCore.JsonPatch.Operations;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using NLog;
using RIZO.Model.Mes;
using RIZO.Model.MES.product_trace;
using RIZO.Repository;
using RIZO.Service.MES.product.IService;
using RIZO.Service.PLC;
using S7.Net;
using SqlSugar.IOC;
using System;
using System.Threading;
using System.Threading.Tasks;
namespace RIZO.Service.PLCBackground.Stations.Into
{
/// <summary>
/// OP点散热胶GF1500
/// </summary>
[AppService(ServiceType = typeof(PlcIntoStationService_OP020_3), ServiceLifetime = LifeTime.Singleton)]
public class PlcIntoStationService_OP020_3 : PlcIntoStationService_Common
{
public PlcIntoStationService_OP020_3(IOptions<OptionsSetting> options) : base(options)
{
WorkstationCode = "OP020_3";
}
}
}

37
RIZO.Service/PLCBackground/Stations/Into/PlcIntoStationService_OP020-4.cs Normal file
View File

@ -0,0 +1,37 @@
using Infrastructure.Attribute;
using Infrastructure.Extensions;
using Infrastructure.Model;
using MDM.Model.Plant;
using MDM.Model.Process;
using Microsoft.AspNetCore.JsonPatch.Operations;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using NLog;
using RIZO.Model.Mes;
using RIZO.Model.MES.product_trace;
using RIZO.Repository;
using RIZO.Service.MES.product.IService;
using RIZO.Service.PLC;
using S7.Net;
using SqlSugar.IOC;
using System;
using System.Threading;
using System.Threading.Tasks;
namespace RIZO.Service.PLCBackground.Stations.Into
{
/// <summary>
/// OP点散热胶GF1500
/// </summary>
[AppService(ServiceType = typeof(PlcIntoStationService_OP020_4), ServiceLifetime = LifeTime.Singleton)]
public class PlcIntoStationService_OP020_4 : PlcIntoStationService_Common
{
public PlcIntoStationService_OP020_4(IOptions<OptionsSetting> options) : base(options)
{
WorkstationCode = "OP020_4";
}
}
}

37
RIZO.Service/PLCBackground/Stations/Into/PlcIntoStationService_OP050.cs Normal file
View File

@ -0,0 +1,37 @@
using Infrastructure.Attribute;
using Infrastructure.Extensions;
using Infrastructure.Model;
using MDM.Model.Plant;
using MDM.Model.Process;
using Microsoft.AspNetCore.JsonPatch.Operations;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using NLog;
using RIZO.Model.Mes;
using RIZO.Model.MES.product_trace;
using RIZO.Repository;
using RIZO.Service.MES.product.IService;
using RIZO.Service.PLC;
using S7.Net;
using SqlSugar.IOC;
using System;
using System.Threading;
using System.Threading.Tasks;
namespace RIZO.Service.PLCBackground.Stations.Into
{
/// <summary>
/// OP点散热胶GF1500
/// </summary>
[AppService(ServiceType = typeof(PlcIntoStationService_OP050), ServiceLifetime = LifeTime.Singleton)]
public class PlcIntoStationService_OP050 : PlcIntoStationService_Common
{
public PlcIntoStationService_OP050(IOptions<OptionsSetting> options) : base(options)
{
WorkstationCode = "OP050";
}
}
}

37
RIZO.Service/PLCBackground/Stations/Into/PlcIntoStationService_OP057.cs Normal file
View File

@ -0,0 +1,37 @@
using Infrastructure.Attribute;
using Infrastructure.Extensions;
using Infrastructure.Model;
using MDM.Model.Plant;
using MDM.Model.Process;
using Microsoft.AspNetCore.JsonPatch.Operations;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using NLog;
using RIZO.Model.Mes;
using RIZO.Model.MES.product_trace;
using RIZO.Repository;
using RIZO.Service.MES.product.IService;
using RIZO.Service.PLC;
using S7.Net;
using SqlSugar.IOC;
using System;
using System.Threading;
using System.Threading.Tasks;
namespace RIZO.Service.PLCBackground.Stations.Into
{
/// <summary>
/// OP点散热胶GF1500
/// </summary>
[AppService(ServiceType = typeof(PlcIntoStationService_OP057), ServiceLifetime = LifeTime.Singleton)]
public class PlcIntoStationService_OP057 : PlcIntoStationService_Common
{
public PlcIntoStationService_OP057(IOptions<OptionsSetting> options) : base(options)
{
WorkstationCode = "OP057";
}
}
}

37
RIZO.Service/PLCBackground/Stations/Into/PlcIntoStationService_OP058.cs Normal file
View File

@ -0,0 +1,37 @@
using Infrastructure.Attribute;
using Infrastructure.Extensions;
using Infrastructure.Model;
using MDM.Model.Plant;
using MDM.Model.Process;
using Microsoft.AspNetCore.JsonPatch.Operations;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using NLog;
using RIZO.Model.Mes;
using RIZO.Model.MES.product_trace;
using RIZO.Repository;
using RIZO.Service.MES.product.IService;
using RIZO.Service.PLC;
using S7.Net;
using SqlSugar.IOC;
using System;
using System.Threading;
using System.Threading.Tasks;
namespace RIZO.Service.PLCBackground.Stations.Into
{
/// <summary>
/// OP点散热胶GF1500
/// </summary>
[AppService(ServiceType = typeof(PlcIntoStationService_OP058), ServiceLifetime = LifeTime.Singleton)]
public class PlcIntoStationService_OP058 : PlcIntoStationService_Common
{
public PlcIntoStationService_OP058(IOptions<OptionsSetting> options) : base(options)
{
WorkstationCode = "OP058";
}
}
}

37
RIZO.Service/PLCBackground/Stations/Into/PlcIntoStationService_OP060.cs Normal file
View File

@ -0,0 +1,37 @@
using Infrastructure.Attribute;
using Infrastructure.Extensions;
using Infrastructure.Model;
using MDM.Model.Plant;
using MDM.Model.Process;
using Microsoft.AspNetCore.JsonPatch.Operations;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using NLog;
using RIZO.Model.Mes;
using RIZO.Model.MES.product_trace;
using RIZO.Repository;
using RIZO.Service.MES.product.IService;
using RIZO.Service.PLC;
using S7.Net;
using SqlSugar.IOC;
using System;
using System.Threading;
using System.Threading.Tasks;
namespace RIZO.Service.PLCBackground.Stations.Into
{
/// <summary>
/// OP点散热胶GF1500
/// </summary>
[AppService(ServiceType = typeof(PlcIntoStationService_OP060), ServiceLifetime = LifeTime.Singleton)]
public class PlcIntoStationService_OP060 : PlcIntoStationService_Common
{
public PlcIntoStationService_OP060(IOptions<OptionsSetting> options) : base(options)
{
WorkstationCode = "OP060";
}
}
}

37
RIZO.Service/PLCBackground/Stations/Into/PlcIntoStationService_OP070-1.cs Normal file
View File

@ -0,0 +1,37 @@
using Infrastructure.Attribute;
using Infrastructure.Extensions;
using Infrastructure.Model;
using MDM.Model.Plant;
using MDM.Model.Process;
using Microsoft.AspNetCore.JsonPatch.Operations;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using NLog;
using RIZO.Model.Mes;
using RIZO.Model.MES.product_trace;
using RIZO.Repository;
using RIZO.Service.MES.product.IService;
using RIZO.Service.PLC;
using S7.Net;
using SqlSugar.IOC;
using System;
using System.Threading;
using System.Threading.Tasks;
namespace RIZO.Service.PLCBackground.Stations.Into
{
/// <summary>
/// OP点散热胶GF1500
/// </summary>
//[AppService(ServiceType = typeof(PlcIntoStationService_OP070_1), ServiceLifetime = LifeTime.Singleton)]
//public class PlcIntoStationService_OP070_1 : PlcIntoStationService_Common
//{
// public PlcIntoStationService_OP070_1(IOptions<OptionsSetting> options) : base(options)
// {
// WorkstationCode = "OP070_1";
// }
//}
}

37
RIZO.Service/PLCBackground/Stations/Into/PlcIntoStationService_OP070-2.cs Normal file
View File

@ -0,0 +1,37 @@
using Infrastructure.Attribute;
using Infrastructure.Extensions;
using Infrastructure.Model;
using MDM.Model.Plant;
using MDM.Model.Process;
using Microsoft.AspNetCore.JsonPatch.Operations;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using NLog;
using RIZO.Model.Mes;
using RIZO.Model.MES.product_trace;
using RIZO.Repository;
using RIZO.Service.MES.product.IService;
using RIZO.Service.PLC;
using S7.Net;
using SqlSugar.IOC;
using System;
using System.Threading;
using System.Threading.Tasks;
namespace RIZO.Service.PLCBackground.Stations.Into
{
/// <summary>
/// OP点散热胶GF1500
/// </summary>
[AppService(ServiceType = typeof(PlcIntoStationService_OP070_2), ServiceLifetime = LifeTime.Singleton)]
public class PlcIntoStationService_OP070_2 : PlcIntoStationService_Common
{
public PlcIntoStationService_OP070_2(IOptions<OptionsSetting> options) : base(options)
{
WorkstationCode = "OP70_2";
}
}
}

37
RIZO.Service/PLCBackground/Stations/Into/PlcIntoStationService_OP070-3.cs Normal file
View File

@ -0,0 +1,37 @@
using Infrastructure.Attribute;
using Infrastructure.Extensions;
using Infrastructure.Model;
using MDM.Model.Plant;
using MDM.Model.Process;
using Microsoft.AspNetCore.JsonPatch.Operations;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using NLog;
using RIZO.Model.Mes;
using RIZO.Model.MES.product_trace;
using RIZO.Repository;
using RIZO.Service.MES.product.IService;
using RIZO.Service.PLC;
using S7.Net;
using SqlSugar.IOC;
using System;
using System.Threading;
using System.Threading.Tasks;
namespace RIZO.Service.PLCBackground.Stations.Into
{
/// <summary>
/// OP点散热胶GF1500
/// </summary>
[AppService(ServiceType = typeof(PlcIntoStationService_OP070_3), ServiceLifetime = LifeTime.Singleton)]
public class PlcIntoStationService_OP070_3 : PlcIntoStationService_Common
{
public PlcIntoStationService_OP070_3(IOptions<OptionsSetting> options) : base(options)
{
WorkstationCode = "OP070_3";
}
}
}

37
RIZO.Service/PLCBackground/Stations/Into/PlcIntoStationService_OP080-1.cs Normal file
View File

@ -0,0 +1,37 @@
using Infrastructure.Attribute;
using Infrastructure.Extensions;
using Infrastructure.Model;
using MDM.Model.Plant;
using MDM.Model.Process;
using Microsoft.AspNetCore.JsonPatch.Operations;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using NLog;
using RIZO.Model.Mes;
using RIZO.Model.MES.product_trace;
using RIZO.Repository;
using RIZO.Service.MES.product.IService;
using RIZO.Service.PLC;
using S7.Net;
using SqlSugar.IOC;
using System;
using System.Threading;
using System.Threading.Tasks;
namespace RIZO.Service.PLCBackground.Stations.Into
{
/// <summary>
/// OP点散热胶GF1500
/// </summary>
//[AppService(ServiceType = typeof(PlcIntoStationService_OP080_1), ServiceLifetime = LifeTime.Singleton)]
//public class PlcIntoStationService_OP080_1 : PlcIntoStationService_Common
//{
// public PlcIntoStationService_OP080_1(IOptions<OptionsSetting> options) : base(options)
// {
// WorkstationCode = "OP080_1";
// }
//}
}

37
RIZO.Service/PLCBackground/Stations/Into/PlcIntoStationService_OP080-2.cs Normal file
View File

@ -0,0 +1,37 @@
using Infrastructure.Attribute;
using Infrastructure.Extensions;
using Infrastructure.Model;
using MDM.Model.Plant;
using MDM.Model.Process;
using Microsoft.AspNetCore.JsonPatch.Operations;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using NLog;
using RIZO.Model.Mes;
using RIZO.Model.MES.product_trace;
using RIZO.Repository;
using RIZO.Service.MES.product.IService;
using RIZO.Service.PLC;
using S7.Net;
using SqlSugar.IOC;
using System;
using System.Threading;
using System.Threading.Tasks;
namespace RIZO.Service.PLCBackground.Stations.Into
{
/// <summary>
/// OP点散热胶GF1500
/// </summary>
[AppService(ServiceType = typeof(PlcIntoStationService_OP080_2), ServiceLifetime = LifeTime.Singleton)]
public class PlcIntoStationService_OP080_2 : PlcIntoStationService_Common
{
public PlcIntoStationService_OP080_2(IOptions<OptionsSetting> options) : base(options)
{
WorkstationCode = "OP080_2";
}
}
}

37
RIZO.Service/PLCBackground/Stations/Into/PlcIntoStationService_OP080-3.cs Normal file
View File

@ -0,0 +1,37 @@
using Infrastructure.Attribute;
using Infrastructure.Extensions;
using Infrastructure.Model;
using MDM.Model.Plant;
using MDM.Model.Process;
using Microsoft.AspNetCore.JsonPatch.Operations;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using NLog;
using RIZO.Model.Mes;
using RIZO.Model.MES.product_trace;
using RIZO.Repository;
using RIZO.Service.MES.product.IService;
using RIZO.Service.PLC;
using S7.Net;
using SqlSugar.IOC;
using System;
using System.Threading;
using System.Threading.Tasks;
namespace RIZO.Service.PLCBackground.Stations.Into
{
/// <summary>
/// OP点散热胶GF1500
/// </summary>
//[AppService(ServiceType = typeof(PlcIntoStationService_OP080_3), ServiceLifetime = LifeTime.Singleton)]
//public class PlcIntoStationService_OP080_3 : PlcIntoStationService_Common
//{
// public PlcIntoStationService_OP080_3(IOptions<OptionsSetting> options) : base(options)
// {
// WorkstationCode = "OP080_3";
// }
//}
}

37
RIZO.Service/PLCBackground/Stations/Into/PlcIntoStationService_OP085.cs Normal file
View File

@ -0,0 +1,37 @@
using Infrastructure.Attribute;
using Infrastructure.Extensions;
using Infrastructure.Model;
using MDM.Model.Plant;
using MDM.Model.Process;
using Microsoft.AspNetCore.JsonPatch.Operations;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using NLog;
using RIZO.Model.Mes;
using RIZO.Model.MES.product_trace;
using RIZO.Repository;
using RIZO.Service.MES.product.IService;
using RIZO.Service.PLC;
using S7.Net;
using SqlSugar.IOC;
using System;
using System.Threading;
using System.Threading.Tasks;
namespace RIZO.Service.PLCBackground.Stations.Into
{
/// <summary>
/// OP点散热胶GF1500
/// </summary>
[AppService(ServiceType = typeof(PlcIntoStationService_OP085), ServiceLifetime = LifeTime.Singleton)]
public class PlcIntoStationService_OP085 : PlcIntoStationService_Common
{
public PlcIntoStationService_OP085(IOptions<OptionsSetting> options) : base(options)
{
WorkstationCode = "OP085";
}
}
}

37
RIZO.Service/PLCBackground/Stations/Into/PlcIntoStationService_OP100.cs Normal file
View File

@ -0,0 +1,37 @@
using Infrastructure.Attribute;
using Infrastructure.Extensions;
using Infrastructure.Model;
using MDM.Model.Plant;
using MDM.Model.Process;
using Microsoft.AspNetCore.JsonPatch.Operations;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using NLog;
using RIZO.Model.Mes;
using RIZO.Model.MES.product_trace;
using RIZO.Repository;
using RIZO.Service.MES.product.IService;
using RIZO.Service.PLC;
using S7.Net;
using SqlSugar.IOC;
using System;
using System.Threading;
using System.Threading.Tasks;
namespace RIZO.Service.PLCBackground.Stations.Into
{
/// <summary>
/// OP点散热胶GF1500
/// </summary>
[AppService(ServiceType = typeof(PlcIntoStationService_OP100), ServiceLifetime = LifeTime.Singleton)]
public class PlcIntoStationService_OP100 : PlcIntoStationService_Common
{
public PlcIntoStationService_OP100(IOptions<OptionsSetting> options) : base(options)
{
WorkstationCode = "OP100";
}
}
}

37
RIZO.Service/PLCBackground/Stations/Into/PlcIntoStationService_OP1011.cs Normal file
View File

@ -0,0 +1,37 @@
using Infrastructure.Attribute;
using Infrastructure.Extensions;
using Infrastructure.Model;
using MDM.Model.Plant;
using MDM.Model.Process;
using Microsoft.AspNetCore.JsonPatch.Operations;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using NLog;
using RIZO.Model.Mes;
using RIZO.Model.MES.product_trace;
using RIZO.Repository;
using RIZO.Service.MES.product.IService;
using RIZO.Service.PLC;
using S7.Net;
using SqlSugar.IOC;
using System;
using System.Threading;
using System.Threading.Tasks;
namespace RIZO.Service.PLCBackground.Stations.Into
{
/// <summary>
/// OP点散热胶GF1500
/// </summary>
[AppService(ServiceType = typeof(PlcIntoStationService_OP1011), ServiceLifetime = LifeTime.Singleton)]
public class PlcIntoStationService_OP1011 : PlcIntoStationService_Common
{
public PlcIntoStationService_OP1011(IOptions<OptionsSetting> options) : base(options)
{
WorkstationCode = "OP1011";
}
}
}

37
RIZO.Service/PLCBackground/Stations/Into/PlcIntoStationService_OP1012.cs Normal file
View File

@ -0,0 +1,37 @@
using Infrastructure.Attribute;
using Infrastructure.Extensions;
using Infrastructure.Model;
using MDM.Model.Plant;
using MDM.Model.Process;
using Microsoft.AspNetCore.JsonPatch.Operations;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using NLog;
using RIZO.Model.Mes;
using RIZO.Model.MES.product_trace;
using RIZO.Repository;
using RIZO.Service.MES.product.IService;
using RIZO.Service.PLC;
using S7.Net;
using SqlSugar.IOC;
using System;
using System.Threading;
using System.Threading.Tasks;
namespace RIZO.Service.PLCBackground.Stations.Into
{
/// <summary>
/// OP点散热胶GF1500
/// </summary>
[AppService(ServiceType = typeof(PlcIntoStationService_OP1012), ServiceLifetime = LifeTime.Singleton)]
public class PlcIntoStationService_OP1012 : PlcIntoStationService_Common
{
public PlcIntoStationService_OP1012(IOptions<OptionsSetting> options) : base(options)
{
WorkstationCode = "OP1012";
}
}
}

37
RIZO.Service/PLCBackground/Stations/Into/PlcIntoStationService_OP102.cs Normal file
View File

@ -0,0 +1,37 @@
using Infrastructure.Attribute;
using Infrastructure.Extensions;
using Infrastructure.Model;
using MDM.Model.Plant;
using MDM.Model.Process;
using Microsoft.AspNetCore.JsonPatch.Operations;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using NLog;
using RIZO.Model.Mes;
using RIZO.Model.MES.product_trace;
using RIZO.Repository;
using RIZO.Service.MES.product.IService;
using RIZO.Service.PLC;
using S7.Net;
using SqlSugar.IOC;
using System;
using System.Threading;
using System.Threading.Tasks;
namespace RIZO.Service.PLCBackground.Stations.Into
{
/// <summary>
/// OP点散热胶GF1500
/// </summary>
[AppService(ServiceType = typeof(PlcIntoStationService_OP102), ServiceLifetime = LifeTime.Singleton)]
public class PlcIntoStationService_OP102 : PlcIntoStationService_Common
{
public PlcIntoStationService_OP102(IOptions<OptionsSetting> options) : base(options)
{
WorkstationCode = "OP102";
}
}
}

37
RIZO.Service/PLCBackground/Stations/Into/PlcIntoStationService_OP110-1.cs Normal file
View File

@ -0,0 +1,37 @@
using Infrastructure.Attribute;
using Infrastructure.Extensions;
using Infrastructure.Model;
using MDM.Model.Plant;
using MDM.Model.Process;
using Microsoft.AspNetCore.JsonPatch.Operations;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using NLog;
using RIZO.Model.Mes;
using RIZO.Model.MES.product_trace;
using RIZO.Repository;
using RIZO.Service.MES.product.IService;
using RIZO.Service.PLC;
using S7.Net;
using SqlSugar.IOC;
using System;
using System.Threading;
using System.Threading.Tasks;
namespace RIZO.Service.PLCBackground.Stations.Into
{
/// <summary>
/// OP点散热胶GF1500
/// </summary>
[AppService(ServiceType = typeof(PlcIntoStationService_OP110_1), ServiceLifetime = LifeTime.Singleton)]
public class PlcIntoStationService_OP110_1 : PlcIntoStationService_Common
{
public PlcIntoStationService_OP110_1(IOptions<OptionsSetting> options) : base(options)
{
WorkstationCode = "OP110_1";
}
}
}

37
RIZO.Service/PLCBackground/Stations/Into/PlcIntoStationService_OP110-2.cs Normal file
View File

@ -0,0 +1,37 @@
using Infrastructure.Attribute;
using Infrastructure.Extensions;
using Infrastructure.Model;
using MDM.Model.Plant;
using MDM.Model.Process;
using Microsoft.AspNetCore.JsonPatch.Operations;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using NLog;
using RIZO.Model.Mes;
using RIZO.Model.MES.product_trace;
using RIZO.Repository;
using RIZO.Service.MES.product.IService;
using RIZO.Service.PLC;
using S7.Net;
using SqlSugar.IOC;
using System;
using System.Threading;
using System.Threading.Tasks;
namespace RIZO.Service.PLCBackground.Stations.Into
{
/// <summary>
/// OP点散热胶GF1500
/// </summary>
[AppService(ServiceType = typeof(PlcIntoStationService_OP110_2), ServiceLifetime = LifeTime.Singleton)]
public class PlcIntoStationService_OP110_2 : PlcIntoStationService_Common
{
public PlcIntoStationService_OP110_2(IOptions<OptionsSetting> options) : base(options)
{
WorkstationCode = "OP110_2";
}
}
}

37
RIZO.Service/PLCBackground/Stations/Into/PlcIntoStationService_OP110-3.cs Normal file
View File

@ -0,0 +1,37 @@
using Infrastructure.Attribute;
using Infrastructure.Extensions;
using Infrastructure.Model;
using MDM.Model.Plant;
using MDM.Model.Process;
using Microsoft.AspNetCore.JsonPatch.Operations;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using NLog;
using RIZO.Model.Mes;
using RIZO.Model.MES.product_trace;
using RIZO.Repository;
using RIZO.Service.MES.product.IService;
using RIZO.Service.PLC;
using S7.Net;
using SqlSugar.IOC;
using System;
using System.Threading;
using System.Threading.Tasks;
namespace RIZO.Service.PLCBackground.Stations.Into
{
/// <summary>
/// OP点散热胶GF1500
/// </summary>
[AppService(ServiceType = typeof(PlcIntoStationService_OP110_3), ServiceLifetime = LifeTime.Singleton)]
public class PlcIntoStationService_OP110_3 : PlcIntoStationService_Common
{
public PlcIntoStationService_OP110_3(IOptions<OptionsSetting> options) : base(options)
{
WorkstationCode = "OP110_3";
}
}
}

37
RIZO.Service/PLCBackground/Stations/Into/PlcIntoStationService_OP115.cs Normal file
View File

@ -0,0 +1,37 @@
using Infrastructure.Attribute;
using Infrastructure.Extensions;
using Infrastructure.Model;
using MDM.Model.Plant;
using MDM.Model.Process;
using Microsoft.AspNetCore.JsonPatch.Operations;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using NLog;
using RIZO.Model.Mes;
using RIZO.Model.MES.product_trace;
using RIZO.Repository;
using RIZO.Service.MES.product.IService;
using RIZO.Service.PLC;
using S7.Net;
using SqlSugar.IOC;
using System;
using System.Threading;
using System.Threading.Tasks;
namespace RIZO.Service.PLCBackground.Stations.Into
{
/// <summary>
/// OP点散热胶GF1500
/// </summary>
[AppService(ServiceType = typeof(PlcIntoStationService_OP115), ServiceLifetime = LifeTime.Singleton)]
public class PlcIntoStationService_OP115 : PlcIntoStationService_Common
{
public PlcIntoStationService_OP115(IOptions<OptionsSetting> options) : base(options)
{
WorkstationCode = "OP115";
}
}
}

37
RIZO.Service/PLCBackground/Stations/Into/PlcIntoStationService_OP140.cs Normal file
View File

@ -0,0 +1,37 @@
using Infrastructure.Attribute;
using Infrastructure.Extensions;
using Infrastructure.Model;
using MDM.Model.Plant;
using MDM.Model.Process;
using Microsoft.AspNetCore.JsonPatch.Operations;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using NLog;
using RIZO.Model.Mes;
using RIZO.Model.MES.product_trace;
using RIZO.Repository;
using RIZO.Service.MES.product.IService;
using RIZO.Service.PLC;
using S7.Net;
using SqlSugar.IOC;
using System;
using System.Threading;
using System.Threading.Tasks;
namespace RIZO.Service.PLCBackground.Stations.Into
{
/// <summary>
/// OP点散热胶GF1500
/// </summary>
[AppService(ServiceType = typeof(PlcIntoStationService_OP140), ServiceLifetime = LifeTime.Singleton)]
public class PlcIntoStationService_OP140 : PlcIntoStationService_Common
{
public PlcIntoStationService_OP140(IOptions<OptionsSetting> options) : base(options)
{
WorkstationCode = "OP140";
}
}
}

37
RIZO.Service/PLCBackground/Stations/Into/PlcIntoStationService_OP165.cs Normal file
View File

@ -0,0 +1,37 @@
using Infrastructure.Attribute;
using Infrastructure.Extensions;
using Infrastructure.Model;
using MDM.Model.Plant;
using MDM.Model.Process;
using Microsoft.AspNetCore.JsonPatch.Operations;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using NLog;
using RIZO.Model.Mes;
using RIZO.Model.MES.product_trace;
using RIZO.Repository;
using RIZO.Service.MES.product.IService;
using RIZO.Service.PLC;
using S7.Net;
using SqlSugar.IOC;
using System;
using System.Threading;
using System.Threading.Tasks;
namespace RIZO.Service.PLCBackground.Stations.Into
{
/// <summary>
/// OP点散热胶GF1500
/// </summary>
[AppService(ServiceType = typeof(PlcIntoStationService_OP165), ServiceLifetime = LifeTime.Singleton)]
public class PlcIntoStationService_OP165 : PlcIntoStationService_Common
{
public PlcIntoStationService_OP165(IOptions<OptionsSetting> options) : base(options)
{
WorkstationCode = "OP165";
}
}
}