From 308e1a141a5d89fd9d2f97cb0d7bcb258188ef02 Mon Sep 17 00:00:00 2001 From: yanjinhui <3306209981@qq.com> Date: 星期二, 25 三月 2025 15:38:11 +0800 Subject: [PATCH] 更新了串口通信,现在已经满足要求 --- 项目代码/WIDESEAWCS_Server 正式/WIDESEAWCS_Tasks/SerialPort/SerialPortTestJob.cs | 147 +++++++ 项目代码/WIDESEAWCS_Server 正式/.vs/WIDESEAWCS_Server/v17/DocumentLayout.backup.json | 326 +++++++-------- 项目代码/WIDESEAWCS_Server 正式/.vs/WIDESEAWCS_Server/v17/DocumentLayout.json | 495 +++++++++++------------ 项目代码/WIDESEAWCS_Server 正式/WIDESEAWCS_Server/appsettings.json | 2 项目代码/WIDESEAWCS_Server 正式/WIDESEAWCS_Tasks/SerialPort/SerialPortJob.cs | 288 ++++++++---- 5 files changed, 718 insertions(+), 540 deletions(-) diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/.vs/WIDESEAWCS_Server/v17/DocumentLayout.backup.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/.vs/WIDESEAWCS_Server/v17/DocumentLayout.backup.json" index 2e786a4..2be402b 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/.vs/WIDESEAWCS_Server/v17/DocumentLayout.backup.json" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/.vs/WIDESEAWCS_Server/v17/DocumentLayout.backup.json" @@ -7,8 +7,28 @@ "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\serialport\\serialportjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { + "AbsoluteMoniker": "D:0:0:{DE3CBFFF-C6C4-4A38-9A00-06291EF590B9}|SerialPortService\\WIDESEA_SerialPortService.csproj|e:\\\u7F8E\u578B\\niujukongzhi\\\u9879\u76EE\u4EE3\u7801\\wideseawcs_server \u6B63\u5F0F\\serialportservice\\processserver.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{DE3CBFFF-C6C4-4A38-9A00-06291EF590B9}|SerialPortService\\WIDESEA_SerialPortService.csproj|solutionrelative:serialportservice\\processserver.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { "AbsoluteMoniker": "D:0:0:{C2D3D138-9109-481B-8BEB-A27597890B2C}|WIDESEAWCS_DTO\\WIDESEAWCS_DTO.csproj|e:\\\u7F8E\u578B\\niujukongzhi\\\u9879\u76EE\u4EE3\u7801\\wideseawcs_server \u6B63\u5F0F\\wideseawcs_dto\\serialport\\processdata.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{C2D3D138-9109-481B-8BEB-A27597890B2C}|WIDESEAWCS_DTO\\WIDESEAWCS_DTO.csproj|solutionrelative:wideseawcs_dto\\serialport\\processdata.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|e:\\\u7F8E\u578B\\niujukongzhi\\\u9879\u76EE\u4EE3\u7801\\wideseawcs_server \u6B63\u5F0F\\wideseawcs_server\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}", + "RelativeMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|solutionrelative:wideseawcs_server\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}" + }, + { + "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|e:\\\u7F8E\u578B\\niujukongzhi\\\u9879\u76EE\u4EE3\u7801\\wideseawcs_server \u6B63\u5F0F\\wideseawcs_server\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|solutionrelative:wideseawcs_server\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|e:\\\u7F8E\u578B\\niujukongzhi\\\u9879\u76EE\u4EE3\u7801\\wideseawcs_server \u6B63\u5F0F\\wideseawcs_server\\appsettings.development.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}", + "RelativeMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|solutionrelative:wideseawcs_server\\appsettings.development.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}" + }, + { + "AbsoluteMoniker": "D:0:0:{DE3CBFFF-C6C4-4A38-9A00-06291EF590B9}|SerialPortService\\WIDESEA_SerialPortService.csproj|e:\\\u7F8E\u578B\\niujukongzhi\\\u9879\u76EE\u4EE3\u7801\\wideseawcs_server \u6B63\u5F0F\\serialportservice\\njtaskserver.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{DE3CBFFF-C6C4-4A38-9A00-06291EF590B9}|SerialPortService\\WIDESEA_SerialPortService.csproj|solutionrelative:serialportservice\\njtaskserver.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { "AbsoluteMoniker": "D:0:0:{C2D3D138-9109-481B-8BEB-A27597890B2C}|WIDESEAWCS_DTO\\WIDESEAWCS_DTO.csproj|e:\\\u7F8E\u578B\\niujukongzhi\\\u9879\u76EE\u4EE3\u7801\\wideseawcs_server \u6B63\u5F0F\\wideseawcs_dto\\taskinfo\\dt_njtaskdto.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", @@ -25,14 +45,6 @@ { "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|e:\\\u7F8E\u578B\\niujukongzhi\\\u9879\u76EE\u4EE3\u7801\\wideseawcs_server \u6B63\u5F0F\\wideseawcs_server\\controllers\\serialport\\processcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|solutionrelative:wideseawcs_server\\controllers\\serialport\\processcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|e:\\\u7F8E\u578B\\niujukongzhi\\\u9879\u76EE\u4EE3\u7801\\wideseawcs_server \u6B63\u5F0F\\wideseawcs_server\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|solutionrelative:wideseawcs_server\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{DE3CBFFF-C6C4-4A38-9A00-06291EF590B9}|SerialPortService\\WIDESEA_SerialPortService.csproj|e:\\\u7F8E\u578B\\niujukongzhi\\\u9879\u76EE\u4EE3\u7801\\wideseawcs_server \u6B63\u5F0F\\serialportservice\\processserver.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{DE3CBFFF-C6C4-4A38-9A00-06291EF590B9}|SerialPortService\\WIDESEA_SerialPortService.csproj|solutionrelative:serialportservice\\processserver.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { "AbsoluteMoniker": "D:0:0:{DE3CBFFF-C6C4-4A38-9A00-06291EF590B9}|SerialPortService\\WIDESEA_SerialPortService.csproj|e:\\\u7F8E\u578B\\niujukongzhi\\\u9879\u76EE\u4EE3\u7801\\wideseawcs_server \u6B63\u5F0F\\serialportservice\\putakeserver.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", @@ -55,10 +67,6 @@ "RelativeMoniker": "D:0:0:{FAAE7C01-D5C8-43BF-84F6-DB034334C3F1}|ISerialPortService\\WIDESEA_ISerialPortService.csproj|solutionrelative:iserialportservice\\iputakeserver.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{DE3CBFFF-C6C4-4A38-9A00-06291EF590B9}|SerialPortService\\WIDESEA_SerialPortService.csproj|e:\\\u7F8E\u578B\\niujukongzhi\\\u9879\u76EE\u4EE3\u7801\\wideseawcs_server \u6B63\u5F0F\\serialportservice\\njtaskserver.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{DE3CBFFF-C6C4-4A38-9A00-06291EF590B9}|SerialPortService\\WIDESEA_SerialPortService.csproj|solutionrelative:serialportservice\\njtaskserver.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|e:\\\u7F8E\u578B\\niujukongzhi\\\u9879\u76EE\u4EE3\u7801\\wideseawcs_server \u6B63\u5F0F\\wideseawcs_server\\controllers\\serialport\\njtaskcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|solutionrelative:wideseawcs_server\\controllers\\serialport\\njtaskcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, @@ -69,14 +77,6 @@ { "AbsoluteMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|e:\\\u7F8E\u578B\\niujukongzhi\\\u9879\u76EE\u4EE3\u7801\\wideseawcs_server \u6B63\u5F0F\\wideseawcs_model\\models\\serialport\\dt_process.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|solutionrelative:wideseawcs_model\\models\\serialport\\dt_process.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|e:\\\u7F8E\u578B\\niujukongzhi\\\u9879\u76EE\u4EE3\u7801\\wideseawcs_server \u6B63\u5F0F\\wideseawcs_server\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}", - "RelativeMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|solutionrelative:wideseawcs_server\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}" - }, - { - "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|e:\\\u7F8E\u578B\\niujukongzhi\\\u9879\u76EE\u4EE3\u7801\\wideseawcs_server \u6B63\u5F0F\\wideseawcs_server\\appsettings.development.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}", - "RelativeMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|solutionrelative:wideseawcs_server\\appsettings.development.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}" }, { "AbsoluteMoniker": "D:0:0:{DE3CBFFF-C6C4-4A38-9A00-06291EF590B9}|SerialPortService\\WIDESEA_SerialPortService.csproj|e:\\\u7F8E\u578B\\niujukongzhi\\\u9879\u76EE\u4EE3\u7801\\wideseawcs_server \u6B63\u5F0F\\serialportservice\\torqueopserver.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", @@ -246,7 +246,7 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 8, + "SelectedChildIndex": 4, "Children": [ { "$type": "Bookmark", @@ -258,59 +258,7 @@ }, { "$type": "Document", - "DocumentIndex": 1, - "Title": "ProcessData.cs", - "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_DTO\\SerialPort\\ProcessData.cs", - "RelativeDocumentMoniker": "WIDESEAWCS_DTO\\SerialPort\\ProcessData.cs", - "ToolTip": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_DTO\\SerialPort\\ProcessData.cs", - "RelativeToolTip": "WIDESEAWCS_DTO\\SerialPort\\ProcessData.cs", - "ViewState": "AgIAAA0AAAAAAAAAAAAcwBwAAAA7AAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-24T06:47:01.352Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 3, - "Title": "WMSTaskDTO.cs", - "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_DTO\\TaskInfo\\WMSTaskDTO.cs", - "RelativeDocumentMoniker": "WIDESEAWCS_DTO\\TaskInfo\\WMSTaskDTO.cs", - "ToolTip": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_DTO\\TaskInfo\\WMSTaskDTO.cs", - "RelativeToolTip": "WIDESEAWCS_DTO\\TaskInfo\\WMSTaskDTO.cs", - "ViewState": "AgIAACQAAAAAAAAAAAAqwAAAAAAAAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-24T06:46:41.369Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 2, - "Title": "Dt_NjTaskDTO.cs", - "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_DTO\\TaskInfo\\Dt_NjTaskDTO.cs", - "RelativeDocumentMoniker": "WIDESEAWCS_DTO\\TaskInfo\\Dt_NjTaskDTO.cs", - "ToolTip": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_DTO\\TaskInfo\\Dt_NjTaskDTO.cs", - "RelativeToolTip": "WIDESEAWCS_DTO\\TaskInfo\\Dt_NjTaskDTO.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAAAAcAAAABAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-24T06:46:38.794Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 4, - "Title": "SerialPortTestJob.cs", - "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Tasks\\SerialPort\\SerialPortTestJob.cs", - "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\SerialPort\\SerialPortTestJob.cs", - "ToolTip": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Tasks\\SerialPort\\SerialPortTestJob.cs", - "RelativeToolTip": "WIDESEAWCS_Tasks\\SerialPort\\SerialPortTestJob.cs", - "ViewState": "AgIAABgAAAAAAAAAAAAAAC8AAAA0AAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-24T02:20:37.801Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 5, + "DocumentIndex": 10, "Title": "ProcessController.cs", "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Server\\Controllers\\SerialPort\\ProcessController.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Controllers\\SerialPort\\ProcessController.cs", @@ -318,21 +266,19 @@ "RelativeToolTip": "WIDESEAWCS_Server\\Controllers\\SerialPort\\ProcessController.cs", "ViewState": "AgIAAB0AAAAAAAAAAAAswDQAAAAlAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-18T03:45:46.366Z", - "EditorCaption": "" + "WhenOpened": "2025-03-18T03:45:46.366Z" }, { "$type": "Document", - "DocumentIndex": 6, + "DocumentIndex": 4, "Title": "Program.cs", "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Server\\Program.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Program.cs", "ToolTip": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Server\\Program.cs", "RelativeToolTip": "WIDESEAWCS_Server\\Program.cs", - "ViewState": "AgIAAAYAAAAAAAAAAAAkwBsAAAAAAAAAAAAAAA==", + "ViewState": "AgIAADcAAAAAAAAAAAAjwJsAAAAXAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-21T07:23:38.895Z", - "EditorCaption": "" + "WhenOpened": "2025-03-21T07:23:38.895Z" }, { "$type": "Document", @@ -342,14 +288,112 @@ "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\SerialPort\\SerialPortJob.cs", "ToolTip": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Tasks\\SerialPort\\SerialPortJob.cs", "RelativeToolTip": "WIDESEAWCS_Tasks\\SerialPort\\SerialPortJob.cs", - "ViewState": "AgIAAEkAAAAAAAAAAAAQwHAAAABFAAAAAAAAAA==", + "ViewState": "AgIAALEBAAAAAAAAAAAtwMQBAAAxAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-03-21T02:39:47.713Z", "EditorCaption": "" }, { "$type": "Document", + "DocumentIndex": 1, + "Title": "ProcessServer.cs", + "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\SerialPortService\\ProcessServer.cs", + "RelativeDocumentMoniker": "SerialPortService\\ProcessServer.cs", + "ToolTip": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\SerialPortService\\ProcessServer.cs", + "RelativeToolTip": "SerialPortService\\ProcessServer.cs", + "ViewState": "AgIAAH0BAAAAAAAAAAAjwI4BAAAIAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-03-18T03:47:38.429Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 6, + "Title": "NjTaskServer.cs", + "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\SerialPortService\\NjTaskServer.cs", + "RelativeDocumentMoniker": "SerialPortService\\NjTaskServer.cs", + "ToolTip": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\SerialPortService\\NjTaskServer.cs", + "RelativeToolTip": "SerialPortService\\NjTaskServer.cs", + "ViewState": "AgIAAEwBAAAAAAAAAAAewKwBAAANAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-03-18T08:34:48.374Z" + }, + { + "$type": "Document", + "DocumentIndex": 5, + "Title": "appsettings.Development.json", + "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Server\\appsettings.Development.json", + "RelativeDocumentMoniker": "WIDESEAWCS_Server\\appsettings.Development.json", + "ToolTip": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Server\\appsettings.Development.json", + "RelativeToolTip": "WIDESEAWCS_Server\\appsettings.Development.json", + "ViewState": "AgIAAAAAAAAAAAAAAADwvwAAAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|", + "WhenOpened": "2025-03-24T01:23:41.886Z" + }, + { + "$type": "Document", + "DocumentIndex": 2, + "Title": "ProcessData.cs", + "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_DTO\\SerialPort\\ProcessData.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_DTO\\SerialPort\\ProcessData.cs", + "ToolTip": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_DTO\\SerialPort\\ProcessData.cs", + "RelativeToolTip": "WIDESEAWCS_DTO\\SerialPort\\ProcessData.cs", + "ViewState": "AgIAAAwAAAAAAAAAAAAAAAwAAAARAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-03-24T06:47:01.352Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 3, + "Title": "appsettings.json", + "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Server\\appsettings.json", + "RelativeDocumentMoniker": "WIDESEAWCS_Server\\appsettings.json", + "ToolTip": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Server\\appsettings.json", + "RelativeToolTip": "WIDESEAWCS_Server\\appsettings.json", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAoAAAAEAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|", + "WhenOpened": "2025-03-21T08:03:47.109Z" + }, + { + "$type": "Document", + "DocumentIndex": 9, + "Title": "SerialPortTestJob.cs", + "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Tasks\\SerialPort\\SerialPortTestJob.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\SerialPort\\SerialPortTestJob.cs", + "ToolTip": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Tasks\\SerialPort\\SerialPortTestJob.cs", + "RelativeToolTip": "WIDESEAWCS_Tasks\\SerialPort\\SerialPortTestJob.cs", + "ViewState": "AgIAABgAAAAAAAAAAAAAAC8AAAA0AAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-03-24T02:20:37.801Z" + }, + { + "$type": "Document", + "DocumentIndex": 7, + "Title": "Dt_NjTaskDTO.cs", + "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_DTO\\TaskInfo\\Dt_NjTaskDTO.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_DTO\\TaskInfo\\Dt_NjTaskDTO.cs", + "ToolTip": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_DTO\\TaskInfo\\Dt_NjTaskDTO.cs", + "RelativeToolTip": "WIDESEAWCS_DTO\\TaskInfo\\Dt_NjTaskDTO.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAcAAAABAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-03-24T06:46:38.794Z" + }, + { + "$type": "Document", "DocumentIndex": 8, + "Title": "WMSTaskDTO.cs", + "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_DTO\\TaskInfo\\WMSTaskDTO.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_DTO\\TaskInfo\\WMSTaskDTO.cs", + "ToolTip": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_DTO\\TaskInfo\\WMSTaskDTO.cs", + "RelativeToolTip": "WIDESEAWCS_DTO\\TaskInfo\\WMSTaskDTO.cs", + "ViewState": "AgIAACQAAAAAAAAAAAAqwAAAAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-03-24T06:46:41.369Z" + }, + { + "$type": "Document", + "DocumentIndex": 11, "Title": "PutakeServer.cs", "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\SerialPortService\\PutakeServer.cs", "RelativeDocumentMoniker": "SerialPortService\\PutakeServer.cs", @@ -357,12 +401,11 @@ "RelativeToolTip": "SerialPortService\\PutakeServer.cs", "ViewState": "AgIAAAAAAAAAAAAAAADwvwoAAAAjAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-24T06:29:41.815Z", - "EditorCaption": "" + "WhenOpened": "2025-03-24T06:29:41.815Z" }, { "$type": "Document", - "DocumentIndex": 9, + "DocumentIndex": 12, "Title": "TemplateServer.cs", "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\SerialPortService\\TemplateServer.cs", "RelativeDocumentMoniker": "SerialPortService\\TemplateServer.cs", @@ -370,38 +413,11 @@ "RelativeToolTip": "SerialPortService\\TemplateServer.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-19T02:01:14.321Z", - "EditorCaption": "" + "WhenOpened": "2025-03-19T02:01:14.321Z" }, { "$type": "Document", - "DocumentIndex": 7, - "Title": "ProcessServer.cs", - "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\SerialPortService\\ProcessServer.cs", - "RelativeDocumentMoniker": "SerialPortService\\ProcessServer.cs", - "ToolTip": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\SerialPortService\\ProcessServer.cs", - "RelativeToolTip": "SerialPortService\\ProcessServer.cs", - "ViewState": "AgIAAK8BAAAAAAAAAAAMwKcBAAAvAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-18T03:47:38.429Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 13, - "Title": "NjTaskServer.cs", - "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\SerialPortService\\NjTaskServer.cs", - "RelativeDocumentMoniker": "SerialPortService\\NjTaskServer.cs", - "ToolTip": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\SerialPortService\\NjTaskServer.cs", - "RelativeToolTip": "SerialPortService\\NjTaskServer.cs", - "ViewState": "AgIAAJYBAAAAAAAAAAAjwKcBAAAlAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-18T08:34:48.374Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 11, + "DocumentIndex": 14, "Title": "INjTaskServer.cs", "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\ISerialPortService\\INjTaskServer.cs", "RelativeDocumentMoniker": "ISerialPortService\\INjTaskServer.cs", @@ -409,12 +425,11 @@ "RelativeToolTip": "ISerialPortService\\INjTaskServer.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAABUAAAAIAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-19T01:54:15.368Z", - "EditorCaption": "" + "WhenOpened": "2025-03-19T01:54:15.368Z" }, { "$type": "Document", - "DocumentIndex": 10, + "DocumentIndex": 13, "Title": "IProcessServer.cs", "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\ISerialPortService\\IProcessServer.cs", "RelativeDocumentMoniker": "ISerialPortService\\IProcessServer.cs", @@ -422,12 +437,11 @@ "RelativeToolTip": "ISerialPortService\\IProcessServer.cs", "ViewState": "AgIAABMAAAAAAAAAAAAQwCUAAAAbAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-19T01:54:16.125Z", - "EditorCaption": "" + "WhenOpened": "2025-03-19T01:54:16.125Z" }, { "$type": "Document", - "DocumentIndex": 12, + "DocumentIndex": 15, "Title": "IPutakeServer.cs", "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\ISerialPortService\\IPutakeServer.cs", "RelativeDocumentMoniker": "ISerialPortService\\IPutakeServer.cs", @@ -435,12 +449,11 @@ "RelativeToolTip": "ISerialPortService\\IPutakeServer.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAswA4AAAAbAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-19T01:54:23.95Z", - "EditorCaption": "" + "WhenOpened": "2025-03-19T01:54:23.95Z" }, { "$type": "Document", - "DocumentIndex": 14, + "DocumentIndex": 16, "Title": "NjTaskController.cs", "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Server\\Controllers\\SerialPort\\NjTaskController.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Controllers\\SerialPort\\NjTaskController.cs", @@ -448,12 +461,11 @@ "RelativeToolTip": "WIDESEAWCS_Server\\Controllers\\SerialPort\\NjTaskController.cs", "ViewState": "AgIAAAkAAAAAAAAAAAAAAEkAAAAfAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-18T08:32:49.485Z", - "EditorCaption": "" + "WhenOpened": "2025-03-18T08:32:49.485Z" }, { "$type": "Document", - "DocumentIndex": 15, + "DocumentIndex": 17, "Title": "Sys_UserService.cs", "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_SystemServices\\Sys_UserService.cs", "RelativeDocumentMoniker": "WIDESEAWCS_SystemServices\\Sys_UserService.cs", @@ -461,12 +473,11 @@ "RelativeToolTip": "WIDESEAWCS_SystemServices\\Sys_UserService.cs", "ViewState": "AgIAAOAAAAAAAAAAAAAEwOgAAAAhAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-18T07:20:17.983Z", - "EditorCaption": "" + "WhenOpened": "2025-03-18T07:20:17.983Z" }, { "$type": "Document", - "DocumentIndex": 16, + "DocumentIndex": 18, "Title": "Dt_Process.cs", "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Model\\Models\\SerialPort\\Dt_Process.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\SerialPort\\Dt_Process.cs", @@ -474,8 +485,7 @@ "RelativeToolTip": "WIDESEAWCS_Model\\Models\\SerialPort\\Dt_Process.cs", "ViewState": "AgIAAAwAAAAAAAAAAAAAADIAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-20T01:12:06.317Z", - "EditorCaption": "" + "WhenOpened": "2025-03-20T01:12:06.317Z" }, { "$type": "Document", @@ -487,21 +497,7 @@ "RelativeToolTip": "SerialPortService\\SerialPortService.cs", "ViewState": "AgIAACEAAAAAAAAAAADwvwAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-19T02:01:10.146Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 17, - "Title": "appsettings.json", - "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Server\\appsettings.json", - "RelativeDocumentMoniker": "WIDESEAWCS_Server\\appsettings.json", - "ToolTip": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Server\\appsettings.json", - "RelativeToolTip": "WIDESEAWCS_Server\\appsettings.json", - "ViewState": "AgIAABsAAADARxPywlYpwAwAAAAYAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|", - "WhenOpened": "2025-03-21T08:03:47.109Z", - "EditorCaption": "" + "WhenOpened": "2025-03-19T02:01:10.146Z" }, { "$type": "Document", @@ -513,21 +509,7 @@ "RelativeToolTip": "SerialPortService\\TorqueOpServer.cs", "ViewState": "AgIAAAYAAAAAAAAAAAAAAEIAAABsAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-19T01:56:46.727Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 18, - "Title": "appsettings.Development.json", - "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Server\\appsettings.Development.json", - "RelativeDocumentMoniker": "WIDESEAWCS_Server\\appsettings.Development.json", - "ToolTip": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Server\\appsettings.Development.json", - "RelativeToolTip": "WIDESEAWCS_Server\\appsettings.Development.json", - "ViewState": "AgIAAAAAAAAAAAAAAADwvwAAAAAAAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|", - "WhenOpened": "2025-03-24T01:23:41.886Z", - "EditorCaption": "" + "WhenOpened": "2025-03-19T01:56:46.727Z" }, { "$type": "Document", @@ -539,8 +521,7 @@ "RelativeToolTip": "SerialPortService\\ToolsServer.cs", "ViewState": "AgIAAAMAAAAAAAAAAADwvxgAAAARAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-19T02:01:18.961Z", - "EditorCaption": "" + "WhenOpened": "2025-03-19T02:01:18.961Z" }, { "$type": "Document", @@ -588,8 +569,7 @@ "RelativeToolTip": "WIDESEAWCS_Model\\Models\\SerialPort\\Dt_NjTask.cs", "ViewState": "AgIAAIUAAAAAAAAAAAAUwNEAAAAmAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-20T01:07:30.689Z", - "EditorCaption": "" + "WhenOpened": "2025-03-20T01:07:30.689Z" }, { "$type": "Document", @@ -625,8 +605,7 @@ "RelativeToolTip": "WIDESEAWCS_Model\\Models\\SerialPort\\Dt_Putake.cs", "ViewState": "AgIAAFUAAAAAAAAAAAAiwGUAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-20T01:12:11.661Z", - "EditorCaption": "" + "WhenOpened": "2025-03-20T01:12:11.661Z" }, { "$type": "Document", @@ -734,8 +713,7 @@ "RelativeToolTip": "SerialPortService\\LoginHistoryServer.cs", "ViewState": "AgIAAAkAAAAAAAAAAAAuwBUAAAAdAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-19T02:35:47.432Z", - "EditorCaption": "" + "WhenOpened": "2025-03-19T02:35:47.432Z" }, { "$type": "Document", @@ -747,8 +725,7 @@ "RelativeToolTip": "WIDESEAWCS_DTO\\SerialPort\\AddNjtDTO.cs", "ViewState": "AgIAAAAAAAAAAAAAAADwvwAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-19T06:58:26.302Z", - "EditorCaption": "" + "WhenOpened": "2025-03-19T06:58:26.302Z" }, { "$type": "Document", @@ -760,8 +737,7 @@ "RelativeToolTip": "SerialPortService\\NJtakeHistoryServer.cs", "ViewState": "AgIAAAwAAAAAAAAAAADwvwAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-19T01:56:17.448Z", - "EditorCaption": "" + "WhenOpened": "2025-03-19T01:56:17.448Z" }, { "$type": "Document", @@ -785,8 +761,7 @@ "RelativeToolTip": "SerialPortService\\NJCommandsServer .cs", "ViewState": "AgIAAAwAAAAAAAAAAADwvwAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-19T01:56:15.37Z", - "EditorCaption": "" + "WhenOpened": "2025-03-19T01:56:15.37Z" }, { "$type": "Document", @@ -810,8 +785,7 @@ "RelativeToolTip": "SerialPortService\\ArticleInfomServer.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAABEAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-18T03:25:52.785Z", - "EditorCaption": "" + "WhenOpened": "2025-03-18T03:25:52.785Z" }, { "$type": "Document", diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/.vs/WIDESEAWCS_Server/v17/DocumentLayout.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/.vs/WIDESEAWCS_Server/v17/DocumentLayout.json" index 27ba51a..30ec41a 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/.vs/WIDESEAWCS_Server/v17/DocumentLayout.json" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/.vs/WIDESEAWCS_Server/v17/DocumentLayout.json" @@ -7,8 +7,32 @@ "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\serialport\\serialportjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { + "AbsoluteMoniker": "D:0:0:{DE3CBFFF-C6C4-4A38-9A00-06291EF590B9}|SerialPortService\\WIDESEA_SerialPortService.csproj|e:\\\u7F8E\u578B\\niujukongzhi\\\u9879\u76EE\u4EE3\u7801\\wideseawcs_server \u6B63\u5F0F\\serialportservice\\njtaskserver.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{DE3CBFFF-C6C4-4A38-9A00-06291EF590B9}|SerialPortService\\WIDESEA_SerialPortService.csproj|solutionrelative:serialportservice\\njtaskserver.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|e:\\\u7F8E\u578B\\niujukongzhi\\\u9879\u76EE\u4EE3\u7801\\wideseawcs_server \u6B63\u5F0F\\wideseawcs_server\\appsettings.development.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}", + "RelativeMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|solutionrelative:wideseawcs_server\\appsettings.development.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}" + }, + { + "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|e:\\\u7F8E\u578B\\niujukongzhi\\\u9879\u76EE\u4EE3\u7801\\wideseawcs_server \u6B63\u5F0F\\wideseawcs_tasks\\serialport\\serialporttestjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\serialport\\serialporttestjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{DE3CBFFF-C6C4-4A38-9A00-06291EF590B9}|SerialPortService\\WIDESEA_SerialPortService.csproj|e:\\\u7F8E\u578B\\niujukongzhi\\\u9879\u76EE\u4EE3\u7801\\wideseawcs_server \u6B63\u5F0F\\serialportservice\\processserver.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{DE3CBFFF-C6C4-4A38-9A00-06291EF590B9}|SerialPortService\\WIDESEA_SerialPortService.csproj|solutionrelative:serialportservice\\processserver.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { "AbsoluteMoniker": "D:0:0:{C2D3D138-9109-481B-8BEB-A27597890B2C}|WIDESEAWCS_DTO\\WIDESEAWCS_DTO.csproj|e:\\\u7F8E\u578B\\niujukongzhi\\\u9879\u76EE\u4EE3\u7801\\wideseawcs_server \u6B63\u5F0F\\wideseawcs_dto\\serialport\\processdata.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{C2D3D138-9109-481B-8BEB-A27597890B2C}|WIDESEAWCS_DTO\\WIDESEAWCS_DTO.csproj|solutionrelative:wideseawcs_dto\\serialport\\processdata.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|e:\\\u7F8E\u578B\\niujukongzhi\\\u9879\u76EE\u4EE3\u7801\\wideseawcs_server \u6B63\u5F0F\\wideseawcs_server\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}", + "RelativeMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|solutionrelative:wideseawcs_server\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}" + }, + { + "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|e:\\\u7F8E\u578B\\niujukongzhi\\\u9879\u76EE\u4EE3\u7801\\wideseawcs_server \u6B63\u5F0F\\wideseawcs_server\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|solutionrelative:wideseawcs_server\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { "AbsoluteMoniker": "D:0:0:{C2D3D138-9109-481B-8BEB-A27597890B2C}|WIDESEAWCS_DTO\\WIDESEAWCS_DTO.csproj|e:\\\u7F8E\u578B\\niujukongzhi\\\u9879\u76EE\u4EE3\u7801\\wideseawcs_server \u6B63\u5F0F\\wideseawcs_dto\\taskinfo\\dt_njtaskdto.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", @@ -19,20 +43,8 @@ "RelativeMoniker": "D:0:0:{C2D3D138-9109-481B-8BEB-A27597890B2C}|WIDESEAWCS_DTO\\WIDESEAWCS_DTO.csproj|solutionrelative:wideseawcs_dto\\taskinfo\\wmstaskdto.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|e:\\\u7F8E\u578B\\niujukongzhi\\\u9879\u76EE\u4EE3\u7801\\wideseawcs_server \u6B63\u5F0F\\wideseawcs_tasks\\serialport\\serialporttestjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\serialport\\serialporttestjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|e:\\\u7F8E\u578B\\niujukongzhi\\\u9879\u76EE\u4EE3\u7801\\wideseawcs_server \u6B63\u5F0F\\wideseawcs_server\\controllers\\serialport\\processcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|solutionrelative:wideseawcs_server\\controllers\\serialport\\processcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|e:\\\u7F8E\u578B\\niujukongzhi\\\u9879\u76EE\u4EE3\u7801\\wideseawcs_server \u6B63\u5F0F\\wideseawcs_server\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|solutionrelative:wideseawcs_server\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{DE3CBFFF-C6C4-4A38-9A00-06291EF590B9}|SerialPortService\\WIDESEA_SerialPortService.csproj|e:\\\u7F8E\u578B\\niujukongzhi\\\u9879\u76EE\u4EE3\u7801\\wideseawcs_server \u6B63\u5F0F\\serialportservice\\processserver.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{DE3CBFFF-C6C4-4A38-9A00-06291EF590B9}|SerialPortService\\WIDESEA_SerialPortService.csproj|solutionrelative:serialportservice\\processserver.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { "AbsoluteMoniker": "D:0:0:{DE3CBFFF-C6C4-4A38-9A00-06291EF590B9}|SerialPortService\\WIDESEA_SerialPortService.csproj|e:\\\u7F8E\u578B\\niujukongzhi\\\u9879\u76EE\u4EE3\u7801\\wideseawcs_server \u6B63\u5F0F\\serialportservice\\putakeserver.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", @@ -55,10 +67,6 @@ "RelativeMoniker": "D:0:0:{FAAE7C01-D5C8-43BF-84F6-DB034334C3F1}|ISerialPortService\\WIDESEA_ISerialPortService.csproj|solutionrelative:iserialportservice\\iputakeserver.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{DE3CBFFF-C6C4-4A38-9A00-06291EF590B9}|SerialPortService\\WIDESEA_SerialPortService.csproj|e:\\\u7F8E\u578B\\niujukongzhi\\\u9879\u76EE\u4EE3\u7801\\wideseawcs_server \u6B63\u5F0F\\serialportservice\\njtaskserver.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{DE3CBFFF-C6C4-4A38-9A00-06291EF590B9}|SerialPortService\\WIDESEA_SerialPortService.csproj|solutionrelative:serialportservice\\njtaskserver.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|e:\\\u7F8E\u578B\\niujukongzhi\\\u9879\u76EE\u4EE3\u7801\\wideseawcs_server \u6B63\u5F0F\\wideseawcs_server\\controllers\\serialport\\njtaskcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|solutionrelative:wideseawcs_server\\controllers\\serialport\\njtaskcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, @@ -69,14 +77,6 @@ { "AbsoluteMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|e:\\\u7F8E\u578B\\niujukongzhi\\\u9879\u76EE\u4EE3\u7801\\wideseawcs_server \u6B63\u5F0F\\wideseawcs_model\\models\\serialport\\dt_process.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|solutionrelative:wideseawcs_model\\models\\serialport\\dt_process.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|e:\\\u7F8E\u578B\\niujukongzhi\\\u9879\u76EE\u4EE3\u7801\\wideseawcs_server \u6B63\u5F0F\\wideseawcs_server\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}", - "RelativeMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|solutionrelative:wideseawcs_server\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}" - }, - { - "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|e:\\\u7F8E\u578B\\niujukongzhi\\\u9879\u76EE\u4EE3\u7801\\wideseawcs_server \u6B63\u5F0F\\wideseawcs_server\\appsettings.development.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}", - "RelativeMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|solutionrelative:wideseawcs_server\\appsettings.development.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}" }, { "AbsoluteMoniker": "D:0:0:{DE3CBFFF-C6C4-4A38-9A00-06291EF590B9}|SerialPortService\\WIDESEA_SerialPortService.csproj|e:\\\u7F8E\u578B\\niujukongzhi\\\u9879\u76EE\u4EE3\u7801\\wideseawcs_server \u6B63\u5F0F\\serialportservice\\torqueopserver.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", @@ -246,7 +246,7 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 8, + "SelectedChildIndex": 3, "Children": [ { "$type": "Bookmark", @@ -258,81 +258,15 @@ }, { "$type": "Document", - "DocumentIndex": 1, - "Title": "ProcessData.cs", - "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_DTO\\SerialPort\\ProcessData.cs", - "RelativeDocumentMoniker": "WIDESEAWCS_DTO\\SerialPort\\ProcessData.cs", - "ToolTip": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_DTO\\SerialPort\\ProcessData.cs", - "RelativeToolTip": "WIDESEAWCS_DTO\\SerialPort\\ProcessData.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAAABEAAAAwAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-24T06:47:01.352Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 3, - "Title": "WMSTaskDTO.cs", - "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_DTO\\TaskInfo\\WMSTaskDTO.cs", - "RelativeDocumentMoniker": "WIDESEAWCS_DTO\\TaskInfo\\WMSTaskDTO.cs", - "ToolTip": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_DTO\\TaskInfo\\WMSTaskDTO.cs", - "RelativeToolTip": "WIDESEAWCS_DTO\\TaskInfo\\WMSTaskDTO.cs", - "ViewState": "AgIAACQAAAAAAAAAAAAqwAAAAAAAAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-24T06:46:41.369Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 2, - "Title": "Dt_NjTaskDTO.cs", - "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_DTO\\TaskInfo\\Dt_NjTaskDTO.cs", - "RelativeDocumentMoniker": "WIDESEAWCS_DTO\\TaskInfo\\Dt_NjTaskDTO.cs", - "ToolTip": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_DTO\\TaskInfo\\Dt_NjTaskDTO.cs", - "RelativeToolTip": "WIDESEAWCS_DTO\\TaskInfo\\Dt_NjTaskDTO.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAAAAcAAAABAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-24T06:46:38.794Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 4, - "Title": "SerialPortTestJob.cs", - "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Tasks\\SerialPort\\SerialPortTestJob.cs", - "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\SerialPort\\SerialPortTestJob.cs", - "ToolTip": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Tasks\\SerialPort\\SerialPortTestJob.cs", - "RelativeToolTip": "WIDESEAWCS_Tasks\\SerialPort\\SerialPortTestJob.cs", - "ViewState": "AgIAABgAAAAAAAAAAAAAAC8AAAA0AAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-24T02:20:37.801Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 5, - "Title": "ProcessController.cs", - "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Server\\Controllers\\SerialPort\\ProcessController.cs", - "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Controllers\\SerialPort\\ProcessController.cs", - "ToolTip": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Server\\Controllers\\SerialPort\\ProcessController.cs", - "RelativeToolTip": "WIDESEAWCS_Server\\Controllers\\SerialPort\\ProcessController.cs", - "ViewState": "AgIAAB0AAAAAAAAAAAAswDQAAAAlAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-18T03:45:46.366Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 6, + "DocumentIndex": 7, "Title": "Program.cs", "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Server\\Program.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Program.cs", "ToolTip": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Server\\Program.cs", "RelativeToolTip": "WIDESEAWCS_Server\\Program.cs", - "ViewState": "AgIAAAYAAAAAAAAAAAAkwBsAAAAAAAAAAAAAAA==", + "ViewState": "AgIAADcAAAAAAAAAAAAjwJsAAAAXAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-21T07:23:38.895Z", - "EditorCaption": "" + "WhenOpened": "2025-03-21T07:23:38.895Z" }, { "$type": "Document", @@ -342,183 +276,40 @@ "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\SerialPort\\SerialPortJob.cs", "ToolTip": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Tasks\\SerialPort\\SerialPortJob.cs", "RelativeToolTip": "WIDESEAWCS_Tasks\\SerialPort\\SerialPortJob.cs", - "ViewState": "AgIAADwAAAAAAAAAAAAmwOgAAABIAAAAAAAAAA==", + "ViewState": "AgIAAAcAAAAAAAAAAAAYwPAAAAAmAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-03-21T02:39:47.713Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 8, - "Title": "PutakeServer.cs", - "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\SerialPortService\\PutakeServer.cs", - "RelativeDocumentMoniker": "SerialPortService\\PutakeServer.cs", - "ToolTip": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\SerialPortService\\PutakeServer.cs", - "RelativeToolTip": "SerialPortService\\PutakeServer.cs", - "ViewState": "AgIAAAAAAAAAAAAAAADwvwoAAAAjAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-24T06:29:41.815Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 9, - "Title": "TemplateServer.cs", - "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\SerialPortService\\TemplateServer.cs", - "RelativeDocumentMoniker": "SerialPortService\\TemplateServer.cs", - "ToolTip": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\SerialPortService\\TemplateServer.cs", - "RelativeToolTip": "SerialPortService\\TemplateServer.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-19T02:01:14.321Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 7, + "DocumentIndex": 4, "Title": "ProcessServer.cs", "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\SerialPortService\\ProcessServer.cs", "RelativeDocumentMoniker": "SerialPortService\\ProcessServer.cs", "ToolTip": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\SerialPortService\\ProcessServer.cs", "RelativeToolTip": "SerialPortService\\ProcessServer.cs", - "ViewState": "AgIAAK8BAAAAAAAAAAAMwKcBAAAvAAAAAAAAAA==", + "ViewState": "AgIAAH0BAAAAAAAAAAAjwI4BAAAIAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-03-18T03:47:38.429Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 13, + "DocumentIndex": 1, "Title": "NjTaskServer.cs", "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\SerialPortService\\NjTaskServer.cs", "RelativeDocumentMoniker": "SerialPortService\\NjTaskServer.cs", "ToolTip": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\SerialPortService\\NjTaskServer.cs", "RelativeToolTip": "SerialPortService\\NjTaskServer.cs", - "ViewState": "AgIAAJYBAAAAAAAAAAAjwKcBAAAlAAAAAAAAAA==", + "ViewState": "AgIAAE4BAAAAAAAAAAAQwIcBAAA0AAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-03-18T08:34:48.374Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 11, - "Title": "INjTaskServer.cs", - "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\ISerialPortService\\INjTaskServer.cs", - "RelativeDocumentMoniker": "ISerialPortService\\INjTaskServer.cs", - "ToolTip": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\ISerialPortService\\INjTaskServer.cs", - "RelativeToolTip": "ISerialPortService\\INjTaskServer.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAAABUAAAAIAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-19T01:54:15.368Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 10, - "Title": "IProcessServer.cs", - "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\ISerialPortService\\IProcessServer.cs", - "RelativeDocumentMoniker": "ISerialPortService\\IProcessServer.cs", - "ToolTip": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\ISerialPortService\\IProcessServer.cs", - "RelativeToolTip": "ISerialPortService\\IProcessServer.cs", - "ViewState": "AgIAABMAAAAAAAAAAAAQwCUAAAAbAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-19T01:54:16.125Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 12, - "Title": "IPutakeServer.cs", - "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\ISerialPortService\\IPutakeServer.cs", - "RelativeDocumentMoniker": "ISerialPortService\\IPutakeServer.cs", - "ToolTip": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\ISerialPortService\\IPutakeServer.cs", - "RelativeToolTip": "ISerialPortService\\IPutakeServer.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAswA4AAAAbAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-19T01:54:23.95Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 14, - "Title": "NjTaskController.cs", - "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Server\\Controllers\\SerialPort\\NjTaskController.cs", - "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Controllers\\SerialPort\\NjTaskController.cs", - "ToolTip": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Server\\Controllers\\SerialPort\\NjTaskController.cs", - "RelativeToolTip": "WIDESEAWCS_Server\\Controllers\\SerialPort\\NjTaskController.cs", - "ViewState": "AgIAAAkAAAAAAAAAAAAAAEkAAAAfAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-18T08:32:49.485Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 15, - "Title": "Sys_UserService.cs", - "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_SystemServices\\Sys_UserService.cs", - "RelativeDocumentMoniker": "WIDESEAWCS_SystemServices\\Sys_UserService.cs", - "ToolTip": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_SystemServices\\Sys_UserService.cs", - "RelativeToolTip": "WIDESEAWCS_SystemServices\\Sys_UserService.cs", - "ViewState": "AgIAAOAAAAAAAAAAAAAEwOgAAAAhAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-18T07:20:17.983Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 16, - "Title": "Dt_Process.cs", - "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Model\\Models\\SerialPort\\Dt_Process.cs", - "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\SerialPort\\Dt_Process.cs", - "ToolTip": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Model\\Models\\SerialPort\\Dt_Process.cs", - "RelativeToolTip": "WIDESEAWCS_Model\\Models\\SerialPort\\Dt_Process.cs", - "ViewState": "AgIAAAwAAAAAAAAAAAAAADIAAAAAAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-20T01:12:06.317Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 20, - "Title": "SerialPortService.cs", - "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\SerialPortService\\SerialPortService.cs", - "RelativeDocumentMoniker": "SerialPortService\\SerialPortService.cs", - "ToolTip": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\SerialPortService\\SerialPortService.cs", - "RelativeToolTip": "SerialPortService\\SerialPortService.cs", - "ViewState": "AgIAACEAAAAAAAAAAADwvwAAAAAAAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-19T02:01:10.146Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 17, - "Title": "appsettings.json", - "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Server\\appsettings.json", - "RelativeDocumentMoniker": "WIDESEAWCS_Server\\appsettings.json", - "ToolTip": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Server\\appsettings.json", - "RelativeToolTip": "WIDESEAWCS_Server\\appsettings.json", - "ViewState": "AgIAABsAAADARxPywlYpwAwAAAAYAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|", - "WhenOpened": "2025-03-21T08:03:47.109Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 19, - "Title": "TorqueOpServer.cs", - "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\SerialPortService\\TorqueOpServer.cs", - "RelativeDocumentMoniker": "SerialPortService\\TorqueOpServer.cs", - "ToolTip": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\SerialPortService\\TorqueOpServer.cs", - "RelativeToolTip": "SerialPortService\\TorqueOpServer.cs", - "ViewState": "AgIAAAYAAAAAAAAAAAAAAEIAAABsAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-19T01:56:46.727Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 18, + "DocumentIndex": 2, "Title": "appsettings.Development.json", "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Server\\appsettings.Development.json", "RelativeDocumentMoniker": "WIDESEAWCS_Server\\appsettings.Development.json", @@ -531,6 +322,200 @@ }, { "$type": "Document", + "DocumentIndex": 3, + "Title": "SerialPortTestJob.cs", + "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Tasks\\SerialPort\\SerialPortTestJob.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\SerialPort\\SerialPortTestJob.cs", + "ToolTip": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Tasks\\SerialPort\\SerialPortTestJob.cs", + "RelativeToolTip": "WIDESEAWCS_Tasks\\SerialPort\\SerialPortTestJob.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAoAAAAgAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-03-24T02:20:37.801Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 10, + "Title": "ProcessController.cs", + "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Server\\Controllers\\SerialPort\\ProcessController.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Controllers\\SerialPort\\ProcessController.cs", + "ToolTip": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Server\\Controllers\\SerialPort\\ProcessController.cs", + "RelativeToolTip": "WIDESEAWCS_Server\\Controllers\\SerialPort\\ProcessController.cs", + "ViewState": "AgIAAB0AAAAAAAAAAAAswDQAAAAlAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-03-18T03:45:46.366Z" + }, + { + "$type": "Document", + "DocumentIndex": 5, + "Title": "ProcessData.cs", + "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_DTO\\SerialPort\\ProcessData.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_DTO\\SerialPort\\ProcessData.cs", + "ToolTip": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_DTO\\SerialPort\\ProcessData.cs", + "RelativeToolTip": "WIDESEAWCS_DTO\\SerialPort\\ProcessData.cs", + "ViewState": "AgIAAAwAAAAAAAAAAAAAAAwAAAARAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-03-24T06:47:01.352Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 6, + "Title": "appsettings.json", + "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Server\\appsettings.json", + "RelativeDocumentMoniker": "WIDESEAWCS_Server\\appsettings.json", + "ToolTip": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Server\\appsettings.json", + "RelativeToolTip": "WIDESEAWCS_Server\\appsettings.json", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAoAAAAEAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|", + "WhenOpened": "2025-03-21T08:03:47.109Z" + }, + { + "$type": "Document", + "DocumentIndex": 8, + "Title": "Dt_NjTaskDTO.cs", + "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_DTO\\TaskInfo\\Dt_NjTaskDTO.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_DTO\\TaskInfo\\Dt_NjTaskDTO.cs", + "ToolTip": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_DTO\\TaskInfo\\Dt_NjTaskDTO.cs", + "RelativeToolTip": "WIDESEAWCS_DTO\\TaskInfo\\Dt_NjTaskDTO.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAcAAAABAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-03-24T06:46:38.794Z" + }, + { + "$type": "Document", + "DocumentIndex": 9, + "Title": "WMSTaskDTO.cs", + "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_DTO\\TaskInfo\\WMSTaskDTO.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_DTO\\TaskInfo\\WMSTaskDTO.cs", + "ToolTip": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_DTO\\TaskInfo\\WMSTaskDTO.cs", + "RelativeToolTip": "WIDESEAWCS_DTO\\TaskInfo\\WMSTaskDTO.cs", + "ViewState": "AgIAACQAAAAAAAAAAAAqwAAAAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-03-24T06:46:41.369Z" + }, + { + "$type": "Document", + "DocumentIndex": 11, + "Title": "PutakeServer.cs", + "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\SerialPortService\\PutakeServer.cs", + "RelativeDocumentMoniker": "SerialPortService\\PutakeServer.cs", + "ToolTip": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\SerialPortService\\PutakeServer.cs", + "RelativeToolTip": "SerialPortService\\PutakeServer.cs", + "ViewState": "AgIAAAAAAAAAAAAAAADwvwoAAAAjAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-03-24T06:29:41.815Z" + }, + { + "$type": "Document", + "DocumentIndex": 12, + "Title": "TemplateServer.cs", + "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\SerialPortService\\TemplateServer.cs", + "RelativeDocumentMoniker": "SerialPortService\\TemplateServer.cs", + "ToolTip": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\SerialPortService\\TemplateServer.cs", + "RelativeToolTip": "SerialPortService\\TemplateServer.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-03-19T02:01:14.321Z" + }, + { + "$type": "Document", + "DocumentIndex": 14, + "Title": "INjTaskServer.cs", + "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\ISerialPortService\\INjTaskServer.cs", + "RelativeDocumentMoniker": "ISerialPortService\\INjTaskServer.cs", + "ToolTip": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\ISerialPortService\\INjTaskServer.cs", + "RelativeToolTip": "ISerialPortService\\INjTaskServer.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAABUAAAAIAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-03-19T01:54:15.368Z" + }, + { + "$type": "Document", + "DocumentIndex": 13, + "Title": "IProcessServer.cs", + "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\ISerialPortService\\IProcessServer.cs", + "RelativeDocumentMoniker": "ISerialPortService\\IProcessServer.cs", + "ToolTip": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\ISerialPortService\\IProcessServer.cs", + "RelativeToolTip": "ISerialPortService\\IProcessServer.cs", + "ViewState": "AgIAABMAAAAAAAAAAAAQwCUAAAAbAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-03-19T01:54:16.125Z" + }, + { + "$type": "Document", + "DocumentIndex": 15, + "Title": "IPutakeServer.cs", + "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\ISerialPortService\\IPutakeServer.cs", + "RelativeDocumentMoniker": "ISerialPortService\\IPutakeServer.cs", + "ToolTip": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\ISerialPortService\\IPutakeServer.cs", + "RelativeToolTip": "ISerialPortService\\IPutakeServer.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAswA4AAAAbAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-03-19T01:54:23.95Z" + }, + { + "$type": "Document", + "DocumentIndex": 16, + "Title": "NjTaskController.cs", + "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Server\\Controllers\\SerialPort\\NjTaskController.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Controllers\\SerialPort\\NjTaskController.cs", + "ToolTip": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Server\\Controllers\\SerialPort\\NjTaskController.cs", + "RelativeToolTip": "WIDESEAWCS_Server\\Controllers\\SerialPort\\NjTaskController.cs", + "ViewState": "AgIAAAkAAAAAAAAAAAAAAEkAAAAfAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-03-18T08:32:49.485Z" + }, + { + "$type": "Document", + "DocumentIndex": 17, + "Title": "Sys_UserService.cs", + "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_SystemServices\\Sys_UserService.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_SystemServices\\Sys_UserService.cs", + "ToolTip": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_SystemServices\\Sys_UserService.cs", + "RelativeToolTip": "WIDESEAWCS_SystemServices\\Sys_UserService.cs", + "ViewState": "AgIAAOAAAAAAAAAAAAAEwOgAAAAhAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-03-18T07:20:17.983Z" + }, + { + "$type": "Document", + "DocumentIndex": 18, + "Title": "Dt_Process.cs", + "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Model\\Models\\SerialPort\\Dt_Process.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\SerialPort\\Dt_Process.cs", + "ToolTip": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Model\\Models\\SerialPort\\Dt_Process.cs", + "RelativeToolTip": "WIDESEAWCS_Model\\Models\\SerialPort\\Dt_Process.cs", + "ViewState": "AgIAAAwAAAAAAAAAAAAAADIAAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-03-20T01:12:06.317Z" + }, + { + "$type": "Document", + "DocumentIndex": 20, + "Title": "SerialPortService.cs", + "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\SerialPortService\\SerialPortService.cs", + "RelativeDocumentMoniker": "SerialPortService\\SerialPortService.cs", + "ToolTip": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\SerialPortService\\SerialPortService.cs", + "RelativeToolTip": "SerialPortService\\SerialPortService.cs", + "ViewState": "AgIAACEAAAAAAAAAAADwvwAAAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-03-19T02:01:10.146Z" + }, + { + "$type": "Document", + "DocumentIndex": 19, + "Title": "TorqueOpServer.cs", + "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\SerialPortService\\TorqueOpServer.cs", + "RelativeDocumentMoniker": "SerialPortService\\TorqueOpServer.cs", + "ToolTip": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\SerialPortService\\TorqueOpServer.cs", + "RelativeToolTip": "SerialPortService\\TorqueOpServer.cs", + "ViewState": "AgIAAAYAAAAAAAAAAAAAAEIAAABsAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-03-19T01:56:46.727Z" + }, + { + "$type": "Document", "DocumentIndex": 21, "Title": "ToolsServer.cs", "DocumentMoniker": "E:\\\u7F8E\u578B\\NiuJuKongZhi\\\u9879\u76EE\u4EE3\u7801\\WIDESEAWCS_Server \u6B63\u5F0F\\SerialPortService\\ToolsServer.cs", @@ -539,8 +524,7 @@ "RelativeToolTip": "SerialPortService\\ToolsServer.cs", "ViewState": "AgIAAAMAAAAAAAAAAADwvxgAAAARAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-19T02:01:18.961Z", - "EditorCaption": "" + "WhenOpened": "2025-03-19T02:01:18.961Z" }, { "$type": "Document", @@ -588,8 +572,7 @@ "RelativeToolTip": "WIDESEAWCS_Model\\Models\\SerialPort\\Dt_NjTask.cs", "ViewState": "AgIAAIUAAAAAAAAAAAAUwNEAAAAmAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-20T01:07:30.689Z", - "EditorCaption": "" + "WhenOpened": "2025-03-20T01:07:30.689Z" }, { "$type": "Document", @@ -625,8 +608,7 @@ "RelativeToolTip": "WIDESEAWCS_Model\\Models\\SerialPort\\Dt_Putake.cs", "ViewState": "AgIAAFUAAAAAAAAAAAAiwGUAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-20T01:12:11.661Z", - "EditorCaption": "" + "WhenOpened": "2025-03-20T01:12:11.661Z" }, { "$type": "Document", @@ -734,8 +716,7 @@ "RelativeToolTip": "SerialPortService\\LoginHistoryServer.cs", "ViewState": "AgIAAAkAAAAAAAAAAAAuwBUAAAAdAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-19T02:35:47.432Z", - "EditorCaption": "" + "WhenOpened": "2025-03-19T02:35:47.432Z" }, { "$type": "Document", @@ -747,8 +728,7 @@ "RelativeToolTip": "WIDESEAWCS_DTO\\SerialPort\\AddNjtDTO.cs", "ViewState": "AgIAAAAAAAAAAAAAAADwvwAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-19T06:58:26.302Z", - "EditorCaption": "" + "WhenOpened": "2025-03-19T06:58:26.302Z" }, { "$type": "Document", @@ -760,8 +740,7 @@ "RelativeToolTip": "SerialPortService\\NJtakeHistoryServer.cs", "ViewState": "AgIAAAwAAAAAAAAAAADwvwAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-19T01:56:17.448Z", - "EditorCaption": "" + "WhenOpened": "2025-03-19T01:56:17.448Z" }, { "$type": "Document", @@ -785,8 +764,7 @@ "RelativeToolTip": "SerialPortService\\NJCommandsServer .cs", "ViewState": "AgIAAAwAAAAAAAAAAADwvwAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-19T01:56:15.37Z", - "EditorCaption": "" + "WhenOpened": "2025-03-19T01:56:15.37Z" }, { "$type": "Document", @@ -810,8 +788,7 @@ "RelativeToolTip": "SerialPortService\\ArticleInfomServer.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAABEAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-18T03:25:52.785Z", - "EditorCaption": "" + "WhenOpened": "2025-03-18T03:25:52.785Z" }, { "$type": "Document", diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/appsettings.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/appsettings.json" index 4af2a76..da5d5df 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/appsettings.json" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/appsettings.json" @@ -16,7 +16,7 @@ "MainDB": "DB_WIDESEA", //褰撳墠椤圭洰鐨勪富搴擄紝鎵�瀵瑰簲鐨勮繛鎺ュ瓧绗︿覆鐨凟nabled蹇呴』涓簍rue //杩炴帴瀛楃涓� //"ConnectionString": "HTI6FB1H05Krd07mNm9yBCNhofW6edA5zLs9TY~MNthRYW3kn0qKbMIsGp~3yyPDF1YZUCPBQx8U0Jfk4PH~ajNFXVIwlH85M3F~v_qKYQ3CeAz3q1mLVDn8O5uWt1~3Ut2V3KRkEwYHvW2oMDN~QIDXPxDgXN0R2oTIhc9dNu7QNaLEknblqmHhjaNSSpERdDVZIgHnMKejU_SL49tralBkZmDNi0hmkbL~837j1NWe37u9fJKmv91QPb~16JsuI9uu0EvNZ06g6PuZfOSAeFH9GMMIZiketdcJG3tHelo=", - "ConnectionString": "Data Source=.;Initial Catalog=WIDESEAWCS_MXNL;User ID=sa;Password=sa123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False", + "ConnectionString": "Data Source=.;Initial Catalog=WIDESEAWCS_MXNL;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False", //璺ㄥ煙 "Cors": { "PolicyName": "CorsIpAccess", //绛栫暐鍚嶇О diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Tasks/SerialPort/SerialPortJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Tasks/SerialPort/SerialPortJob.cs" index 286dd74..94f6b98 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Tasks/SerialPort/SerialPortJob.cs" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Tasks/SerialPort/SerialPortJob.cs" @@ -84,69 +84,12 @@ DeviceProtocolDetailDTO? deviceProtocolDetail = serialPortDevice.DeviceProtocolDetailDTOs.FirstOrDefault(x => x.DeviceProParamName == nameof(CommandType) && x.ProtocolDetailType == nameof(CommandType.Set)); if (deviceProtocolDetail != null) { - # region Setvalue string group = item.DeviceProDataBlock; - if (group == "鐢垫皵") - { - //鑾峰彇褰撳墠浠诲姟鍙� //IPutakeServer閲岄潰鐨勫緟鎵ц鐨勭涓�鏉′换鍔★紱 - var take = _putakeRepository.QueryData(x => x.Grouptype == group) - .OrderBy(x=>x.Dispatchtime) - .FirstOrDefault(); - var takeid = take?.Njtakeid;//鎷垮埌浠诲姟鍙� - //璋冪敤Getcircuit鎷垮埌褰撳墠姝ラ - var process = _processServer.Getcircuit(group,takeid); - - if (process != null && process.Status) - { - var list = JsonConvert.SerializeObject(process.Data); - var data = JsonConvert.DeserializeObject<ProcessData>(list); - - if (data?.proNow != null) - { - - int setpNum = data.proNow.SetpNum; - int sum = data.proNow.TorqueSum; - double torqueone = data.proNow.TorqueOne; - int onequantity = data.proNow.TorqueOneQuantity; - int towquantity = data.proNow.TorqueTwoQuantity; - double torquetwo = data.proNow.TorqueTwo; - - //鍒ゆ柇op琛ㄤ腑杩欎釜鍊兼槸鍚︽湁璇ユ潯浠诲姟鐨勬暟鎹� - var op = _orqueOpRepository.QueryData(x => x.TakeId == takeid && x.GroupOp == group&&x.ProcessSte== setpNum); - if (op.Any())//鍒ゆ柇鏄惁鏈夋暟鎹� - { - //鎵惧埌浜嗗氨瑕佸姣旂幇鍦╫p琛ㄤ腑鏈夊灏戞潯锛屾槸鍚﹀拰宸ヨ壓琛ㄤ腑鐨勭洰鏍囦竴鑷� - var oponecount=op.Count(x=>x.TorqueSize== torqueone);//绗竴涓壄鐨勬暟閲� - var optowcount = op.Count(x => x.TorqueSize == torquetwo);//绗簩涓壄鐨勬暟閲� - sum=oponecount+optowcount; - //绗竴绉嶏紝绗竴涓壄鍔涘�兼病鏈夋壄瀹� - if (oponecount< onequantity&& torqueone!=0) - { - //璁惧�� - //var com = item.DeviceChildCode + deviceProtocolDetail.ProtocalDetailValue - // .Replace("[setNum]", (torqueone * 1000).ToString().PadLeft(7, '0')) + "\r"; - var com = item.DeviceChildCode + deviceProtocolDetail.ProtocalDetailValue - .Replace("[setNum]", Math.Round(torqueone * 1000).ToString().PadLeft(7, '0')) + "\r"; - //鏍煎紡鍖栨垚鏁存暟 - - serialPortDevice.Communicator.Write(com); - WriteDebug("鍐欏叆", com); - } - //绗簩绉嶏紝绗竴涓�兼壄瀹屼簡锛岀浜屼釜娌℃湁鎵畬 - if (oponecount==onequantity&& optowcount < towquantity&& torquetwo!=0) - { - //璁惧�� - var com = item.DeviceChildCode + deviceProtocolDetail.ProtocalDetailValue - .Replace("[setNum]", Math.Round(torquetwo * 1000).ToString().PadLeft(7, '0')) + "\r"; - serialPortDevice.Communicator.Write(com); - } - } - - } - } + if (group == "鐢垫皵" || group == "鍦版矡" || group == "鏈烘") + { + ProcessElectricTask(group, serialPortDevice, item, deviceProtocolDetail); } - #endregion item.DeviceProParamName = CommandType.None.ToString(); } } @@ -189,52 +132,17 @@ //鎶婅繖鏉℃暟鎹彃鍏p琛ㄤ腑 string group = item.DeviceProDataBlock; // 璁惧鎵�灞炵粍鍒� string devicecode = item.DeviceChildCode;//璁惧缂栧彿 - string torqueValue = ExtractTorqueValue(receiveData); + string torqueValue = ExtractTorqueValue(receiveData);//璋冪敤杞�兼柟娉� - if (group == "鐢垫皵") + + + + if (group == "鐢垫皵" || group == "鍦版矡" || group == "鏈烘") { - #region - var take = _putakeRepository.QueryData(x => x.Grouptype == group) - .OrderBy(x => x.Dispatchtime) - .FirstOrDefault(); - var takeid = take?.Njtakeid;//鎷垮埌浠诲姟鍙� - - //璋冪敤Getcircuit鎷垮埌褰撳墠姝ラ - var process = _processServer.Getcircuit(group, takeid); - - if (process != null && process.Status) - { - var list = JsonConvert.SerializeObject(process.Data); - var dataz = JsonConvert.DeserializeObject<ProcessData>(list); - - if (dataz?.proNow != null) - { - - int setpNum = dataz.proNow.SetpNum; - int sum = dataz.proNow.TorqueSum; - double torqueone = dataz.proNow.TorqueOne; - int onequantity = dataz.proNow.TorqueOneQuantity; - int towquantity = dataz.proNow.TorqueTwoQuantity; - double torquetwo = dataz.proNow.TorqueTwo; - Dt_TorqueOp Addop = new Dt_TorqueOp() - { - DeviceCode = devicecode, - TakeId = takeid, - GroupOp = group, - ProcessSte = setpNum, - TorqueSize = float.TryParse(torqueValue, out float torque) ? torque : 0.0f, // 杩欓噷杩涜瀛楃涓插埌float鐨勮浆鎹� - CreateDate = DateTime.Now, - - }; - } - } - - - #endregion - + SaveTorqueOpData(group, devicecode, torqueValue); item.DeviceProParamName = CommandType.None.ToString(); } - + } DeviceProtocolDetailDTO? deviceProtocolDetail2 = serialPortDevice.DeviceProtocolDetailDTOs.FirstOrDefault(x => x.DeviceProParamName == nameof(CommandResult) && x.ProtocolDetailType == nameof(CommandResult.GetError)); @@ -270,11 +178,183 @@ /// <returns></returns> private string ExtractTorqueValue(string data) { - Match match = Regex.Match(data, @"\b0*(\d{1,4})000\b"); - return match.Success ? (double.Parse(match.Groups[1].Value) / 10.0).ToString("0.0") : "0.0"; + string[] parts = data.Split(','); // 鎸夐�楀彿鍒嗗壊鏁版嵁 + if (parts.Length > 1) // 纭繚鑷冲皯鏈変袱涓儴鍒� + { + //杩斿洖鐨勬槸涓�涓被浼间簬82407024103,+0005433,0004500,1702485619 + string targetValue = parts[1].TrimStart('+'); // 绉婚櫎鍓嶅 '+' + if (Regex.IsMatch(targetValue, @"^\d+$")) // 纭繚鏄函鏁板瓧 + { + return (double.Parse(targetValue) / 1000.0).ToString("0.###"); // 闄や互 1000锛屼繚鐣欐渶澶� 3 浣嶅皬鏁� + } + } + return "0.000"; // 瑙f瀽澶辫触杩斿洖 0.000 } + + /// <summary> + /// 澶勭悊鐢垫皵浠诲姟閫昏緫锛屽彂閫佹壄鐭╂寚浠ゅ埌璁惧 + /// </summary> + /// <param name="group">浠诲姟鍒嗙粍</param> + /// <param name="serialPortDevice">涓插彛璁惧</param> + /// <param name="item">璁惧淇℃伅</param> + /// <param name="deviceProtocolDetail">璁惧鍗忚璇︽儏</param> + private void ProcessElectricTask(string group, SerialPortDevice serialPortDevice, DeviceProDTO item, DeviceProtocolDetailDTO deviceProtocolDetail) + { + //鑾峰彇褰撳墠浠诲姟鍙� //IPutakeServer閲岄潰鐨勫緟鎵ц鐨勭涓�鏉′换鍔★紱 + var take = _putakeRepository.QueryData(x => x.Grouptype == group) + .OrderBy(x => x.Dispatchtime) + .FirstOrDefault(); + var takeid = take?.Njtakeid;//鎷垮埌浠诲姟鍙� + + //璋冪敤Getcircuit鎷垮埌褰撳墠姝ラ + var process = _processServer.Getcircuit(group, takeid); + + if (process != null && process.Status) + { + var list = JsonConvert.SerializeObject(process.Data); + var data = JsonConvert.DeserializeObject<ProcessData>(list); + + if (data?.proNow != null) + { + + int setpNum = data.proNow.SetpNum; + int sum = data.proNow.TorqueSum; + double torqueone = data.proNow.TorqueOne; + double torquetwo = data.proNow.TorqueTwo; + + int onequantity = data.proNow.TorqueOneQuantity; + int towquantity = data.proNow.TorqueTwoQuantity; + + + //鍒ゆ柇op琛ㄤ腑杩欎釜鍊兼槸鍚︽湁璇ユ潯浠诲姟鐨勬暟鎹� + var op = _orqueOpRepository.QueryData(x => x.TakeId == takeid && x.GroupOp == group && x.ProcessSte == setpNum); + if (op.Any())//鍒ゆ柇鏄惁鏈夋暟鎹� + { + //鎵惧埌浜嗗氨瑕佸姣旂幇鍦╫p琛ㄤ腑鏈夊灏戞潯锛屾槸鍚﹀拰宸ヨ壓琛ㄤ腑鐨勭洰鏍囦竴鑷� + + // 璁$畻绗竴涓壄鐭╃殑鏁伴噺锛堝湪 卤1 璇樊鑼冨洿鍐咃級//Math.Abs(5.2 - 4.5) = 0.7 // 璁″叆 Math.Abs(6.0 - 4.5) = 1.5 涓嶈鍏� + var oponecount = op.Count(x => Math.Abs(x.TorqueSize - torqueone) <= 1); + + int times = 0; + if (op.Count() > onequantity) + { + times = onequantity;//濡傛灉绗竴鏉′互鍙婃弧瓒冲氨绉婚櫎onequantity鏁伴噺鐨勬暟鎹� + } + else + { + times = op.Count();//娌℃湁婊¤冻灏辩Щ闄ゅ綋鍓嶇殑鏁版嵁鏁版嵁 + } + + for (int i = 0; i < times; i++) + { + //绉婚櫎绗竴娆″�肩殑褰卞搷锛堜互涓烘湁鍙兘淇╀釜鐩爣鍊肩浉杩戣�屼骇鐢熻鍒わ級 + op.RemoveAt(0); //绉婚櫎 op 鍒楄〃鐨� 绗竴涓厓绱狅紙鍗虫渶鏃╁瓨鍏ョ殑璁板綍锛� + + } + + // 璁$畻绗簩涓壄鐭╃殑鏁伴噺锛堝湪 卤1 璇樊鑼冨洿鍐咃級 + var optowcount = op.Count(x => Math.Abs(x.TorqueSize - torquetwo) <= 1); + sum = oponecount + optowcount; + //绗竴绉嶏紝绗竴涓壄鍔涘�兼病鏈夋壄瀹� + if (oponecount < onequantity && torqueone != 0) + { + //璁惧�� + //var com = item.DeviceChildCode + deviceProtocolDetail.ProtocalDetailValue + // .Replace("[setNum]", (torqueone * 1000).ToString().PadLeft(7, '0')) + "\r"; + var com = item.DeviceChildCode + deviceProtocolDetail.ProtocalDetailValue + .Replace("[setNum]", Math.Round(torqueone * 1000).ToString().PadLeft(7, '0')) + "\r"; + //鏍煎紡鍖栨垚鏁存暟 + + serialPortDevice.Communicator.Write(com); + //WriteDebug("鍐欏叆", com); + } + //绗簩绉嶏紝绗竴涓�兼壄瀹屼簡锛岀浜屼釜娌℃湁鎵畬 + if (oponecount == onequantity && optowcount < towquantity && torquetwo != 0) + { + //璁惧�� + var com = item.DeviceChildCode + deviceProtocolDetail.ProtocalDetailValue + .Replace("[setNum]", Math.Round(torquetwo * 1000).ToString().PadLeft(7, '0')) + "\r"; + serialPortDevice.Communicator.Write(com); + } + } + //杩欓噷杩欎釜浠诲姟绗竴娆℃墽琛岋紝op琛ㄤ腑鑲畾鏄病鏈夋暟鎹殑锛屾墍鏈夌涓�娆″氨瑕佹妸宸ヨ壓琛ㄤ腑鐨勫�肩粰瀹� + else if(!op.Any()&& torqueone!=0)//闃叉姝ラ涓�涓璽orqueone鐨勫�间负0瀵艰嚧鎶ラ敊 + { + //璁惧�� + var com = item.DeviceChildCode + deviceProtocolDetail.ProtocalDetailValue + .Replace("[setNum]", Math.Round(torqueone * 1000).ToString().PadLeft(7, '0')) + "\r"; + serialPortDevice.Communicator.Write(com); + } + + } + else + { + Console.WriteLine("proNow 涓虹┖"); + } + } + else + { + Console.WriteLine($"Getcireit鎺ュ彛閿欒锛歿process?.Message}"); + } + } + + /// <summary> + /// 鍙戦�佹壄鐭╂寚浠ゅ埌璁惧 + /// </summary> + /// <param name="serialPortDevice">涓插彛璁惧</param> + /// <param name="item">璁惧淇℃伅</param> + /// <param name="deviceProtocolDetail">璁惧鍗忚璇︽儏</param> + /// <param name="torqueValue">鎵煩鍊�</param> + private void SendTorqueCommand(SerialPortDevice serialPortDevice, DeviceProDTO item, DeviceProtocolDetailDTO deviceProtocolDetail, double torqueValue) + { + var com = item.DeviceChildCode + deviceProtocolDetail.ProtocalDetailValue + .Replace("[setNum]", Math.Round(torqueValue * 1000).ToString().PadLeft(7, '0')) + "\r"; + serialPortDevice.Communicator.Write(com); + } + + + /// <summary> + /// 瀛樺偍鎵煩鏁版嵁鍒� `op` 琛� + /// </summary> + private void SaveTorqueOpData(string group, string devicecode, string torqueValue) + { + var take = _putakeRepository.QueryData(x => x.Grouptype == group) + .OrderBy(x => x.Dispatchtime) + .FirstOrDefault(); + var takeid = take?.Njtakeid;//鎷垮埌浠诲姟鍙� + + //璋冪敤Getcircuit鎷垮埌褰撳墠姝ラ + var process = _processServer.Getcircuit(group, takeid); + + if (process != null && process.Status) + { + var list = JsonConvert.SerializeObject(process.Data); + var dataz = JsonConvert.DeserializeObject<ProcessData>(list); + + if (dataz?.proNow != null) + { + + int setpNum = dataz.proNow.SetpNum; + int sum = dataz.proNow.TorqueSum; + double torqueone = dataz.proNow.TorqueOne; + int onequantity = dataz.proNow.TorqueOneQuantity; + int towquantity = dataz.proNow.TorqueTwoQuantity; + double torquetwo = dataz.proNow.TorqueTwo; + Dt_TorqueOp Addop = new Dt_TorqueOp() + { + DeviceCode = devicecode, + TakeId = takeid, + GroupOp = group, + ProcessSte = setpNum, + TorqueSize = float.TryParse(torqueValue, out float torque) ? torque : 0.0f, // 杩欓噷杩涜瀛楃涓插埌float鐨勮浆鎹� + CreateDate = DateTime.Now, + }; + _orqueOpRepository.AddData(Addop); + } + } + } } } diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Tasks/SerialPort/SerialPortTestJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Tasks/SerialPort/SerialPortTestJob.cs" index 7ed38b0..a02e1e6 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Tasks/SerialPort/SerialPortTestJob.cs" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Tasks/SerialPort/SerialPortTestJob.cs" @@ -141,3 +141,150 @@ // } // } //} +#region +//if (group == "鐢垫皵") +//{ +// //鑾峰彇褰撳墠浠诲姟鍙� //IPutakeServer閲岄潰鐨勫緟鎵ц鐨勭涓�鏉′换鍔★紱 +// var take = _putakeRepository.QueryData(x => x.Grouptype == group) +// .OrderBy(x => x.Dispatchtime) +// .FirstOrDefault(); +// var takeid = take?.Njtakeid;//鎷垮埌浠诲姟鍙� + +// //璋冪敤Getcircuit鎷垮埌褰撳墠姝ラ +// var process = _processServer.Getcircuit(group, takeid); + +// if (process != null && process.Status) +// { +// var list = JsonConvert.SerializeObject(process.Data); +// var data = JsonConvert.DeserializeObject<ProcessData>(list); + +// if (data?.proNow != null) +// { + +// int setpNum = data.proNow.SetpNum; +// int sum = data.proNow.TorqueSum; +// double torqueone = data.proNow.TorqueOne; +// double torquetwo = data.proNow.TorqueTwo; + +// int onequantity = data.proNow.TorqueOneQuantity; +// int towquantity = data.proNow.TorqueTwoQuantity; + + +// //鍒ゆ柇op琛ㄤ腑杩欎釜鍊兼槸鍚︽湁璇ユ潯浠诲姟鐨勬暟鎹� +// var op = _orqueOpRepository.QueryData(x => x.TakeId == takeid && x.GroupOp == group && x.ProcessSte == setpNum); +// if (op.Any())//鍒ゆ柇鏄惁鏈夋暟鎹� +// { +// //鎵惧埌浜嗗氨瑕佸姣旂幇鍦╫p琛ㄤ腑鏈夊灏戞潯锛屾槸鍚﹀拰宸ヨ壓琛ㄤ腑鐨勭洰鏍囦竴鑷� + +// // 璁$畻绗竴涓壄鐭╃殑鏁伴噺锛堝湪 卤1 璇樊鑼冨洿鍐咃級//Math.Abs(5.2 - 4.5) = 0.7 // 璁″叆 Math.Abs(6.0 - 4.5) = 1.5 涓嶈鍏� +// var oponecount = op.Count(x => Math.Abs(x.TorqueSize - torqueone) <= 1); + +// int times = 0; +// if (op.Count() > onequantity) +// { +// times = onequantity;//濡傛灉绗竴鏉′互鍙婃弧瓒冲氨绉婚櫎onequantity鏁伴噺鐨勬暟鎹� +// } +// else +// { +// times = op.Count();//娌℃湁婊¤冻灏辩Щ闄ゅ綋鍓嶇殑鏁版嵁鏁版嵁 +// } + +// for (int i = 0; i < times; i++) +// { +// //绉婚櫎绗竴娆″�肩殑褰卞搷锛堜互涓烘湁鍙兘淇╀釜鐩爣鍊肩浉杩戣�屼骇鐢熻鍒わ級 +// op.RemoveAt(0); //绉婚櫎 op 鍒楄〃鐨� 绗竴涓厓绱狅紙鍗虫渶鏃╁瓨鍏ョ殑璁板綍锛� + +// } + +// // 璁$畻绗簩涓壄鐭╃殑鏁伴噺锛堝湪 卤1 璇樊鑼冨洿鍐咃級 +// var optowcount = op.Count(x => Math.Abs(x.TorqueSize - torquetwo) <= 1); +// sum = oponecount + optowcount; +// //绗竴绉嶏紝绗竴涓壄鍔涘�兼病鏈夋壄瀹� +// if (oponecount < onequantity && torqueone != 0) +// { +// //璁惧�� +// //var com = item.DeviceChildCode + deviceProtocolDetail.ProtocalDetailValue +// // .Replace("[setNum]", (torqueone * 1000).ToString().PadLeft(7, '0')) + "\r"; +// var com = item.DeviceChildCode + deviceProtocolDetail.ProtocalDetailValue +// .Replace("[setNum]", Math.Round(torqueone * 1000).ToString().PadLeft(7, '0')) + "\r"; +// //鏍煎紡鍖栨垚鏁存暟 + +// serialPortDevice.Communicator.Write(com); +// //WriteDebug("鍐欏叆", com); +// } +// //绗簩绉嶏紝绗竴涓�兼壄瀹屼簡锛岀浜屼釜娌℃湁鎵畬 +// if (oponecount == onequantity && optowcount < towquantity && torquetwo != 0) +// { +// //璁惧�� +// var com = item.DeviceChildCode + deviceProtocolDetail.ProtocalDetailValue +// .Replace("[setNum]", Math.Round(torquetwo * 1000).ToString().PadLeft(7, '0')) + "\r"; +// serialPortDevice.Communicator.Write(com); +// } +// } +// //杩欓噷杩欎釜浠诲姟绗竴娆℃墽琛岋紝op琛ㄤ腑鑲畾鏄病鏈夋暟鎹殑锛屾墍鏈夌涓�娆″氨瑕佹妸宸ヨ壓琛ㄤ腑鐨勫�肩粰瀹� +// else //闃叉姝ラ涓�涓璽orqueone鐨勫�间负0瀵艰嚧鎶ラ敊 +// { +// //璁惧�� +// var com = item.DeviceChildCode + deviceProtocolDetail.ProtocalDetailValue +// .Replace("[setNum]", Math.Round(torqueone * 1000).ToString().PadLeft(7, '0')) + "\r"; +// serialPortDevice.Communicator.Write(com); +// } + +// } +// else +// { +// Console.WriteLine("proNow 涓虹┖"); +// } +// } +// else +// { +// Console.WriteLine($"Getcireit鎺ュ彛閿欒锛歿process?.Message}"); +// } +//} + +#endregion + + +#region 鏍规嵁涓嶅悓鐨刧roup瀛樺�� +//if (group == "鐢垫皵") +//{ +// var take = _putakeRepository.QueryData(x => x.Grouptype == group) +// .OrderBy(x => x.Dispatchtime) +// .FirstOrDefault(); +// var takeid = take?.Njtakeid;//鎷垮埌浠诲姟鍙� + +// //璋冪敤Getcircuit鎷垮埌褰撳墠姝ラ +// var process = _processServer.Getcircuit(group, takeid); + +// if (process != null && process.Status) +// { +// var list = JsonConvert.SerializeObject(process.Data); +// var dataz = JsonConvert.DeserializeObject<ProcessData>(list); + +// if (dataz?.proNow != null) +// { + +// int setpNum = dataz.proNow.SetpNum; +// int sum = dataz.proNow.TorqueSum; +// double torqueone = dataz.proNow.TorqueOne; +// int onequantity = dataz.proNow.TorqueOneQuantity; +// int towquantity = dataz.proNow.TorqueTwoQuantity; +// double torquetwo = dataz.proNow.TorqueTwo; +// Dt_TorqueOp Addop = new Dt_TorqueOp() +// { +// DeviceCode = devicecode, +// TakeId = takeid, +// GroupOp = group, +// ProcessSte = setpNum, +// TorqueSize = float.TryParse(torqueValue, out float torque) ? torque : 0.0f, // 杩欓噷杩涜瀛楃涓插埌float鐨勮浆鎹� +// CreateDate = DateTime.Now, +// }; +// _orqueOpRepository.AddData(Addop); +// } +// } + + +// item.DeviceProParamName = CommandType.None.ToString(); +//} + +#endregion \ No newline at end of file -- Gitblit v1.9.3