剔除

Zhang-Hong-Lin

2025-05-27 7924008bfdcfc7a73428826fc10ae475b1f71353

剔除

剔除

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.backup.json

@@ -3,32 +3,28 @@
  "WorkspaceRootPath": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\",
  "Documents": [
    {
      "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|f:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\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:{83F18A31-5983-4587-A0B2-414BF70E50B5}|WIDESEAWCS_TaskInfoService\\WIDESEAWCS_TaskInfoService.csproj|f:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_taskinfoservice\\taskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{83F18A31-5983-4587-A0B2-414BF70E50B5}|WIDESEAWCS_TaskInfoService\\WIDESEAWCS_TaskInfoService.csproj|solutionrelative:wideseawcs_taskinfoservice\\taskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|f:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_server\\controllers\\task\\taskcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|solutionrelative:wideseawcs_server\\controllers\\task\\taskcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|f:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\gzj\\gzjjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\gzj\\gzjjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|f:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\oht\\ohtjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\oht\\ohtjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|f:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\zxj\\zxjjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\zxj\\zxjjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{7279A2AE-8D1F-4E66-A73A-01AF7927A336}|WIDESEAWCS_ITaskInfoService\\WIDESEAWCS_ITaskInfoService.csproj|f:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_itaskinfoservice\\itaskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{7279A2AE-8D1F-4E66-A73A-01AF7927A336}|WIDESEAWCS_ITaskInfoService\\WIDESEAWCS_ITaskInfoService.csproj|solutionrelative:wideseawcs_itaskinfoservice\\itaskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
      "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|f:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\oht\\ohtenum.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\oht\\ohtenum.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|f:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\oht\\ohtjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\oht\\ohtjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|f:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\oht\\ohtreaddata.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\oht\\ohtreaddata.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{83F18A31-5983-4587-A0B2-414BF70E50B5}|WIDESEAWCS_TaskInfoService\\WIDESEAWCS_TaskInfoService.csproj|f:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_taskinfoservice\\taskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{83F18A31-5983-4587-A0B2-414BF70E50B5}|WIDESEAWCS_TaskInfoService\\WIDESEAWCS_TaskInfoService.csproj|solutionrelative:wideseawcs_taskinfoservice\\taskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    }
  ],
  "DocumentGroupContainers": [
@@ -43,90 +39,80 @@
            {
              "$type": "Document",
              "DocumentIndex": 0,
              "Title": "appsettings.json",
              "DocumentMoniker": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\appsettings.json",
              "RelativeDocumentMoniker": "WIDESEAWCS_Server\\appsettings.json",
              "ToolTip": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\appsettings.json",
              "RelativeToolTip": "WIDESEAWCS_Server\\appsettings.json",
              "ViewState": "AgIAAAAAAAAAAAAAAADwvxYAAABEAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|",
              "WhenOpened": "2025-04-22T06:40:39.499Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 2,
              "Title": "TaskController.cs",
              "DocumentMoniker": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Controllers\\Task\\TaskController.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Controllers\\Task\\TaskController.cs",
              "ToolTip": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Controllers\\Task\\TaskController.cs",
              "RelativeToolTip": "WIDESEAWCS_Server\\Controllers\\Task\\TaskController.cs",
              "ViewState": "AgIAAC0AAAAAAAAAAAAqwDYAAAAjAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-04-07T01:30:28.732Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 5,
              "Title": "ZXJJob.cs",
              "DocumentMoniker": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\ZXJ\\ZXJJob.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\ZXJ\\ZXJJob.cs",
              "ToolTip": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\ZXJ\\ZXJJob.cs",
              "RelativeToolTip": "WIDESEAWCS_Tasks\\ZXJ\\ZXJJob.cs",
              "ViewState": "AgIAABIAAAAAKDMzMzMLwCcAAAArAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-04-03T02:04:31.648Z"
            },
            {
              "$type": "Document",
              "DocumentIndex": 4,
              "Title": "OHTJob.cs",
              "DocumentMoniker": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\OHT\\OHTJob.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\OHT\\OHTJob.cs",
              "ToolTip": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\OHT\\OHTJob.cs",
              "RelativeToolTip": "WIDESEAWCS_Tasks\\OHT\\OHTJob.cs",
              "ViewState": "AgIAAA4AAAAAAAAAAAAAwCUAAAAwAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-03-23T11:49:54.445Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 3,
              "Title": "GZJJob.cs",
              "DocumentMoniker": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\GZJ\\GZJJob.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\GZJ\\GZJJob.cs",
              "ToolTip": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\GZJ\\GZJJob.cs",
              "RelativeToolTip": "WIDESEAWCS_Tasks\\GZJ\\GZJJob.cs",
              "ViewState": "AgIAAEIAAAAAAAAAAAAAwFkAAAAmAAAAAAAAAA==",
              "ViewState": "AgIAABACAAAAAAAAAAAAAK8BAAAkAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-03-23T11:49:08.254Z",
              "WhenOpened": "2025-05-16T07:03:59.279Z",
              "IsPinned": true,
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 6,
              "Title": "ITaskService.cs",
              "DocumentMoniker": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_ITaskInfoService\\ITaskService.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_ITaskInfoService\\ITaskService.cs",
              "ToolTip": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_ITaskInfoService\\ITaskService.cs",
              "RelativeToolTip": "WIDESEAWCS_ITaskInfoService\\ITaskService.cs",
              "ViewState": "AgIAAAAAAAAAAAAAAAAAACMAAAAiAAAAAAAAAA==",
              "DocumentIndex": 4,
              "Title": "OHTReadData.cs",
              "DocumentMoniker": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\OHT\\OHTReadData.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\OHT\\OHTReadData.cs",
              "ToolTip": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\OHT\\OHTReadData.cs",
              "RelativeToolTip": "WIDESEAWCS_Tasks\\OHT\\OHTReadData.cs",
              "ViewState": "AgIAAD8AAAAAAAAAAIA4wEcAAAAYAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-03-11T01:46:41.081Z"
              "WhenOpened": "2025-05-26T06:34:01.253Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 1,
              "DocumentIndex": 2,
              "Title": "OHTEnum.cs",
              "DocumentMoniker": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\OHT\\OHTEnum.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\OHT\\OHTEnum.cs",
              "ToolTip": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\OHT\\OHTEnum.cs",
              "RelativeToolTip": "WIDESEAWCS_Tasks\\OHT\\OHTEnum.cs",
              "ViewState": "AgIAANIBAAAAAAAAAAAewOQBAAAWAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-05-26T06:33:59.339Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 5,
              "Title": "TaskService.cs",
              "DocumentMoniker": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_TaskInfoService\\TaskService.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_TaskInfoService\\TaskService.cs",
              "ToolTip": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_TaskInfoService\\TaskService.cs",
              "RelativeToolTip": "WIDESEAWCS_TaskInfoService\\TaskService.cs",
              "ViewState": "AgIAAEcDAAAAAAAAAAAEwGQDAABDAAAAAAAAAA==",
              "ViewState": "AgIAAHUDAAAAAAAAAAAewIcDAAAVAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-03-06T08:14:42.09Z",
              "WhenOpened": "2025-05-19T02:06:47.617Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 3,
              "Title": "OHTJob.cs",
              "DocumentMoniker": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\OHT\\OHTJob.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\OHT\\OHTJob.cs",
              "ToolTip": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\OHT\\OHTJob.cs",
              "RelativeToolTip": "WIDESEAWCS_Tasks\\OHT\\OHTJob.cs",
              "ViewState": "AgIAAMEAAAAAAAAAAAAewKAAAABcAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-05-16T07:49:36.171Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 1,
              "Title": "ZXJJob.cs",
              "DocumentMoniker": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\ZXJ\\ZXJJob.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\ZXJ\\ZXJJob.cs",
              "ToolTip": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\ZXJ\\ZXJJob.cs",
              "RelativeToolTip": "WIDESEAWCS_Tasks\\ZXJ\\ZXJJob.cs",
              "ViewState": "AgIAAPYAAAAAAAAAAAAewAgBAAAYAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-04-03T02:04:31.648Z",
              "EditorCaption": ""
            }
          ]

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.json

@@ -3,32 +3,28 @@
  "WorkspaceRootPath": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\",
  "Documents": [
    {
      "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|f:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\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:{83F18A31-5983-4587-A0B2-414BF70E50B5}|WIDESEAWCS_TaskInfoService\\WIDESEAWCS_TaskInfoService.csproj|f:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_taskinfoservice\\taskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{83F18A31-5983-4587-A0B2-414BF70E50B5}|WIDESEAWCS_TaskInfoService\\WIDESEAWCS_TaskInfoService.csproj|solutionrelative:wideseawcs_taskinfoservice\\taskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|f:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_server\\controllers\\task\\taskcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|solutionrelative:wideseawcs_server\\controllers\\task\\taskcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|f:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\gzj\\gzjjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\gzj\\gzjjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|f:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\oht\\ohtjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\oht\\ohtjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|f:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\zxj\\zxjjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\zxj\\zxjjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{7279A2AE-8D1F-4E66-A73A-01AF7927A336}|WIDESEAWCS_ITaskInfoService\\WIDESEAWCS_ITaskInfoService.csproj|f:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_itaskinfoservice\\itaskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{7279A2AE-8D1F-4E66-A73A-01AF7927A336}|WIDESEAWCS_ITaskInfoService\\WIDESEAWCS_ITaskInfoService.csproj|solutionrelative:wideseawcs_itaskinfoservice\\itaskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
      "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|f:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\oht\\ohtenum.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\oht\\ohtenum.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|f:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\oht\\ohtjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\oht\\ohtjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|f:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\oht\\ohtreaddata.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\oht\\ohtreaddata.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{83F18A31-5983-4587-A0B2-414BF70E50B5}|WIDESEAWCS_TaskInfoService\\WIDESEAWCS_TaskInfoService.csproj|f:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_taskinfoservice\\taskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{83F18A31-5983-4587-A0B2-414BF70E50B5}|WIDESEAWCS_TaskInfoService\\WIDESEAWCS_TaskInfoService.csproj|solutionrelative:wideseawcs_taskinfoservice\\taskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    }
  ],
  "DocumentGroupContainers": [
@@ -43,90 +39,80 @@
            {
              "$type": "Document",
              "DocumentIndex": 0,
              "Title": "appsettings.json",
              "DocumentMoniker": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\appsettings.json",
              "RelativeDocumentMoniker": "WIDESEAWCS_Server\\appsettings.json",
              "ToolTip": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\appsettings.json",
              "RelativeToolTip": "WIDESEAWCS_Server\\appsettings.json",
              "ViewState": "AgIAAAAAAAAAAAAAAADwvxYAAABEAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|",
              "WhenOpened": "2025-04-22T06:40:39.499Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 2,
              "Title": "TaskController.cs",
              "DocumentMoniker": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Controllers\\Task\\TaskController.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Controllers\\Task\\TaskController.cs",
              "ToolTip": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Controllers\\Task\\TaskController.cs",
              "RelativeToolTip": "WIDESEAWCS_Server\\Controllers\\Task\\TaskController.cs",
              "ViewState": "AgIAAC0AAAAAAAAAAAAqwDYAAAAjAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-04-07T01:30:28.732Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 5,
              "Title": "ZXJJob.cs",
              "DocumentMoniker": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\ZXJ\\ZXJJob.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\ZXJ\\ZXJJob.cs",
              "ToolTip": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\ZXJ\\ZXJJob.cs",
              "RelativeToolTip": "WIDESEAWCS_Tasks\\ZXJ\\ZXJJob.cs",
              "ViewState": "AgIAABIAAAAAKDMzMzMLwCcAAAArAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-04-03T02:04:31.648Z"
            },
            {
              "$type": "Document",
              "DocumentIndex": 4,
              "Title": "OHTJob.cs",
              "DocumentMoniker": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\OHT\\OHTJob.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\OHT\\OHTJob.cs",
              "ToolTip": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\OHT\\OHTJob.cs",
              "RelativeToolTip": "WIDESEAWCS_Tasks\\OHT\\OHTJob.cs",
              "ViewState": "AgIAAA4AAAAAAAAAAAAAwCUAAAAwAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-03-23T11:49:54.445Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 3,
              "Title": "GZJJob.cs",
              "DocumentMoniker": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\GZJ\\GZJJob.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\GZJ\\GZJJob.cs",
              "ToolTip": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\GZJ\\GZJJob.cs",
              "RelativeToolTip": "WIDESEAWCS_Tasks\\GZJ\\GZJJob.cs",
              "ViewState": "AgIAAEIAAAAAAAAAAAAAwFkAAAAmAAAAAAAAAA==",
              "ViewState": "AgIAABACAAAAAAAAAAAAAK8BAAAkAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-03-23T11:49:08.254Z",
              "WhenOpened": "2025-05-16T07:03:59.279Z",
              "IsPinned": true,
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 6,
              "Title": "ITaskService.cs",
              "DocumentMoniker": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_ITaskInfoService\\ITaskService.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_ITaskInfoService\\ITaskService.cs",
              "ToolTip": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_ITaskInfoService\\ITaskService.cs",
              "RelativeToolTip": "WIDESEAWCS_ITaskInfoService\\ITaskService.cs",
              "ViewState": "AgIAAAAAAAAAAAAAAAAAACMAAAAiAAAAAAAAAA==",
              "DocumentIndex": 4,
              "Title": "OHTReadData.cs",
              "DocumentMoniker": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\OHT\\OHTReadData.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\OHT\\OHTReadData.cs",
              "ToolTip": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\OHT\\OHTReadData.cs",
              "RelativeToolTip": "WIDESEAWCS_Tasks\\OHT\\OHTReadData.cs",
              "ViewState": "AgIAAD8AAAAAAAAAAIA4wEcAAAAYAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-03-11T01:46:41.081Z"
              "WhenOpened": "2025-05-26T06:34:01.253Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 1,
              "DocumentIndex": 2,
              "Title": "OHTEnum.cs",
              "DocumentMoniker": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\OHT\\OHTEnum.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\OHT\\OHTEnum.cs",
              "ToolTip": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\OHT\\OHTEnum.cs",
              "RelativeToolTip": "WIDESEAWCS_Tasks\\OHT\\OHTEnum.cs",
              "ViewState": "AgIAANIBAAAAAAAAAAAewOQBAAAWAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-05-26T06:33:59.339Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 5,
              "Title": "TaskService.cs",
              "DocumentMoniker": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_TaskInfoService\\TaskService.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_TaskInfoService\\TaskService.cs",
              "ToolTip": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_TaskInfoService\\TaskService.cs",
              "RelativeToolTip": "WIDESEAWCS_TaskInfoService\\TaskService.cs",
              "ViewState": "AgIAAEcDAAAAAAAAAAAEwGQDAABDAAAAAAAAAA==",
              "ViewState": "AgIAAHUDAAAAAAAAAAAewIcDAAAVAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-03-06T08:14:42.09Z",
              "WhenOpened": "2025-05-19T02:06:47.617Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 3,
              "Title": "OHTJob.cs",
              "DocumentMoniker": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\OHT\\OHTJob.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\OHT\\OHTJob.cs",
              "ToolTip": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\OHT\\OHTJob.cs",
              "RelativeToolTip": "WIDESEAWCS_Tasks\\OHT\\OHTJob.cs",
              "ViewState": "AgIAAMEAAAAAAAAAAAAewKAAAABcAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-05-16T07:49:36.171Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 1,
              "Title": "ZXJJob.cs",
              "DocumentMoniker": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\ZXJ\\ZXJJob.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\ZXJ\\ZXJJob.cs",
              "ToolTip": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\ZXJ\\ZXJJob.cs",
              "RelativeToolTip": "WIDESEAWCS_Tasks\\ZXJ\\ZXJJob.cs",
              "ViewState": "AgIAAPYAAAAAAAAAAAAewAgBAAAYAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-04-03T02:04:31.648Z",
              "EditorCaption": ""
            }
          ]

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskTypeEnum.cs

@@ -28,7 +28,13 @@
        /// è´¨æ£€å…¥åº“
        /// </summary>
        [Description("质检入库")]
        InQuality = 203
        InQuality = 203,
        /// <summary>
        /// å‰”除入库
        /// </summary>
        [Description("剔除入库")]
        TiChuRuKu = 204

    }

    public enum TaskOutboundTypeEnum
@@ -53,6 +59,17 @@
        /// </summary>
        [Description("质检出库")]
        OutQuality = 103,
        /// <summary>
        /// å‰”除出库
        /// </summary>
        [Description("剔除出库")]
        TiChuChuKu = 104,
        /// <summary>
        /// å‰”除直接出库
        /// </summary>
        [Description("剔除直接出库")]
        TiChuZhiJieChuKu = 105,

    }

    public enum TaskRelocationTypeEnum

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/Idt_BatchinfoService.cs

@@ -13,6 +13,6 @@
    {
        WebResponseContent UpdateInBatch(string batch);
        WebResponseContent UpdateOutBatch(string batch);
        WebResponseContent UpdateOutStorageMode(int mode);
        WebResponseContent UpdateOutStorageMode(int isout);
    }
}

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/Idt_ThicknessHtyService.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,14 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using WIDESEAWCS_Core.BaseServices;
using WIDESEAWCS_Model.Models.System;

namespace WIDESEAWCS_ISystemServices
{
    public interface Idt_ThicknessHtyService : IService<dt_Thickness_hty>
    {
    }
}

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/Idt_WeightHtyService.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,16 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using WIDESEAWCS_Core.BaseServices;
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_Model.Models.System;

namespace WIDESEAWCS_ISystemServices
{
    public interface Idt_WeightHtyService : IService<dt_Weight_hty>
    {

    }
}

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs

@@ -35,6 +35,9 @@
{
    public interface ITaskService : IService<Dt_Task>
    {
        WebResponseContent zhijiechuku();
        WebResponseContent tichuchuku(string wei);
        WebResponseContent tichuruku(string wei);
        WebResponseContent banzidong(string wei,string weis);
        WebResponseContent speciaupdate(Dt_Task task);
        WebResponseContent speciadelete(Dt_Task task);

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/System/dt_Thickness_hty.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,83 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using SqlSugar;
using WIDESEAWCS_Core.DB.Models;

namespace WIDESEAWCS_Model.Models.System
{
    /// <summary>
    /// å‡ºåº“厚度历史
    /// </summary>
    [SugarTable(nameof(dt_Thickness_hty), "出库厚度历史")]
    public class dt_Thickness_hty : BaseEntity
    {
        /// <summary>
        /// ä¸»é”®
        /// </summary>
        [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "主键")]
        public int Id { get; set; }

        /// <summary>
        /// é¡¶éƒ¨å·¦è¾¹
        /// </summary>
        [SugarColumn(IsNullable = true, ColumnDescription = "顶部左边")]
        public float topleft { get; set; }

        /// <summary>
        /// é¡¶éƒ¨ä¸­é—´
        /// </summary>
        [SugarColumn(IsNullable = true, ColumnDescription = "顶部中间")]
        public float topmiddle { get; set; }

        /// <summary>
        /// é¡¶éƒ¨å³è¾¹
        /// </summary>
        [SugarColumn(IsNullable = true, ColumnDescription = "顶部右边")]
        public float topright { get; set; }

        /// <summary>
        /// ä¸­é—´å·¦è¾¹
        /// </summary>
        [SugarColumn(IsNullable = true, ColumnDescription = "中间左边")]
        public float centreleft { get; set; }

        /// <summary>
        /// ä¸­é—´ä¸­å¿ƒ
        /// </summary>
        [SugarColumn(IsNullable = true, ColumnDescription = "中间中心")]
        public float centremiddle { get; set; }

        /// <summary>
        /// ä¸­é—´å³è¾¹
        /// </summary>
        [SugarColumn(IsNullable = true, ColumnDescription = "中间右边")]
        public float centreright { get; set; }

        /// <summary>
        /// åº•éƒ¨å·¦è¾¹
        /// </summary>
        [SugarColumn(IsNullable = true, ColumnDescription = "底部左边")]
        public float bottomleft { get; set; }

        /// <summary>
        /// åº•éƒ¨å³è¾¹
        /// </summary>
        [SugarColumn(IsNullable = true, ColumnDescription = "底部右边")]
        public float bottomright { get; set; }

        /// <summary>
        /// åˆæ ¼
        /// </summary>
        [SugarColumn(IsNullable = true, ColumnDescription = "合格")]
        public int qualified { get; set; }

        /// <summary>
        /// åŒºé—´å€¼
        /// </summary>
        [SugarColumn(IsNullable = true, ColumnDescription = "区间值")]
        public string interval { get; set; }
    }
}

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/System/dt_Weight_hty.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,41 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using SqlSugar;
using WIDESEAWCS_Core.DB.Models;

namespace WIDESEAWCS_Model.Models
{
    /// <summary>
    /// å‡ºåº“重量历史
    /// </summary>
    [SugarTable(nameof(dt_Weight_hty), "出库重量历史")]
    public class dt_Weight_hty : BaseEntity
    {
        /// <summary>
        /// ä¸»é”®
        /// </summary>
        [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "主键")]
        public int Id { get; set; }

        /// <summary>
        /// é‡é‡
        /// </summary>
        [SugarColumn(IsNullable = true,  ColumnDescription = "重量")]
        public float weight { get; set; }

        /// <summary>
        /// åˆæ ¼
        /// </summary>
        [SugarColumn(IsNullable = true,  ColumnDescription = "合格")]
        public int qualified { get; set; }

        /// <summary>
        /// åŒºé—´å€¼
        /// </summary>
        [SugarColumn(IsNullable = true, ColumnDescription = "区间值")]
        public string interval { get; set; }
    }
}

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/System/BatchController.cs

@@ -47,9 +47,9 @@
        /// <param name="batch"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("UpdateOutStorageMode")]
        public WebResponseContent UpdateOutStorageMode(int mode)
        public WebResponseContent UpdateOutStorageMode(int isout)
        {
            return Service.UpdateOutStorageMode(mode);
            return Service.UpdateOutStorageMode(isout);
        }
    }
}

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/System/Thickness_HtyController.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,16 @@
using Microsoft.AspNetCore.Mvc;
using WIDESEAWCS_Core.BaseController;
using WIDESEAWCS_ISystemServices;
using WIDESEAWCS_Model.Models.System;

namespace WIDESEAWCS_Server.Controllers.System
{
    [Route("api/Thickness_Hty")]
    [ApiController]
    public class Thickness_HtyController : ApiBaseController<Idt_ThicknessHtyService, dt_Thickness_hty>
    {
        public Thickness_HtyController(Idt_ThicknessHtyService service) : base(service)
        {
        }
    }
}

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/System/Weight_HtyController.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
using Microsoft.AspNetCore.Mvc;
using WIDESEAWCS_Core.BaseController;
using WIDESEAWCS_ISystemServices;
using WIDESEAWCS_ITaskInfoService;
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_Model.Models.System;
using WIDESEAWCS_SystemServices;

namespace WIDESEAWCS_Server.Controllers.System
{
    [Route("api/Weight_Hty")]
    [ApiController]
    public class Weight_HtyController : ApiBaseController<Idt_WeightHtyService, dt_Weight_hty>
    {
        public Weight_HtyController(Idt_WeightHtyService service) : base(service)
        {
        }
    }
}

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs

@@ -72,5 +72,23 @@
        {
            return Service.banzidong(wei,weis);
        }

        [HttpPost, HttpGet, Route("tichuruku")]
        public WebResponseContent tichuruku(string wei)
        {
            return Service.tichuruku(wei);
        }

        [HttpPost, HttpGet, Route("tichuchuku")]
        public WebResponseContent tichuchuku(string wei)
        {
            return Service.tichuchuku(wei);
        }

        [HttpPost, HttpGet, Route("zhijiechuku")]
        public WebResponseContent zhijiechuku()
        {
            return Service.zhijiechuku();
        }
    }
}

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/dt_ThicknessHtyService.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,25 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseRepository;
using WIDESEAWCS_Core.BaseServices;
using WIDESEAWCS_ISystemServices;
using WIDESEAWCS_Model.Models.System;

namespace WIDESEAWCS_SystemServices
{
    public class dt_ThicknessHtyService : ServiceBase<dt_Thickness_hty, IRepository<dt_Thickness_hty>>, Idt_ThicknessHtyService
    {
        public dt_ThicknessHtyService(IRepository<dt_Thickness_hty> BaseDal) : base(BaseDal)
        {
        }

        public override WebResponseContent AddData(dt_Thickness_hty entity)
        {
            return base.AddData(entity);
        }
    }
}

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/dt_WeightHtyService.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using AutoMapper;
using WIDESEAWCS_Core.BaseRepository;
using WIDESEAWCS_Core.BaseServices;
using WIDESEAWCS_ISystemServices;
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_Model.Models.System;

namespace WIDESEAWCS_SystemServices
{
    public class dt_WeightHtyService : ServiceBase<dt_Weight_hty, IRepository<dt_Weight_hty>>, Idt_WeightHtyService
    {
        public dt_WeightHtyService(IRepository<dt_Weight_hty> BaseDal) : base(BaseDal)
        {
        }


    }
}

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/dt_batchinfoService.cs

@@ -80,13 +80,13 @@
        /// </summary>
        /// <param name="batch"></param>
        /// <returns></returns>
        public WebResponseContent UpdateOutStorageMode(int mode)
        public WebResponseContent UpdateOutStorageMode(int isout)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                var batchibfo = BaseDal.QueryFirst(v => v.Id == 1);
                batchibfo.materType = mode;
                batchibfo.materType = isout;
                BaseDal.UpdateData(batchibfo);

                content = WebResponseContent.Instance.OK();

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs

@@ -76,8 +76,8 @@

        //SBText ITaskService.text { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }

        public TaskService(IRepository<Dt_Task> BaseDal, IRouterService routerService, 
            ITaskExecuteDetailService taskExecuteDetailService, 
        public TaskService(IRepository<Dt_Task> BaseDal, IRouterService routerService,
            ITaskExecuteDetailService taskExecuteDetailService,
            IRepository<Dt_TaskExecuteDetail> taskExecuteDetailRepository,
            IRepository<Dt_StockInfo> stockRepository,
            IRepository<Dt_LocationInfo> locationRepository,
@@ -210,7 +210,7 @@
        /// <returns></returns>
        public Dt_Task QueryTaskState()
        {
            return BaseDal.QueryFirst(x => x.TaskState== (int)TaskInStatusEnum.InNew );
            return BaseDal.QueryFirst(x => x.TaskState == (int)TaskInStatusEnum.InNew);
        }

        /// <summary>
@@ -281,11 +281,11 @@
                    //优先返回执行到一半的任务继续执行
                    return task;
                }
                else 
                else
                {
                    //查询天车移动任务
                    task = BaseDal.QueryFirst(v => v.TaskType == (int)TaskMoveEnum.Mowe && v.TaskState == (int)TaskMoveStatusEnum.OutNewMove);
                    if (task!=null)
                    if (task != null)
                    {
                        return task;
                    }
@@ -300,16 +300,16 @@
                //{
                //    if (task.TaskState != (int)TaskMoveStatusEnum.OutNewMove)
                //    {
                       

                //    }
                //}
                if (workTpe.Equals("In"))
                {
                    task = BaseDal.QueryData(v => v.TaskType == (int)TaskInboundTypeEnum.Inbound && v.TaskState == (int)TaskInStatusEnum.InNew).OrderByDescending(v => v.Grade).OrderBy(v => v.CreateDate).First();
                    task = BaseDal.QueryData(v => (v.TaskType == (int)TaskInboundTypeEnum.TiChuRuKu || v.TaskType == (int)TaskInboundTypeEnum.Inbound) && v.TaskState == (int)TaskInStatusEnum.InNew).OrderByDescending(v => v.Grade).OrderBy(v => v.CreateDate).First();
                }
                else if (workTpe.Equals("Out"))
                {
                    task = BaseDal.QueryData(v => (v.TaskType == (int)TaskOutboundTypeEnum.Outbound || v.TaskType == (int)TaskOutboundTypeEnum.OutInventory) && v.TaskState == (int)TaskOutStatusEnum.OutNew).OrderBy(v => v.CreateDate).First();
                    task = BaseDal.QueryData(v => (v.TaskType == (int)TaskOutboundTypeEnum.TiChuChuKu || v.TaskType == (int)TaskOutboundTypeEnum.TiChuZhiJieChuKu || v.TaskType == (int)TaskOutboundTypeEnum.Outbound || v.TaskType == (int)TaskOutboundTypeEnum.OutInventory) && v.TaskState == (int)TaskOutStatusEnum.OutNew).OrderBy(v => v.CreateDate).First();
                }

            }
@@ -321,15 +321,15 @@
            return task;
        }

        public Dt_Task QueryTasking() 
        public Dt_Task QueryTasking()
        {
            Dt_Task task = new Dt_Task();
            task = BaseDal.QueryFirst(v=>v.TaskState!=(int)TaskInStatusEnum.InNew 
            && v.TaskState != (int)TaskMoveStatusEnum.OutNewMove 
            task = BaseDal.QueryFirst(v => v.TaskState != (int)TaskInStatusEnum.InNew
            && v.TaskState != (int)TaskMoveStatusEnum.OutNewMove
            && v.TaskState != (int)TaskOutStatusEnum.OutNew
            && v.TaskState != (int)TaskOutStatusEnum.SC_OutExecuting
            && v.TaskState != (int)TaskInStatusEnum.Line_Ingrab);
            if (task!=null)
            if (task != null)
            {
                return task;
            }
@@ -375,13 +375,13 @@
        /// <returns>返回任务实体对象，可能为null</returns>
        public Dt_Task QueryTakNnmTask(int taskNum)
        {
            return BaseDal.QueryFirst(v=>v.TaskId== taskNum);
            return BaseDal.QueryFirst(v => v.TaskId == taskNum);
        }
        /// <summary>
        /// ä¿®æ”¹å¤©è½¦ä»»åŠ¡çŠ¶æ€ï¼Œå°†å…¥åº“取货执行中修改为入库取货完成
        /// </summary>
        /// <returns></returns>
        public WebResponseContent UpdateTaskStatusToLine_Ingrab(Dt_Task task) 
        public WebResponseContent UpdateTaskStatusToLine_Ingrab(Dt_Task task)
        {
            WebResponseContent content = new WebResponseContent();
            try
@@ -475,23 +475,23 @@
            try
            {
                Dt_Task task = BaseDal.QueryFirst(x => x.TaskId == taskNum);
                if (status == 2 && task.TaskType == (int)TaskInboundTypeEnum.Inbound)
                if (status == 2 && (task.TaskType == (int)TaskInboundTypeEnum.Inbound || task.TaskType == (int)TaskInboundTypeEnum.TiChuRuKu))
                {
                    task.TaskState = (int)TaskInStatusEnum.Line_InGrabExecuting;
                }
                else if (status == 2 && (task.TaskType == (int)TaskOutboundTypeEnum.Outbound || task.TaskType == (int)TaskOutboundTypeEnum.OutInventory))
                else if (status == 2 && (task.TaskType == (int)TaskOutboundTypeEnum.Outbound || task.TaskType == (int)TaskOutboundTypeEnum.OutInventory || task.TaskType == (int)TaskOutboundTypeEnum.TiChuChuKu || task.TaskType == (int)TaskOutboundTypeEnum.TiChuZhiJieChuKu))
                {
                    task.TaskState = (int)TaskOutStatusEnum.Line_OutGrabExecuting;
                }
                else if (status == 3 && task.TaskType == (int)TaskInboundTypeEnum.Inbound)
                else if (status == 3 && (task.TaskType == (int)TaskInboundTypeEnum.Inbound || task.TaskType == (int)TaskInboundTypeEnum.TiChuRuKu))
                {
                    task.TaskState = (int)TaskInStatusEnum.Line_InDownExecuting;
                }
                else if (status == 3 && (task.TaskType == (int)TaskOutboundTypeEnum.Outbound || task.TaskType == (int)TaskOutboundTypeEnum.OutInventory))
                else if (status == 3 && (task.TaskType == (int)TaskOutboundTypeEnum.Outbound || task.TaskType == (int)TaskOutboundTypeEnum.OutInventory || task.TaskType == (int)TaskOutboundTypeEnum.TiChuChuKu || task.TaskType == (int)TaskOutboundTypeEnum.TiChuZhiJieChuKu))
                {
                    task.TaskState = (int)TaskOutStatusEnum.Line_OutWownExecuting;
                }
                else if(status == 4 && task.TaskType == (int)TaskMoveEnum.Mowe)
                else if (status == 4 && task.TaskType == (int)TaskMoveEnum.Mowe)
                {
                    task.TaskState = (int)TaskMoveStatusEnum.Line_OutMove;
                }
@@ -629,18 +629,18 @@
        /// </summary>
        /// <param name="taskNum">任务编号</param>
        /// <returns>返回处理结果</returns>
        public WebResponseContent StackCraneTaskCompleted(int taskNum,float weight)
        public WebResponseContent StackCraneTaskCompleted(int taskNum, float weight)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                var nawtask = BaseDal.QueryFirst(v=>v.TaskId== taskNum);
                var nawtask = BaseDal.QueryFirst(v => v.TaskId == taskNum);
                if (nawtask == null)
                {
                    throw new Exception(string.Format("天车放货完成任务未查询到任务号{0}", taskNum));
                }

                if (nawtask.TaskType == (int)TaskInboundTypeEnum.Inbound)
                if (nawtask.TaskType == (int)TaskInboundTypeEnum.Inbound || nawtask.TaskType == (int)TaskInboundTypeEnum.TiChuRuKu)
                {
                    var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "剔除架");
                    string sourceAddress = station.Row + "-" + station.Column + "-1";
@@ -746,7 +746,7 @@
                        _unitOfWorkManage.CommitTran();
                    }
                }
                else if (nawtask.TaskType == (int)TaskOutboundTypeEnum.Outbound)
                else if (nawtask.TaskType == (int)TaskOutboundTypeEnum.Outbound || nawtask.TaskType == (int)TaskOutboundTypeEnum.TiChuChuKu)
                {
                    var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "西跨架子");
                    string targetAddress = station.Row + "-" + station.Column + "-1";
@@ -776,8 +776,24 @@
                        taskhty.PalletCode = nawtask.PalletCode;
                        taskhty.NextAddress = nawtask.NextAddress;
                        taskhty.CurrentAddress = nawtask.CurrentAddress;
                        //开始数据库事务

                        //如果放货位置行是40，则立马生成一条移动任务
                        //开始创建任务
                        Dt_Task Movstask = new Dt_Task();
                        Movstask.Roadway = "TC01";
                        Movstask.TaskType = (int)TaskMoveEnum.Mowe;
                        Movstask.TaskState = (int)TaskMoveStatusEnum.OutNewMove;
                        Movstask.SourceAddress = "0";
                        Movstask.TargetAddress = "8-5-1";
                        Movstask.NextAddress = "text";
                        Movstask.Grade = 1;
                        Movstask.WMSId = 3;
                        Movstask.Remark = 0;
                        Movstask.PalletCode = "text";
                        Movstask.CurrentAddress = "text";

                        //开始数据库事务
                        BaseDal.AddData(Movstask);
                        _unitOfWorkManage.BeginTran();
                        _stockRepository.DeleteData(stock);
                        _locationRepository.UpdateData(location);
@@ -844,7 +860,7 @@
                        _unitOfWorkManage.CommitTran();
                    }
                }
                else if (nawtask.TaskType == (int)TaskOutboundTypeEnum.OutInventory || nawtask.TaskType == (int)TaskMoveEnum.Mowe)
                else if (nawtask.TaskType == (int)TaskOutboundTypeEnum.OutInventory || nawtask.TaskType == (int)TaskMoveEnum.Mowe || nawtask.TaskType == (int)TaskOutboundTypeEnum.TiChuZhiJieChuKu)
                {
                    //处理任务信息
                    Dt_Task_hty taskhty = new Dt_Task_hty();
@@ -861,7 +877,7 @@
                    taskhty.PalletCode = nawtask.PalletCode;
                    taskhty.NextAddress = nawtask.NextAddress;
                    taskhty.CurrentAddress = nawtask.CurrentAddress;
                    if (nawtask.TaskType == (int)TaskOutboundTypeEnum.OutInventory)
                    if (nawtask.TaskType == (int)TaskOutboundTypeEnum.OutInventory || nawtask.TaskType == (int)TaskOutboundTypeEnum.TiChuZhiJieChuKu)
                    {
                        //开始创建任务
                        Dt_Task Movstask = new Dt_Task();
@@ -901,7 +917,7 @@
                //回滚事务
                _unitOfWorkManage.RollbackTran();
                content = WebResponseContent.Instance.Error($"任务完成异常,任务号:【{taskNum}】");
                UpdateTaskExceptionMessage(taskNum,ex.Message);
                UpdateTaskExceptionMessage(taskNum, ex.Message);
            }
            return content;
        }
@@ -1002,7 +1018,7 @@
            WebResponseContent content = new WebResponseContent();
            Dt_Task nawtask = BaseDal.QueryFirst(v => v.TaskId == taskid);
            //入库
            if (nawtask.TaskType == (int)TaskInboundTypeEnum.Inbound)
            if (nawtask.TaskType == (int)TaskInboundTypeEnum.Inbound || nawtask.TaskType == (int)TaskInboundTypeEnum.TiChuRuKu)
            {
                //剔除入库
                var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "剔除架");
@@ -1108,7 +1124,7 @@
                }
            }
            //出库
            else if (nawtask.TaskType == (int)TaskOutboundTypeEnum.Outbound)
            else if (nawtask.TaskType == (int)TaskOutboundTypeEnum.Outbound || nawtask.TaskType == (int)TaskOutboundTypeEnum.TiChuChuKu)
            {
                //剔除出库
                var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "西跨架子");
@@ -1164,7 +1180,10 @@
                    location.LocationStatus = (int)LocationStatusEnum.Free;
                    //修改货位状态
                    var locationTow = _locationRepository.QueryFirst(v => v.LocationCode == nawtask.NextAddress);
                    locationTow.LocationStatus = (int)LocationStatusEnum.Free;
                    if (locationTow!=null)
                    {
                        locationTow.LocationStatus = (int)LocationStatusEnum.Free;
                    }
                    //准备历史任务数据
                    Dt_Task_hty taskhty = new Dt_Task_hty();
                    taskhty.TaskNum = nawtask.TaskNum;
@@ -1184,9 +1203,12 @@

                    _unitOfWorkManage.BeginTran();
                    _stockRepository.DeleteData(stock);
                    _stockRepository.DeleteData(Towstock);
                    _locationRepository.UpdateData(location);
                    _locationRepository.UpdateData(locationTow);
                    if (locationTow != null)
                    {
                        _locationRepository.UpdateData(locationTow);
                        _stockRepository.DeleteData(Towstock);
                    }
                    _taskhtyRepository.AddData(taskhty);
                    BaseDal.DeleteData(nawtask);
                    //提交事务
@@ -1260,17 +1282,24 @@
                    location.LocationStatus = (int)LocationStatusEnum.InStock;
                    //修改货位信息
                    var locationtow = _locationRepository.QueryFirst(v => v.LocationCode == task.NextAddress);
                    locationtow.LocationStatus = (int)LocationStatusEnum.InStock;

                    Dt_StockInfo stockInfos = _stockRepository.QueryFirst(v => v.LocationCode == task.NextAddress);
                   
                    if (locationtow != null)
                    {
                        locationtow.LocationStatus = (int)LocationStatusEnum.InStock;
                        stockInfos.StockStatus = (int)stockEnum.Free;
                    }
                    Dt_StockInfo stockInfo = _stockRepository.QueryFirst(v => v.LocationCode == task.SourceAddress);
                    stockInfo.StockStatus = (int)stockEnum.Free;
                    Dt_StockInfo stockInfos = _stockRepository.QueryFirst(v => v.LocationCode == task.NextAddress);
                    stockInfos.StockStatus = (int)stockEnum.Free;
                    
                    _unitOfWorkManage.BeginTran();
                    _locationRepository.UpdateData(location);
                    _locationRepository.UpdateData(locationtow);
                    if (locationtow != null)
                    {
                        _locationRepository.UpdateData(locationtow);
                        _stockRepository.UpdateData(stockInfos);
                    }
                    _stockRepository.UpdateData(stockInfo);
                    _stockRepository.UpdateData(stockInfos);
                    BaseDal.DeleteData(task);
                    _unitOfWorkManage.CommitTran();
                    return content.OK("5");
@@ -1309,7 +1338,7 @@
            return content.OK("1");
        }

        public WebResponseContent banzidong(string wei,string weis)
        public WebResponseContent banzidong(string wei, string weis)
        {
            WebResponseContent content = new WebResponseContent();
            //if (!OHTJob.oHTReadData.R_ZXJ_isWork)
@@ -1376,5 +1405,148 @@
            }
            return content.OK("1");
        }

        public WebResponseContent zhijiechuku()
        {
            Dt_Task task = new Dt_Task();
            WebResponseContent content = new WebResponseContent();
            var isout = _outStockRepository.QueryFirst(v => v.Id == 1);
            if (isout.isout == 0)
            {
                var oldtask = _dt_taskRepositiry.QueryFirst(v => v.TaskType == (int)TaskOutboundTypeEnum.Outbound);
                if (oldtask != null)
                {
                    throw new Exception($"当前任务池中已存在一条出库任务");
                }
                var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "西跨架子");
                task.TargetAddress = station.Row + "-" + station.Column + "-1";
                var stations = _dt_stationInfoRepository.QueryFirst(v => v.msg == "剔除架");
                task.SourceAddress = stations.Row + "-" + stations.Column + "-1";
                var oldhtytask = _dt_taskRepositiry.QueryFirst(v => v.SourceAddress == task.SourceAddress);
                if (oldhtytask == null)
                {
                    task.Grade = 3;
                    task.Remark = (int)MateTypeEnum.ZiChan;
                    task.NextAddress = "text";
                    task.Roadway = "TC01";
                    task.TaskType = (int)TaskOutboundTypeEnum.TiChuZhiJieChuKu;
                    task.TaskState = (int)TaskOutStatusEnum.OutNew;
                    task.PalletCode = "text";
                    task.CurrentAddress = "text";
                    task.WMSId = 2;
                    _dt_taskRepositiry.AddData(task);
                    return content.OK("2");
                }
            }
            else
            {
                return content.OK("1");
            }
            return content.OK("3");
        }

        public WebResponseContent tichuchuku(string wei)
        {
            Dt_Task task = new Dt_Task();
            WebResponseContent content = new WebResponseContent();
            //if (!OHTJob.oHTReadData.R_TCMode && !OHTJob.oHTReadData.R_TC_isready)
            //{
            //    throw new Exception($"规整机剔除架子可放板或剔除上料模式信号为false");
            //}
            //查询当前任务池中是否存在出库任务，出库任务只能存在一条
            var isout = _outStockRepository.QueryFirst(v => v.Id == 1);
            if (isout.isout == 0)
            {
                var oldtask = _dt_taskRepositiry.QueryFirst(v => v.TaskType == (int)TaskOutboundTypeEnum.Outbound);
                if (oldtask != null)
                {
                    throw new Exception($"当前任务池中已存在一条出库任务");
                }
                //查询库存
                Dt_LocationInfo huo = _LocationInfoRepository.QueryFirst(v => v.LocationCode == wei);
                if (huo.LocationStatus == 0)
                {
                    return content.OK("4");
                }
                huo.LocationStatus = 1;
                Dt_StockInfo stockinfo = _StockInfoRepository.QueryFirst(v => v.LocationCode == wei);
                if (stockinfo==null)
                {
                    return content.OK("4");
                }
                stockinfo.StockStatus = 1;
                var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "西跨架子");
                task.TargetAddress = station.Row + "-" + station.Column + "-1";
                var oldhtytask = _dt_taskRepositiry.QueryFirst(v => v.SourceAddress == task.SourceAddress);
                if (oldhtytask == null)
                {
                    task.SourceAddress = wei;
                    task.Grade = 3;
                    task.Remark = (int)MateTypeEnum.ZiChan;
                    task.NextAddress = "text";
                    task.Roadway = "TC01";
                    task.TaskType = (int)TaskOutboundTypeEnum.TiChuChuKu;
                    task.TaskState = (int)TaskOutStatusEnum.OutNew;
                    task.PalletCode = "text";
                    task.CurrentAddress = "text";
                    task.WMSId = 2;
                    _unitOfWorkManage.BeginTran();
                    _dt_taskRepositiry.AddData(task);
                    _LocationInfoRepository.UpdateData(huo);
                    _StockInfoRepository.UpdateData(stockinfo);
                    _unitOfWorkManage.CommitTran();
                    return content.OK("2");
                }
            }   
            return content.OK("3");
        }

        public WebResponseContent tichuruku(string wei)
        {
            Dt_Task task = new Dt_Task();
            WebResponseContent content = new WebResponseContent();
            //if (!OHTJob.oHTReadData.R_ZXJ_isWork)
            //{
            //    throw new Exception($"整形机投入使用信号为false");
            //}
            var isout = _outStockRepository.QueryFirst(v => v.Id == 1);
            if (isout.isout == 0)
            {
                //判断库存是否有货
                //查询货位
                Dt_LocationInfo huo = _LocationInfoRepository.QueryFirst(v => v.LocationCode == wei);
                if (huo.LocationStatus!=0)
                {
                    return content.OK("4");
                }
                huo.LocationStatus = 1;
                var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "剔除架");
                task.SourceAddress = station.Row + "-" + station.Column + "-1";
                var oldhtytask = _dt_taskRepositiry.QueryFirst(v => v.SourceAddress == task.SourceAddress);
                if (oldhtytask == null)
                {
                    task.TargetAddress = wei;
                    task.Grade = 3;
                    task.Remark = (int)MateTypeEnum.ZiChan;
                    task.NextAddress = "text";
                    task.Roadway = "TC01";
                    task.TaskType = (int)TaskInboundTypeEnum.TiChuRuKu;
                    task.TaskState = (int)TaskInStatusEnum.InNew;
                    task.PalletCode = "text";
                    task.CurrentAddress = "text";
                    task.WMSId = 2;
                    _unitOfWorkManage.BeginTran();
                    _dt_taskRepositiry.AddData(task);
                    _LocationInfoRepository.UpdateData(huo);
                    _unitOfWorkManage.CommitTran();
                    return content.OK("2");
                }
            }
            else
            {
                return content.OK("1");
            }
            return content.OK("3");
        }
    }
}

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/GZJ/GZJJob.cs

@@ -189,23 +189,16 @@
                    {
                        Dt_Task task = new Dt_Task();
                        var storagemode = _storagemodeRepository.QueryFirst(v => v.Id == 1);
                        if (OHTJob.oHTReadData.R_RGVMode && OHTJob.oHTReadData.R_XK_isready)//RGV上料模式，且东跨架子有上料信号
                        if (OHTJob.oHTReadData.R_RGVMode && OHTJob.oHTReadData.R_DK_isready)//RGV上料模式，且西跨架子有上料信号
                        {
                            
                            var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "西跨架子");
                            var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "东跨架子");
                            task.SourceAddress = station.Row + "-" + station.Column + "-1";
                            var oldhtytask = _dt_taskRepositiry.QueryFirst(v => v.SourceAddress == task.SourceAddress);
                            if (oldhtytask ==null) 
                            if (oldhtytask==null)
                            {
                                task.TargetAddress = _locationInfoService.GetInLocation(storagemode.storagemode).LocationCode;
                                if (OHTJob.oHTReadData.R_DK_isready)
                                {
                                    task.Grade = 2;
                                }
                                else
                                {
                                    task.Grade = 1;
                                }
                                
                                task.Grade = 1;
                                task.Remark = (int)MateTypeEnum.ZiChan;
                                //查找相邻的库位
                                Dt_LocationInfo Towlocation = new Dt_LocationInfo();
@@ -228,16 +221,23 @@
                                _dt_taskRepositiry.AddData(task);
                            }
                        }
                        if (OHTJob.oHTReadData.R_RGVMode && OHTJob.oHTReadData.R_DK_isready)//RGV上料模式，且西跨架子有上料信号
                        if (OHTJob.oHTReadData.R_RGVMode && OHTJob.oHTReadData.R_XK_isready)//RGV上料模式，且东跨架子有上料信号
                        {
                            var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "东跨架子");

                            var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "西跨架子");
                            task.SourceAddress = station.Row + "-" + station.Column + "-1";
                            var oldhtytask = _dt_taskRepositiry.QueryFirst(v => v.SourceAddress == task.SourceAddress);
                            if (oldhtytask==null)
                            if (oldhtytask == null)
                            {
                                task.TargetAddress = _locationInfoService.GetInLocation(storagemode.storagemode).LocationCode;
                                
                                task.Grade = 1;
                                if (OHTJob.oHTReadData.R_DK_isready)
                                {
                                    task.Grade = 2;
                                }
                                else
                                {
                                    task.Grade = 1;
                                }
                                task.Remark = (int)MateTypeEnum.ZiChan;
                                //查找相邻的库位
                                Dt_LocationInfo Towlocation = new Dt_LocationInfo();

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/OHT/OHTEnum.cs

@@ -207,6 +207,16 @@
        W_CheckValue,
        [Description("确认信号")]
        W_ConfirmSignal,

        [Description("行车锁定剔除位")]
        W_ZXJ_LockLocation,
        [Description("行车锁定规整机")]
        W_GZJ_LockGZJ,
        [Description("重量读取成功")]
        R_WeightSuccess,
        [Description("厚度读取成功")]
        R_ThicknessSuccess,
        
        #endregion

    }
@@ -268,6 +278,169 @@
        /// </summary>
        [Description("写脉冲信号")]
        W_ZXJ_HeartBeat,
        /// <summary>
        /// å†™è„‰å†²ä¿¡å·
        /// </summary>
        [Description("厚度记录时间")]
        R_ThicknessRecorder,
        /// <summary>
        /// å†™è„‰å†²ä¿¡å·
        /// </summary>
        [Description("重量记录时间")]
        R_WeightRecorder,
        /// <summary>
        /// å†™è„‰å†²ä¿¡å·
        /// </summary>
        [Description("上板数据记录")]
        R_CommonRecorder,
        /// <summary>
        /// å†™è„‰å†²ä¿¡å·
        /// </summary>
        [Description("剔除数据记录")]
        R_SpecialRecorder,
        /// <summary>
        /// å†™è„‰å†²ä¿¡å·
        /// </summary>
        [Description("极板总重量")]
        R_TotalWeight,


        /// <summary>
        /// è®°å½•ä¸Šå·¦æ•°æ®
        /// </summary>
        [Description("记录上左数据")]
        R_TopLeft,
        /// <summary>
        /// è®°å½•ä¸Šä¸­æ•°æ®
        /// </summary>
        [Description("记录上中数据")]
        R_TopMiddle,
        /// <summary>
        /// è®°å½•ä¸Šå³æ•°æ®
        /// </summary>
        [Description("记录上右数据")]
        R_TopRight,
        /// <summary>
        /// è®°å½•ä¸­å·¦æ•°æ®
        /// </summary>
        [Description("记录中左数据")]
        R_CentreLeft,
        /// <summary>
        /// è®°å½•ä¸­é—´æ•°æ®
        /// </summary>
        [Description("记录中间数据")]
        R_CentreMiddle,
        /// <summary>
        /// è®°å½•ä¸­å³æ•°æ®
        /// </summary>
        [Description("记录中右数据")]
        R_CentreRight,
        /// <summary>
        /// è®°å½•ä¸‹å·¦æ•°æ®
        /// </summary>
        [Description("记录下左数据")]
        R_BottomLeft,
        /// <summary>
        /// è®°å½•ä¸‹å³æ•°æ®
        /// </summary>
        [Description("记录下右数据")]
        R_BottomRight,
        /// <summary>
        /// è®°å½•æ¿é‡æ•°æ®
        /// </summary>
        [Description("记录板重数据")]
        R_Weight,
        /// <summary>
        /// è®°å½•ä¸Šå·¦ä¸Šé™
        /// </summary>
        [Description("记录上左上限")]
        R_TopLeftUp,
        /// <summary>
        /// è®°å½•ä¸Šå·¦ä¸‹é™
        /// </summary>
        [Description("记录上左下限")]
        R_TopLeftBelow,
        /// <summary>
        /// è®°å½•ä¸Šä¸­ä¸Šé™
        /// </summary>
        [Description("记录上中上限")]
        R_TopMiddleUp,
        /// <summary>
        /// è®°å½•ä¸Šä¸­ä¸‹é™
        /// </summary>
        [Description("记录上中下限")]
        R_TopMiddleBelow,
        /// <summary>
        /// è®°å½•ä¸Šå³ä¸Šé™
        /// </summary>
        [Description("记录上右上限")]
        R_TopRightUp,
        /// <summary>
        /// è®°å½•ä¸Šå³ä¸‹é™
        /// </summary>
        [Description("记录上右下限")]
        R_TopRightBelow,
        /// <summary>
        /// è®°å½•ä¸­å·¦ä¸Šé™
        /// </summary>
        [Description("记录中左上限")]
        R_CentreLeftUp,
        /// <summary>
        /// è®°å½•ä¸­å·¦ä¸‹é™
        /// </summary>
        [Description("记录中左下限")]
        R_CentreLeftBelow,
        /// <summary>
        /// è®°å½•ä¸­é—´ä¸Šé™
        /// </summary>
        [Description("记录中间上限")]
        R_CentreMiddleUp,
        /// <summary>
        /// è®°å½•ä¸­é—´ä¸‹é™
        /// </summary>
        [Description("记录中间下限")]
        R_CentreMiddleBelow,
        /// <summary>
        /// è®°å½•ä¸­å³ä¸Šé™
        /// </summary>
        [Description("记录中右上限")]
        R_CentreRightUp,
        /// <summary>
        /// è®°å½•ä¸­å³ä¸‹é™
        /// </summary>
        [Description("记录中右下限")]
        R_CentreRightBelow,
        /// <summary>
        /// è®°å½•ä¸‹å·¦ä¸Šé™
        /// </summary>
        [Description("记录下左上限")]
        R_BottomLeftUp,
        /// <summary>
        /// è®°å½•ä¸‹å·¦ä¸‹é™
        /// </summary>
        [Description("记录下左下限")]
        R_BottomLeftBelow,
        /// <summary>
        /// è®°å½•ä¸‹å³ä¸Šé™
        /// </summary>
        [Description("记录下右上限")]
        R_BottomRightUp,
        /// <summary>
        /// è®°å½•ä¸‹å³ä¸‹é™
        /// </summary>
        [Description("记录下右下限")]
        R_BottomRightBelow,
        /// <summary>
        /// è®°å½•æ¿é‡ä¸Šé™
        /// </summary>
        [Description("记录板重上限")]
        R_WeightUp,
        /// <summary>
        /// è®°å½•æ¿é‡ä¸‹é™
        /// </summary>
        [Description("记录板重下限")]
        R_WeightBelow,

    }

    public enum GZJDBName 
@@ -312,5 +485,8 @@
        /// </summary>
        [Description("剔除架子可取板")]
        R_TC_isready,

        [Description("规整机写脉冲心跳")]
        W_GZJ_HeartBeat
    }
}

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/OHT/OHTJob.cs

@@ -1,10 +1,12 @@
using Autofac.Core;
using HslCommunication;
using HslCommunication.Core;
using HslCommunication.Enthernet;
using HslCommunication.WebSocket;
using Microsoft.Extensions.Hosting;
using Microsoft.VisualBasic.FileIO;
using Newtonsoft.Json;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
using Quartz;
using SixLabors.ImageSharp.PixelFormats;
using System;
@@ -18,6 +20,7 @@
using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Communicator;
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseRepository;
using WIDESEAWCS_Core.Helper;
using WIDESEAWCS_ISystemServices;
using WIDESEAWCS_ITaskInfoService;
@@ -25,6 +28,7 @@
using WIDESEAWCS_QuartzJob;
using WIDESEAWCS_QuartzJob.DeviceBase;
using WIDESEAWCS_QuartzJob.StackerCrane.Enum;
using WIDESEAWCS_TaskInfoService;
using WIDESEAWCS_Tasks.OHT;

namespace WIDESEAWCS_Tasks
@@ -36,12 +40,16 @@
        public static OHTReadData oHTReadData = new OHTReadData();
        private readonly ITaskService _taskService;
        private readonly Idt_ErrormsginfoService _ErrormsginfoService;
        private readonly IRepository<Dt_Task_hty> _taskhtyRepository;
        WebSocketServer _webSocketServer;
        public OHTJob(ITaskService taskService, WebSocketServer webSocketServer, Idt_ErrormsginfoService errormsginfoService)
        OtherDevice devicese;
        OtherDevice deviceses;
        public OHTJob(ITaskService taskService, WebSocketServer webSocketServer, Idt_ErrormsginfoService errormsginfoService, IRepository<Dt_Task_hty> taskhtyRepository)
        {
            _taskService = taskService;//注入
            _webSocketServer = webSocketServer;
            _ErrormsginfoService = errormsginfoService;
            _taskhtyRepository = taskhtyRepository;
        }
        public Task Execute(IJobExecutionContext context)
        {
@@ -51,6 +59,12 @@
            {
                //天车PLC对象
                OtherDevice device = (OtherDevice)value;
                OtherDevice zxj = (OtherDevice)Storage.Devices.Find(v => v.DeviceName == "阳极整形机");
                OtherDevice gzj = (OtherDevice)Storage.Devices.Find(v => v.DeviceName == "阳极规整机");
                devicese = zxj;
                deviceses = gzj;

                
                //整形机PLC对象
                var ZXJdevice = Storage.Devices.Find(v => v.DeviceName == "阳极整形机");
                //规整机PLC对象
@@ -110,6 +124,38 @@
                                device.SetValue(DeviceDBName.W_ConfirmSignal, 3);
                            }
                        }
                        //剔除出库
                        else if (nawtask.TaskType == (int)TaskOutboundTypeEnum.TiChuChuKu)
                        {
                            //修改状态
                            WebResponseContent result = _taskService.UpdateTaskStatusToLine_Outgrab(nawtask);
                            if (result.Status)
                            {
                                //gzj.SetValue(DeviceDBName.W_GZJ_LockGZJ, true);
                                device.SetValue(DeviceDBName.W_ConfirmSignal, 3);
                            }
                        }
                        //剔除入库
                        else if (nawtask.TaskType == (int)TaskInboundTypeEnum.TiChuRuKu)
                        {
                            //修改状态
                            WebResponseContent result = _taskService.UpdateTaskStatusToLine_Ingrab(nawtask);
                            if (result.Status)
                            {
                                device.SetValue(DeviceDBName.W_ConfirmSignal, 3);
                            }
                        }
                        //剔除直接出库
                        else if (nawtask.TaskType == (int)TaskOutboundTypeEnum.TiChuZhiJieChuKu)
                        {
                            //修改状态
                            WebResponseContent result = _taskService.UpdateTaskStatusToLine_Outgrab(nawtask);
                            if (result.Status)
                            {
                                //gzj.SetValue(DeviceDBName.W_GZJ_LockGZJ, true);
                                device.SetValue(DeviceDBName.W_ConfirmSignal, 3);
                            }
                        }
                        return Task.CompletedTask;
                    }
                    else if (oHTReadData.R_RunState == (int)RunStateEnum.PutCompleted && oHTReadData.R_TaskState == (int)TaskStateEnum.TaskComplete)
@@ -120,6 +166,17 @@
                        {
                            device.SetValue(DeviceDBName.W_ConfirmSignal, 3);
                        }

                        var nawtask = _taskService.QueryTakNnmTask(oHTReadData.R_TaskNumber);
                        if (nawtask == null)
                        {
                            throw new Exception(string.Format("天车取货完成任务未查询到任务号{0}", oHTReadData.R_TaskNumber));
                        }
                        //剔除出库与剔除直接出库
                        //if (nawtask.TaskType == (int)TaskOutboundTypeEnum.TiChuChuKu || nawtask.TaskType == (int)TaskOutboundTypeEnum.TiChuZhiJieChuKu)
                        //{
                        //    gzj.SetValue(DeviceDBName.W_GZJ_LockGZJ, false);
                        //}
                        return Task.CompletedTask;
                    }
                    else if (oHTReadData.R_RunState == (int)RunStateEnum.MoveCompleted && oHTReadData.R_TaskState == (int)TaskStateEnum.TaskComplete)
@@ -128,6 +185,15 @@
                        WebResponseContent result = _taskService.StackCraneTaskCompleted(oHTReadData.R_TaskNumber, oHTReadData.weight);
                        if (result.Status)
                        {
                            //剔除出库、直接出库给完成信号
                            //List<Dt_Task_hty> Task_hty = _taskhtyRepository.QueryData();
                            //int shu = Task_hty.Count - 1;
                            //int zhi = Task_hty[shu].TaskId;
                            //Dt_Task_hty lishi = _taskhtyRepository.QueryFirst(x => x.TaskId == zhi);
                            //if (lishi.TargetAddress == "40-2-1")
                            //{
                            //    gzj.SetValue(DeviceDBName.W_GZJ_LockGZJ, false);
                            //}
                            device.SetValue(DeviceDBName.W_ConfirmSignal, 3);
                        }
                        return Task.CompletedTask;
@@ -180,7 +246,7 @@
                    #endregion
                }
                catch (Exception ex)
                {
                { 
                    _ErrormsginfoService.UpdateErrorMsg(ex.Message, 1);
                }
            }
@@ -197,7 +263,7 @@
        public OHTTaskCommand? ConvertToOHTTaskCommand([NotNull] Dt_Task task)
        {
            OHTTaskCommand oHtTaskCommand = new OHTTaskCommand();

            
            if (task.TaskState == (int)TaskInStatusEnum.InNew || task.TaskState == (int)TaskOutStatusEnum.OutNew)
            {
                oHtTaskCommand.W_Task_Type = 2;
@@ -207,7 +273,19 @@
                    oHtTaskCommand.W_Pick_Line = Convert.ToInt16(SourceCodes[0]);
                    oHtTaskCommand.W_Pick_Column = Convert.ToInt16(SourceCodes[1]);
                    oHtTaskCommand.W_Put_Line = 0;
                    oHtTaskCommand.W_Put_Column = 0; 
                    oHtTaskCommand.W_Put_Column = 0;

                    //剔除出库(不需要发送信号)
                    //剔除入库
                    if (task.TaskType == (int)TaskInboundTypeEnum.TiChuRuKu)
                    {
                        devicese.SetValue(DeviceDBName.W_ZXJ_LockLocation, true);
                    }
                    //剔除直接出库
                    else if (task.TaskType == (int)TaskOutboundTypeEnum.TiChuZhiJieChuKu)
                    {
                        devicese.SetValue(DeviceDBName.W_ZXJ_LockLocation, true);
                    }
                }
                else
                {
@@ -227,6 +305,25 @@
                    oHtTaskCommand.W_Pick_Column =0;
                    oHtTaskCommand.W_Put_Line = Convert.ToInt16(SourceCodes[0]);
                    oHtTaskCommand.W_Put_Column = Convert.ToInt16(SourceCodes[1]);

                    //剔除出库
                    //if (task.TaskType == (int)TaskOutboundTypeEnum.TiChuChuKu)
                    //{
                    //    deviceses.SetValue(DeviceDBName.W_GZJ_LockGZJ, true);
                    //}
                    //剔除入库
                    if (task.TaskType == (int)TaskInboundTypeEnum.TiChuRuKu)
                    {

                        devicese.SetValue(DeviceDBName.W_ZXJ_LockLocation, false);
                    }
                    //剔除直接出库
                    else if (task.TaskType == (int)TaskOutboundTypeEnum.TiChuZhiJieChuKu)
                    {

                        //deviceses.SetValue(DeviceDBName.W_GZJ_LockGZJ, true);
                        devicese.SetValue(DeviceDBName.W_ZXJ_LockLocation, false);
                    }
                }
                else
                {

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/OHT/OHTReadData.cs

@@ -145,6 +145,138 @@
        /// è¿›æ–™å°è½¦å®‰å…¨ä½
        /// </summary>
        public bool R_issafe { get; set; }
        /// <summary>
        /// åŽšåº¦è®°å½•æ—¶é—´
        /// </summary>
        public bool R_ThicknessRecorder { get; set; }
        /// <summary>
        /// é‡é‡è®°å½•æ—¶é—´
        /// </summary>
        public bool R_WeightRecorder { get; set; }
        /// <summary>
        /// ä¸Šæ¿æ•°æ®è®°å½•
        /// </summary>
        public int R_CommonRecorder { get; set; }
        /// <summary>
        /// å‰”除数据记录
        /// </summary>
        public int R_SpecialRecorder { get; set; }
        /// <summary>
        /// æžæ¿æ€»é‡é‡
        /// </summary>
        public float R_TotalWeight { get; set; }




        /// <summary>
        /// è®°å½•ä¸Šå·¦æ•°æ®
        /// </summary>
        public float R_TopLeft { get; set; }
        /// <summary>
        /// è®°å½•ä¸Šä¸­æ•°æ®
        /// </summary>
        public float R_TopMiddle { get; set; }
        /// <summary>
        /// è®°å½•ä¸Šå³æ•°æ®
        /// </summary>
        public float R_TopRight { get; set; }
        /// <summary>
        /// è®°å½•ä¸­å·¦æ•°æ®
        /// </summary>
        public float R_CentreLeft { get; set; }
        /// <summary>
        /// è®°å½•ä¸­é—´æ•°æ®
        /// </summary>
        public float R_CentreMiddle { get; set; }
        /// <summary>
        /// è®°å½•ä¸­å³æ•°æ®
        /// </summary>
        public float R_CentreRight { get; set; }
        /// <summary>
        /// è®°å½•ä¸‹å·¦æ•°æ®
        /// </summary>
        public float R_BottomLeft { get; set; }
        /// <summary>
        /// è®°å½•ä¸‹å³æ•°æ®
        /// </summary>
        public float R_BottomRight { get; set; }
        /// <summary>
        /// è®°å½•æ¿é‡æ•°æ®
        /// </summary>
        public float R_Weight { get; set; }
        /// <summary>
        /// è®°å½•ä¸Šå·¦ä¸Šé™
        /// </summary>
        public float R_TopLeftUp { get; set; }
        /// <summary>
        /// è®°å½•ä¸Šå·¦ä¸‹é™
        /// </summary>
        public float R_TopLeftBelow { get; set; }
        /// <summary>
        /// è®°å½•ä¸Šä¸­ä¸Šé™
        /// </summary>
        public float R_TopMiddleUp { get; set; }
        /// <summary>
        /// è®°å½•ä¸Šä¸­ä¸‹é™
        /// </summary>
        public float R_TopMiddleBelow { get; set; }
        /// <summary>
        /// è®°å½•ä¸Šå³ä¸Šé™
        /// </summary>
        public float R_TopRightUp { get; set; }
        /// <summary>
        /// è®°å½•ä¸Šå³ä¸‹é™
        /// </summary>
        public float R_TopRightBelow { get; set; }
        /// <summary>
        /// è®°å½•ä¸­å·¦ä¸Šé™
        /// </summary>
        public float R_CentreLeftUp { get; set; }
        /// <summary>
        /// è®°å½•ä¸­å·¦ä¸‹é™
        /// </summary>
        public float R_CentreLeftBelow { get; set; }
        /// <summary>
        /// è®°å½•ä¸­é—´ä¸Šé™
        /// </summary>
        public float R_CentreMiddleUp { get; set; }
        /// <summary>
        /// è®°å½•ä¸­é—´ä¸‹é™
        /// </summary>
        public float R_CentreMiddleBelow { get; set; }
        /// <summary>
        /// è®°å½•ä¸­å³ä¸Šé™
        /// </summary>
        public float R_CentreRightUp { get; set; }
        /// <summary>
        /// è®°å½•ä¸­å³ä¸‹é™
        /// </summary>
        public float R_CentreRightBelow { get; set; }
        /// <summary>
        /// è®°å½•ä¸‹å·¦ä¸Šé™
        /// </summary>
        public float R_BottomLeftUp { get; set; }
        /// <summary>
        /// è®°å½•ä¸‹å·¦ä¸‹é™
        /// </summary>
        public float R_BottomLeftBelow { get; set; }
        /// <summary>
        /// è®°å½•ä¸‹å³ä¸Šé™
        /// </summary>
        public float R_BottomRightUp { get; set; }
        /// <summary>
        /// è®°å½•ä¸‹å³ä¸‹é™
        /// </summary>
        public float R_BottomRightBelow { get; set; }
        /// <summary>
        /// è®°å½•æ¿é‡ä¸Šé™
        /// </summary>
        public float R_WeightUp { get; set; }
        /// <summary>
        /// è®°å½•æ¿é‡ä¸‹é™
        /// </summary>
        public float R_WeightBelow { get; set; }
        #endregion

    }

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/OHT/OHTTaskCommand.cs

@@ -77,5 +77,25 @@
        /// ç¡®è®¤ä¿¡å·
        /// </summary>
        public short W_ConfirmSignal { get; set; }

        /// <summary>
        /// è¡Œè½¦é”å®šå‰”除位
        /// </summary>
        public bool W_ZXJ_LockLocation { get; set; }

        /// <summary>
        /// è¡Œè½¦é”å®šè§„整机
        /// </summary>
        public bool W_GZJ_LockGZJ { get; set; }

        /// <summary>
        /// é‡é‡è¯»å–成功
        /// </summary>
        public bool R_WeightSuccess { get; set; }

        /// <summary>
        /// åŽšåº¦è¯»å–成功
        /// </summary>
        public bool R_ThicknessSuccess { get; set; }
    }
}

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ZXJ/ZXJJob.cs

@@ -20,6 +20,7 @@
using WIDESEAWCS_ISystemServices;
using WIDESEAWCS_ITaskInfoService;
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_Model.Models.System;
using WIDESEAWCS_QuartzJob;
using WIDESEAWCS_QuartzJob.DeviceBase;
using WIDESEAWCS_QuartzJob.StackerCrane.Enum;
@@ -32,14 +33,19 @@
    {
        public static bool W_ZXJ_Heat = true;
        public static bool W_TC_Heat = true;
        public static bool W_GZJ_Heat = true;
        private readonly ITaskService _taskService;
        private readonly Idt_ThicknessHtyService _IThicknessHtyService;
        private readonly Idt_WeightHtyService _IWeightHtyService;
        WebSocketServer _webSocketServer;
        private readonly Idt_ErrormsginfoService _ErrormsginfoService;
        public ZXJJob(ITaskService taskService, WebSocketServer webSocketServer,Idt_ErrormsginfoService errormsginfoService)
        public ZXJJob(ITaskService taskService, WebSocketServer webSocketServer,Idt_ErrormsginfoService errormsginfoService, Idt_ThicknessHtyService ThicknessHtyService, Idt_WeightHtyService WeightHtyService)
        {
            _taskService = taskService;//注入
            _webSocketServer = webSocketServer;
            _ErrormsginfoService = errormsginfoService;
            _IThicknessHtyService = ThicknessHtyService;
            _IWeightHtyService = WeightHtyService;
        }

        public Task Execute(IJobExecutionContext context)
@@ -72,12 +78,12 @@
                        if (W_TC_Heat)
                        {
                            W_TC_Heat = false;
                            TCevice.SetValue(DeviceDBName.W_HeartBeat, W_ZXJ_Heat);
                            TCevice.SetValue(DeviceDBName.W_HeartBeat, W_TC_Heat);
                        }
                        else
                        {
                            W_TC_Heat = true;
                            TCevice.SetValue(DeviceDBName.W_HeartBeat, W_ZXJ_Heat);
                            TCevice.SetValue(DeviceDBName.W_HeartBeat, W_TC_Heat);
                        }
                    }
                    else
@@ -99,7 +105,134 @@
                        OHTJob.oHTReadData.R_HC_isReady = device.GetValue<ZXJDBName, bool>(ZXJDBName.R_HC_isReady);
                        OHTJob.oHTReadData.R_HC_isReadyWork = device.GetValue<ZXJDBName, bool>(ZXJDBName.R_HC_isReadyWork);
                        OHTJob.oHTReadData.R_issafe = device.GetValue<ZXJDBName, bool>(ZXJDBName.R_issafe);
                        //总数
                        OHTJob.oHTReadData.R_CommonRecorder = device.GetValue<ZXJDBName, Int16>(ZXJDBName.R_CommonRecorder);
                        OHTJob.oHTReadData.R_SpecialRecorder = device.GetValue<ZXJDBName, Int16>(ZXJDBName.R_SpecialRecorder);
                        OHTJob.oHTReadData.R_TotalWeight = device.GetValue<ZXJDBName, float>(ZXJDBName.R_TotalWeight);
                        //重量厚度上、下限值
                        //厚度
                        float tza1 = OHTJob.oHTReadData.R_TopLeftUp = device.GetValue<ZXJDBName, float>(ZXJDBName.R_TopLeftUp);
                        float tza2 = OHTJob.oHTReadData.R_TopLeftBelow = device.GetValue<ZXJDBName, float>(ZXJDBName.R_TopLeftBelow);
                        float tzb1 = OHTJob.oHTReadData.R_TopMiddleUp = device.GetValue<ZXJDBName, float>(ZXJDBName.R_TopMiddleUp);
                        float tzb2 = OHTJob.oHTReadData.R_TopMiddleBelow = device.GetValue<ZXJDBName, float>(ZXJDBName.R_TopMiddleBelow);
                        float tzc1 = OHTJob.oHTReadData.R_TopRightUp = device.GetValue<ZXJDBName, float>(ZXJDBName.R_TopRightUp);
                        float tzc2 = OHTJob.oHTReadData.R_TopRightBelow = device.GetValue<ZXJDBName, float>(ZXJDBName.R_TopRightBelow);
                        float tzd1 = OHTJob.oHTReadData.R_CentreLeftUp = device.GetValue<ZXJDBName, float>(ZXJDBName.R_CentreLeftUp);
                        float tzd2 = OHTJob.oHTReadData.R_CentreLeftBelow = device.GetValue<ZXJDBName, float>(ZXJDBName.R_CentreLeftBelow);
                        float tze1 = OHTJob.oHTReadData.R_CentreMiddleUp = device.GetValue<ZXJDBName, float>(ZXJDBName.R_CentreMiddleUp);
                        float tze2 = OHTJob.oHTReadData.R_CentreMiddleBelow = device.GetValue<ZXJDBName, float>(ZXJDBName.R_CentreMiddleBelow);
                        float tzf1 = OHTJob.oHTReadData.R_CentreRightUp = device.GetValue<ZXJDBName, float>(ZXJDBName.R_CentreRightUp);
                        float tzf2 = OHTJob.oHTReadData.R_CentreRightBelow = device.GetValue<ZXJDBName, float>(ZXJDBName.R_CentreRightBelow);
                        float tzg1 = OHTJob.oHTReadData.R_BottomLeftUp = device.GetValue<ZXJDBName, float>(ZXJDBName.R_BottomLeftUp);
                        float tzg2 = OHTJob.oHTReadData.R_BottomLeftBelow = device.GetValue<ZXJDBName, float>(ZXJDBName.R_BottomLeftBelow);
                        float tzh1 = OHTJob.oHTReadData.R_BottomRightUp = device.GetValue<ZXJDBName, float>(ZXJDBName.R_BottomRightUp);
                        float tzh2 = OHTJob.oHTReadData.R_BottomRightBelow = device.GetValue<ZXJDBName, float>(ZXJDBName.R_BottomRightBelow);
                        //重量
                        float ws1 = OHTJob.oHTReadData.R_WeightUp = device.GetValue<ZXJDBName, float>(ZXJDBName.R_WeightUp);
                        float ws2 = OHTJob.oHTReadData.R_WeightBelow = device.GetValue<ZXJDBName, float>(ZXJDBName.R_WeightBelow);

                        //重量厚度值
                        //厚度
                        float tz1 = OHTJob.oHTReadData.R_TopLeft = device.GetValue<ZXJDBName, float>(ZXJDBName.R_TopLeft);
                        float tz2 = OHTJob.oHTReadData.R_TopMiddle = device.GetValue<ZXJDBName, float>(ZXJDBName.R_TopMiddle);
                        float tz3 = OHTJob.oHTReadData.R_TopRight = device.GetValue<ZXJDBName, float>(ZXJDBName.R_TopRight);
                        float tz4 = OHTJob.oHTReadData.R_CentreLeft = device.GetValue<ZXJDBName, float>(ZXJDBName.R_CentreLeft);
                        float tz5 = OHTJob.oHTReadData.R_CentreMiddle = device.GetValue<ZXJDBName, float>(ZXJDBName.R_CentreMiddle);
                        float tz6 = OHTJob.oHTReadData.R_CentreRight = device.GetValue<ZXJDBName, float>(ZXJDBName.R_CentreRight);
                        float tz7 = OHTJob.oHTReadData.R_BottomLeft = device.GetValue<ZXJDBName, float>(ZXJDBName.R_BottomLeft);
                        float tz8 = OHTJob.oHTReadData.R_BottomRight = device.GetValue<ZXJDBName, float>(ZXJDBName.R_BottomRight);
                        //重量
                        float w = OHTJob.oHTReadData.R_Weight = device.GetValue<ZXJDBName, float>(ZXJDBName.R_Weight);

                        //记录重量厚度
                        bool thickness = OHTJob.oHTReadData.R_ThicknessRecorder = device.GetValue<ZXJDBName, bool>(ZXJDBName.R_ThicknessRecorder);
                        bool weight = OHTJob.oHTReadData.R_WeightRecorder = device.GetValue<ZXJDBName, bool>(ZXJDBName.R_WeightRecorder);
                        #endregion
                        //记录重量与厚度
                        //厚度
                        if (thickness)
                        {
                            dt_Thickness_hty dt_thickness = new dt_Thickness_hty();
                            dt_thickness.topleft = tz1;
                            dt_thickness.topmiddle = tz2;
                            dt_thickness.topright = tz3;
                            dt_thickness.centreleft = tz4;
                            dt_thickness.centremiddle = tz5;
                            dt_thickness.centreright = tz6;
                            dt_thickness.bottomleft = tz7;
                            dt_thickness.bottomright = tz8;
                            //判断合格
                            if (tz1 < tza2 && tz1 > tza1)
                            {
                                dt_thickness.qualified = 1;
                            }else if (tz2 < tzb2 && tz1 > tzb1)
                            {
                                dt_thickness.qualified = 1;
                            }else if (tz3 < tzc2 && tz1 > tzc1)
                            {
                                dt_thickness.qualified = 1;
                            }else if (tz4 < tzd2 && tz1 > tzd1)
                            {
                                dt_thickness.qualified = 1;
                            }else if (tz5 < tze2 && tz1 > tze1)
                            {
                                dt_thickness.qualified = 1;
                            }else if (tz6 < tzf2 && tz1 > tzf1)
                            {
                                dt_thickness.qualified = 1;
                            }else if (tz7 < tzg2 && tz1 > tzg1)
                            {
                                dt_thickness.qualified = 1;
                            }else if (tz8 < tzh2 && tz1 > tzh1)
                            {
                                dt_thickness.qualified = 1;
                            }else
                            {
                                dt_thickness.qualified = 0;
                            }
                            //区间值
                            dt_thickness.interval = tza1 + "-" + tza2+","+ tzb1 + "-" + tzb2 + "," + tzc1 + "-" + tzc2 + "," + tzd1 + "-" + tzd2 + "," + tze1 + "-" + tze2 + "," + tzf1 + "-" + tzf2 + "," + tzg1 + "-" + tzg2 + "," + tzh1 + "-" + tzh2;
                            if(tz1 != 0 && tz2 != 0 && tz3 != 0 && tz4 != 0 && tz5 != 0 && tz6 != 0 && tz7 != 0 && tz8 != 0)
                            {
                                _IThicknessHtyService.AddData(dt_thickness);
                            }
                            device.SetValue(DeviceDBName.R_ThicknessSuccess, true);
                            //防止整形机没收到信号延时
                            Thread.Sleep(400);
                            device.SetValue(DeviceDBName.R_ThicknessSuccess, false);
                            //防止整形机不能即使更改信号导致重复生成记录，延时
                            Thread.Sleep(400);
                        }
                        //重量
                        if (weight)
                        {
                            dt_Weight_hty dt_weight = new dt_Weight_hty();
                            dt_weight.weight = w;
                            //判断合格
                            if (w>ws1&&w<ws2)
                            {
                                dt_weight.qualified = 1;
                            }
                            else
                            {
                                dt_weight.qualified = 0;
                            }
                            //区间值
                            dt_weight.interval = ws1+"-"+ws2;
                            //不得小于150大于350
                            if (w > 150 && w < 350 && w!=0)
                            {
                                _IWeightHtyService.AddData(dt_weight);
                            }
                            device.SetValue(DeviceDBName.R_WeightSuccess, true);
                            bool c = device.GetValue<DeviceDBName, bool>(DeviceDBName.R_WeightSuccess);
                            //防止整形机没收到信号延时
                            Thread.Sleep(400);
                            device.SetValue(DeviceDBName.R_WeightSuccess, false);
                            //防止整形机不能即使更改信号导致重复生成记录，延时
                            Thread.Sleep(400);
                        }

                        if (W_ZXJ_Heat)
                        {
                            W_ZXJ_Heat = false;
@@ -129,6 +262,16 @@
                        OHTJob.oHTReadData.R_XK_isready = GZJevice.GetValue<GZJDBName, bool>(GZJDBName.R_XK_isready);
                        OHTJob.oHTReadData.R_TC_isready = GZJevice.GetValue<GZJDBName, bool>(GZJDBName.R_TC_isready);
                        #endregion
                        if (W_GZJ_Heat)
                        {
                            W_GZJ_Heat = false;
                            GZJevice.SetValue(GZJDBName.W_GZJ_HeartBeat, W_GZJ_Heat);
                        }
                        else
                        {
                            W_GZJ_Heat = true;
                            GZJevice.SetValue(GZJDBName.W_GZJ_HeartBeat, W_GZJ_Heat);
                        }
                    }
                    else
                    {

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_WMSPart/LocationInfoService.cs

@@ -20,12 +20,16 @@
        public IRepository<Dt_LocationInfo> Repository => BaseDal;
        private readonly IRepository<dt_storagemode> _dt_storagemode;
        private readonly IMapper _mapper;
        private readonly IRepository<Dt_StockInfo> _stockInfoRepository;
        private readonly IRepository<dt_batchInfo> _batchInfoRepository;
        //private readonly Idt_ErrormsginfoService _ErrormsginfoService;

        public LocationInfoService(IRepository<Dt_LocationInfo> BaseDal, IRepository<dt_storagemode> storagemode, IMapper mapper) : base(BaseDal)
        public LocationInfoService(IRepository<Dt_LocationInfo> BaseDal, IRepository<dt_storagemode> storagemode, IRepository<Dt_StockInfo> stockInfoRepository, IRepository<dt_batchInfo> batchInfoRepository, IMapper mapper) : base(BaseDal)
        {
            _dt_storagemode = storagemode;
            _mapper = mapper;
            _stockInfoRepository = stockInfoRepository;
            _batchInfoRepository = batchInfoRepository;
        }

        public override PageGridData<Dt_LocationInfo> GetPageData(PageDataOptions options)
@@ -40,6 +44,35 @@
            Dt_LocationInfo locationInfo = BaseDal.QueryFirst(x => x.Id == id);
            locationInfo.LocationStatus = locationStatus;
            locationInfo.EnableStatus = enableStatus;
            //有货生成库存信息
            if (locationStatus == 2)
            {
                //判断是否存在库存信息
                var w = _stockInfoRepository.QueryFirst(x => x.LocationCode == locationInfo.LocationCode);
                if(w == null)
                {
                        Dt_StockInfo stockInfo = new Dt_StockInfo();
                        //查询当前需要出库的批次号，以及出库物料类型
                        var batch = _batchInfoRepository.QueryFirst(v => v.Id == 1);
                        stockInfo.BatchNo = batch.OutBatch;
                        stockInfo.Weight = 4;
                        stockInfo.LocationCode = locationInfo.LocationCode;
                        stockInfo.WarehouseId = 0;
                        stockInfo.StockStatus = 0;
                        stockInfo.Remark = 1;
                        _stockInfoRepository.AddData(stockInfo);
                }
            }
            //无货删除库存信息
            else if(locationStatus == 0)
            {
                //判断是否存在库存信息
                var w = _stockInfoRepository.QueryFirst(x => x.LocationCode == locationInfo.LocationCode);
                if (w != null)
                {
                    _stockInfoRepository.DeleteData(w);
                }
            }
            return UpdateData(locationInfo);
            //return base.UpdateData(saveModel);
        }