Merge branch 'qy0227' of http://115.159.85.185:8098/r/MeiXinLaiRui/NiuJuKon...

qiuyao

2025-02-28 4aaa6e0659ced0440c2202fc314f10f40890e573

Merge branch 'qy0227' of http://115.159.85.185:8098/r/MeiXinLaiRui/NiuJuKongZhi into qy0227

# Conflicts:
#	项目代码/WIDESEAWCS_Server 正式/.vs/WIDESEAWCS_Server/v17/DocumentLayout.json

 项目代码/WIDESEAWCS_Server 正式/.vs/WIDESEAWCS_Server/v17/DocumentLayout.json

@@ -3,12 +3,12 @@
  "WorkspaceRootPath": "D:\\vs\\WIDESEAWCS_Server \u6B63\u5F0F\\",
  "Documents": [
    {
      "AbsoluteMoniker": "D:0:0:{DE3CBFFF-C6C4-4A38-9A00-06291EF590B9}|SerialPortService\\WIDESEA_SerialPortService.csproj|d:\\vs\\wideseawcs_server \u6B63\u5F0F\\serialportservice\\serialportservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{DE3CBFFF-C6C4-4A38-9A00-06291EF590B9}|SerialPortService\\WIDESEA_SerialPortService.csproj|solutionrelative:serialportservice\\serialportservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|d:\\vs\\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|d:\\vs\\wideseawcs_server \u6B63\u5F0F\\serialportservice\\serialportservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{DE3CBFFF-C6C4-4A38-9A00-06291EF590B9}|SerialPortService\\WIDESEA_SerialPortService.csproj|solutionrelative:serialportservice\\serialportservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|d:\\vs\\wideseawcs_server \u6B63\u5F0F\\wideseawcs_tasks\\testjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
@@ -177,7 +177,7 @@
      "DocumentGroups": [
        {
          "DockedWidth": 200,
          "SelectedChildIndex": 4,
          "SelectedChildIndex": 2,
          "Children": [
            {
              "$type": "Bookmark",
@@ -193,18 +193,17 @@
              "RelativeToolTip": "WIDESEAWCS_Tasks\\TestJob.cs",
              "ViewState": "AgIAADoAAAAAAAAAAAAUwAAAAAAAAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-02-28T06:27:46.765Z",
              "EditorCaption": ""
              "WhenOpened": "2025-02-28T06:27:46.765Z"
            },
            {
              "$type": "Document",
              "DocumentIndex": 1,
              "DocumentIndex": 0,
              "Title": "SerialPortTestJob.cs",
              "DocumentMoniker": "D:\\vs\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Tasks\\SerialPort\\SerialPortTestJob.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\SerialPort\\SerialPortTestJob.cs",
              "ToolTip": "D:\\vs\\WIDESEAWCS_Server \u6B63\u5F0F\\WIDESEAWCS_Tasks\\SerialPort\\SerialPortTestJob.cs",
              "RelativeToolTip": "WIDESEAWCS_Tasks\\SerialPort\\SerialPortTestJob.cs",
              "ViewState": "AgIAACwAAAAAAAAAAAAgwFwAAAAVAAAAAAAAAA==",
              "ViewState": "AgIAAAAAAAAAAAAAAAAAAAwAAAA/AAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-02-27T06:09:27.847Z",
              "EditorCaption": ""
@@ -219,12 +218,11 @@
              "RelativeToolTip": "WIDESEAWCS_Tasks\\ConveyorLineJob\\CommonConveyorLineJob.cs",
              "ViewState": "AgIAAH8AAAAAAAAAAAAgwF0AAAANAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-02-28T06:11:36.144Z",
              "EditorCaption": ""
              "WhenOpened": "2025-02-28T06:11:36.144Z"
            },
            {
              "$type": "Document",
              "DocumentIndex": 0,
              "DocumentIndex": 1,
              "Title": "SerialPortService.cs",
              "DocumentMoniker": "D:\\vs\\WIDESEAWCS_Server \u6B63\u5F0F\\SerialPortService\\SerialPortService.cs",
              "RelativeDocumentMoniker": "SerialPortService\\SerialPortService.cs",
@@ -245,8 +243,7 @@
              "RelativeToolTip": "ISerialPortService\\ISerialPortService.cs",
              "ViewState": "AgIAAAMAAAAAAAAAAAAMwBMAAAANAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-02-28T03:00:05.618Z",
              "EditorCaption": ""
              "WhenOpened": "2025-02-28T03:00:05.618Z"
            },
            {
              "$type": "Document",
@@ -258,8 +255,7 @@
              "RelativeToolTip": "WIDESEAWCS_Server\\Program.cs",
              "ViewState": "AgIAAEgAAAAAAAAAAAAjwFQAAABHAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-02-28T03:45:00.091Z",
              "EditorCaption": ""
              "WhenOpened": "2025-02-28T03:45:00.091Z"
            },
            {
              "$type": "Document",
@@ -271,8 +267,7 @@
              "RelativeToolTip": "WIDESEAWCS_ISystemServices\\ISys_DictionaryListService.cs",
              "ViewState": "AgIAAAAAAAAAAAAAAADwvw0AAAABAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-02-20T06:39:49.366Z",
              "EditorCaption": ""
              "WhenOpened": "2025-02-20T06:39:49.366Z"
            },
            {
              "$type": "Document",
@@ -284,8 +279,7 @@
              "RelativeToolTip": "SerialPortRepository\\SerialPortRepository.cs",
              "ViewState": "AgIAAAAAAAAAAAAAAAAAAAoAAAAIAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-02-25T03:15:38.124Z",
              "EditorCaption": ""
              "WhenOpened": "2025-02-25T03:15:38.124Z"
            },
            {
              "$type": "Document",
@@ -297,8 +291,7 @@
              "RelativeToolTip": "WIDESEAWCS_Server\\Controllers\\SerialPort\\SerialPortController.cs",
              "ViewState": "AgIAABYAAAAAAAAAAAAWwCcAAAAnAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-02-25T03:20:09.708Z",
              "EditorCaption": ""
              "WhenOpened": "2025-02-25T03:20:09.708Z"
            },
            {
              "$type": "Document",
@@ -310,8 +303,7 @@
              "RelativeToolTip": "WIDESEAWCS_Tasks\\StackerCraneJob\\CommonStackerCraneJob.cs",
              "ViewState": "AgIAADYAAAAAAAAAAADgv08AAAAIAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-02-28T01:46:09.493Z",
              "EditorCaption": ""
              "WhenOpened": "2025-02-28T01:46:09.493Z"
            },
            {
              "$type": "Document",
@@ -323,8 +315,7 @@
              "RelativeToolTip": "WIDESEAWCS_Server\\Filter\\AutofacPropertityModuleReg.cs",
              "ViewState": "AgIAAAAAAAAAAAAAAAAAAAcAAAAaAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-02-28T03:04:24.634Z",
              "EditorCaption": ""
              "WhenOpened": "2025-02-28T03:04:24.634Z"
            },
            {
              "$type": "Document",
@@ -336,8 +327,7 @@
              "RelativeToolTip": "WIDESEAWCS_SystemServices\\Sys_DictionaryListService.cs",
              "ViewState": "AgIAAAAAAAAAAAAAAAAAAA4AAABfAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-02-24T01:12:44.818Z",
              "EditorCaption": ""
              "WhenOpened": "2025-02-24T01:12:44.818Z"
            },
            {
              "$type": "Document",
@@ -361,8 +351,7 @@
              "RelativeToolTip": "WIDESEAWCS_Tasks\\ConveyorLineJob\\ConveyorLineTaskCommand.cs",
              "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-02-28T01:57:46.23Z",
              "EditorCaption": ""
              "WhenOpened": "2025-02-28T01:57:46.23Z"
            },
            {
              "$type": "Document",