✨ feat(*): 更新 PLC 相关配置与结果代码类型
- 修改 appConfig.json 中 PLC 和扫描仪的 IP 地址及字节序配置 - 将多个地方的 ResultCode 类型从 short 更新为 ushort,以确保与 PLC 通信一致 - 更新相关服务和模型以适应新的 ResultCode 类型 - 调整单元测试以验证新配置和类型的正确性
This commit is contained in:
@@ -1,92 +1,92 @@
|
||||
{
|
||||
"Plc": {
|
||||
"Host": "127.0.0.1",
|
||||
"Port": 9600,
|
||||
"UnitAddress": 0,
|
||||
"SourceNodeAddress": 25,
|
||||
"EndianFormat": "BADC",
|
||||
"PollIntervalMs": 200,
|
||||
"ConnectTimeoutMs": 3000,
|
||||
"ReleasePulseMs": 500,
|
||||
"ReleaseAckTimeoutMs": 2000,
|
||||
"Inputs": {
|
||||
"PcbArrived": 101,
|
||||
"PlcReset": 102,
|
||||
"PlcAckRelease": 103
|
||||
},
|
||||
"Outputs": {
|
||||
"PcBusy": 51,
|
||||
"ReleasePermit": 52
|
||||
},
|
||||
"Registers": {
|
||||
"ResultCode": 401
|
||||
}
|
||||
},
|
||||
"Scanner": {
|
||||
"Scanner1": {
|
||||
"Name": "扫码枪1",
|
||||
"Host": "127.0.0.1",
|
||||
"Port": 2001
|
||||
},
|
||||
"Scanner2": {
|
||||
"Name": "扫码枪2",
|
||||
"Host": "127.0.0.1",
|
||||
"Port": 2001
|
||||
},
|
||||
"ConnectTimeoutMs": 3000,
|
||||
"ReadTimeoutMs": 3000,
|
||||
"TriggerCommand": "T",
|
||||
"ResponseTerminator": "\\r",
|
||||
"TriggerInParallel": true
|
||||
},
|
||||
"FileCheck": {
|
||||
"Provider": "Local",
|
||||
"FileNamePattern": "${barcode}.txt",
|
||||
"RetryIntervalSeconds": 2,
|
||||
"MaxRetryCount": 3,
|
||||
"Local": {
|
||||
"RootPath": "D:\\PcbCheck\\Files"
|
||||
}
|
||||
},
|
||||
"Sftp": {
|
||||
"Host": "127.0.0.1",
|
||||
"Port": 22,
|
||||
"Username": "uaesadmin",
|
||||
"Password": "uaes,123",
|
||||
"PrivateKeyPath": "",
|
||||
"PrivateKeyPassphrase": "",
|
||||
"RootPath": "/home/uaesadmin/",
|
||||
"FileNamePattern": "${barcode}.txt",
|
||||
"RetryIntervalSeconds": 2,
|
||||
"MaxRetryCount": 3,
|
||||
"ConnectTimeoutMs": 3000
|
||||
},
|
||||
"Andon": {
|
||||
"Enable": false,
|
||||
"Url": "https://shp.prod.aliyun.mit.uaes.com/api/mit/MAE/Station/Status/alarm",
|
||||
"Method": "POST",
|
||||
"TimeoutMs": 3000,
|
||||
"AndonTheme": "SS7_Auto_Andon",
|
||||
"Eid": "PR1965269806334783488",
|
||||
"FromSign": "IOT",
|
||||
"ServiceId": "4dccd822-86b2-47dd-89bd-ca472ba0d14d",
|
||||
"EnableScanFailAlarm": true,
|
||||
"EnableFileNotFoundAlarm": false,
|
||||
"Headers": {
|
||||
"Accept": "application/json"
|
||||
}
|
||||
},
|
||||
"Workflow": {
|
||||
"RequireManualResetAfterFault": true,
|
||||
"MaxUiLogEntries": 200,
|
||||
"MaxBoardRecords": 100
|
||||
},
|
||||
"RecordPersistence": {
|
||||
"DirectoryPath": "Data\\Records",
|
||||
"DayChangeCheckIntervalSeconds": 30
|
||||
},
|
||||
"Security": {
|
||||
"AdminPassword": "AxiOmron@123",
|
||||
"AdminSessionTimeoutMinutes": 15
|
||||
}
|
||||
{
|
||||
"Plc": {
|
||||
"Host": "192.168.2.100",
|
||||
"Port": 9600,
|
||||
"UnitAddress": 0,
|
||||
"SourceNodeAddress": 0,
|
||||
"EndianFormat": "ABCD",
|
||||
"PollIntervalMs": 200,
|
||||
"ConnectTimeoutMs": 3000,
|
||||
"ReleasePulseMs": 500,
|
||||
"ReleaseAckTimeoutMs": 2000,
|
||||
"Inputs": {
|
||||
"PcbArrived": 101,
|
||||
"PlcReset": 102,
|
||||
"PlcAckRelease": 103
|
||||
},
|
||||
"Outputs": {
|
||||
"PcBusy": 51,
|
||||
"ReleasePermit": 52
|
||||
},
|
||||
"Registers": {
|
||||
"ResultCode": 401
|
||||
}
|
||||
},
|
||||
"Scanner": {
|
||||
"Scanner1": {
|
||||
"Name": "\u626B\u7801\u67AA1",
|
||||
"Host": "192.168.2.13",
|
||||
"Port": 2001
|
||||
},
|
||||
"Scanner2": {
|
||||
"Name": "\u626B\u7801\u67AA2",
|
||||
"Host": "192.168.2.14",
|
||||
"Port": 2001
|
||||
},
|
||||
"ConnectTimeoutMs": 3000,
|
||||
"TriggerCommand": "T",
|
||||
"ResponseTerminator": "",
|
||||
"TriggerInParallel": true,
|
||||
"ReadTimeoutMs": 5000
|
||||
},
|
||||
"FileCheck": {
|
||||
"Provider": "Local",
|
||||
"FileNamePattern": "${barcode}.txt",
|
||||
"RetryIntervalSeconds": 2,
|
||||
"MaxRetryCount": 3,
|
||||
"Local": {
|
||||
"RootPath": "D:\\test"
|
||||
}
|
||||
},
|
||||
"Sftp": {
|
||||
"Host": "127.0.0.1",
|
||||
"Port": 22,
|
||||
"Username": "uaesadmin",
|
||||
"Password": "uaes,123",
|
||||
"PrivateKeyPath": "",
|
||||
"PrivateKeyPassphrase": "",
|
||||
"RootPath": "/home/uaesadmin/",
|
||||
"FileNamePattern": "${barcode}.txt",
|
||||
"RetryIntervalSeconds": 2,
|
||||
"MaxRetryCount": 3,
|
||||
"ConnectTimeoutMs": 3000
|
||||
},
|
||||
"Andon": {
|
||||
"Enable": false,
|
||||
"Url": "https://shp.prod.aliyun.mit.uaes.com/api/mit/MAE/Station/Status/alarm",
|
||||
"Method": "POST",
|
||||
"TimeoutMs": 3000,
|
||||
"AndonTheme": "SS7_Auto_Andon",
|
||||
"Eid": "PR1965269806334783488",
|
||||
"FromSign": "IOT",
|
||||
"ServiceId": "4dccd822-86b2-47dd-89bd-ca472ba0d14d",
|
||||
"EnableScanFailAlarm": false,
|
||||
"EnableFileNotFoundAlarm": false,
|
||||
"Headers": {
|
||||
"Accept": "application/json"
|
||||
}
|
||||
},
|
||||
"Workflow": {
|
||||
"RequireManualResetAfterFault": true,
|
||||
"MaxUiLogEntries": 200,
|
||||
"MaxBoardRecords": 100
|
||||
},
|
||||
"RecordPersistence": {
|
||||
"DirectoryPath": "Data\\Records",
|
||||
"DayChangeCheckIntervalSeconds": 30
|
||||
},
|
||||
"Security": {
|
||||
"AdminPassword": "AxiOmron@123",
|
||||
"AdminSessionTimeoutMinutes": 15
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user