32a9985c4a3a326d4c30432374247cca5e172c93..eaefefa5c4cf5ce403ce5f0dcf09a5ad21837e43
2025-07-07 zxx
1
eaefef 对比 | 目录
2025-07-07 zxx
1
3428de 对比 | 目录
2025-07-07 pengmn
1
7f34e1 对比 | 目录
2025-07-07 zxx
1
eba869 对比 | 目录
2025-07-07 zxx
1
214000 对比 | 目录
2025-07-07 pengmn
1
6be121 对比 | 目录
2025-07-07 pengmn
1
4fa85e 对比 | 目录
2025-07-07 zxx
1
6caa7b 对比 | 目录
2025-07-07 zxx
1
3064a9 对比 | 目录
2025-07-07 zxx
1
14418b 对比 | 目录
2025-07-07 pengmn
1
23c3e2 对比 | 目录
14个文件已修改
5个文件已删除
686 ■■■■■ 已修改文件
.vs/HH.WCS.XiaoMi/FileContentIndex/37d7396f-518e-43c3-b0c1-30ccf729eafc.vsidx 补丁 | 查看 | 原始文档 | blame | 历史
.vs/HH.WCS.XiaoMi/FileContentIndex/81c01aa5-5c55-4d77-9c5a-dc6930820a29.vsidx 补丁 | 查看 | 原始文档 | blame | 历史
.vs/HH.WCS.XiaoMi/FileContentIndex/9af7476d-40d3-41e9-b899-299a661be901.vsidx 补丁 | 查看 | 原始文档 | blame | 历史
.vs/HH.WCS.XiaoMi/FileContentIndex/c5c9718c-4f52-48de-9047-30704395312a.vsidx 补丁 | 查看 | 原始文档 | blame | 历史
.vs/HH.WCS.XiaoMi/FileContentIndex/c9c95b20-3edf-4c0d-ab79-3caa54d0597e.vsidx 补丁 | 查看 | 原始文档 | blame | 历史
.vs/HH.WCS.XiaoMi/v17/DocumentLayout.backup.json 72 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.vs/HH.WCS.XiaoMi/v17/DocumentLayout.json 72 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/HH.WCS.XiaoMi.csproj 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/api/AgvController.cs 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/api/ApiModel.cs 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/api/WmsController.cs 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/dispatch/GZRobot.cs 97 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/dispatch/RcsHelper.cs 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/models/WCSTask.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/models/bigMaterial.cs 29 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/models/smallMaterial.cs 71 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/process/TaskProcess.cs 234 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/wms/LocationHelper.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/wms/WCSHelper.cs 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.vs/HH.WCS.XiaoMi/FileContentIndex/37d7396f-518e-43c3-b0c1-30ccf729eafc.vsidx
Binary files differ
.vs/HH.WCS.XiaoMi/FileContentIndex/81c01aa5-5c55-4d77-9c5a-dc6930820a29.vsidx
Binary files differ
.vs/HH.WCS.XiaoMi/FileContentIndex/9af7476d-40d3-41e9-b899-299a661be901.vsidx
Binary files differ
.vs/HH.WCS.XiaoMi/FileContentIndex/c5c9718c-4f52-48de-9047-30704395312a.vsidx
Binary files differ
.vs/HH.WCS.XiaoMi/FileContentIndex/c9c95b20-3edf-4c0d-ab79-3caa54d0597e.vsidx
Binary files differ
.vs/HH.WCS.XiaoMi/v17/DocumentLayout.backup.json
@@ -11,16 +11,16 @@
      "RelativeMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\HH.WCS.XiaoMi.csproj|solutionrelative:hh.wcs.mobox3\\hh.wcs.mobox3.xiaomi\\api\\agvcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\HH.WCS.XiaoMi.csproj|d:\\\u6C49\u548C\u667A\u80FD\\git-mobox3\\\u5C0F\u7C73\u7535\u9A71\\hh.wcs.mobox3\\hh.wcs.mobox3.xiaomi\\api\\apimodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\HH.WCS.XiaoMi.csproj|solutionrelative:hh.wcs.mobox3\\hh.wcs.mobox3.xiaomi\\api\\apimodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\HH.WCS.XiaoMi.csproj|D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\hh.wcs.mobox3\\hh.wcs.mobox3.xiaomi\\process\\deviceprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\HH.WCS.XiaoMi.csproj|solutionrelative:hh.wcs.mobox3\\hh.wcs.mobox3.xiaomi\\process\\deviceprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\HH.WCS.XiaoMi.csproj|d:\\\u6C49\u548C\u667A\u80FD\\git-mobox3\\\u5C0F\u7C73\u7535\u9A71\\hh.wcs.mobox3\\hh.wcs.mobox3.xiaomi\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\HH.WCS.XiaoMi.csproj|D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\hh.wcs.mobox3\\hh.wcs.mobox3.xiaomi\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\HH.WCS.XiaoMi.csproj|solutionrelative:hh.wcs.mobox3\\hh.wcs.mobox3.xiaomi\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\HH.WCS.XiaoMi.csproj|D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\hh.wcs.mobox3\\hh.wcs.mobox3.xiaomi\\wms\\wcshelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\HH.WCS.XiaoMi.csproj|solutionrelative:hh.wcs.mobox3\\hh.wcs.mobox3.xiaomi\\wms\\wcshelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\HH.WCS.XiaoMi.csproj|D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\hh.wcs.mobox3\\hh.wcs.mobox3.xiaomi\\models\\wcstask.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
@@ -54,19 +54,19 @@
      "DocumentGroups": [
        {
          "DockedWidth": 200,
          "SelectedChildIndex": 0,
          "SelectedChildIndex": 3,
          "Children": [
            {
              "$type": "Document",
              "DocumentIndex": 0,
              "Title": "GZRobot.cs",
              "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\dispatch\\GZRobot.cs",
              "RelativeDocumentMoniker": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\dispatch\\GZRobot.cs",
              "ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\dispatch\\GZRobot.cs",
              "RelativeToolTip": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\dispatch\\GZRobot.cs",
              "ViewState": "AgIAANwAAAAAAAAAAAAAAOEAAAARAAAAAAAAAA==",
              "DocumentIndex": 2,
              "Title": "ApiModel.cs",
              "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\api\\ApiModel.cs",
              "RelativeDocumentMoniker": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\api\\ApiModel.cs",
              "ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\api\\ApiModel.cs",
              "RelativeToolTip": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\api\\ApiModel.cs",
              "ViewState": "AgIAAD8BAAAAAAAAAAA2wEYBAAAdAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-07-04T08:49:12.48Z",
              "WhenOpened": "2025-07-07T08:58:20.955Z",
              "EditorCaption": ""
            },
            {
@@ -79,20 +79,20 @@
            },
            {
              "$type": "Document",
              "DocumentIndex": 3,
              "Title": "Program.cs",
              "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\Program.cs",
              "RelativeDocumentMoniker": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\Program.cs",
              "ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\Program.cs",
              "RelativeToolTip": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\Program.cs",
              "ViewState": "AgIAACsAAAAAAAAAAAAIwDAAAAAAAAAAAAAAAA==",
              "DocumentIndex": 0,
              "Title": "GZRobot.cs",
              "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\dispatch\\GZRobot.cs",
              "RelativeDocumentMoniker": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\dispatch\\GZRobot.cs",
              "ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\dispatch\\GZRobot.cs",
              "RelativeToolTip": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\dispatch\\GZRobot.cs",
              "ViewState": "AgIAAM8AAAAAAAAAAAAuwBUBAAAAAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-07-04T03:18:06.023Z",
              "WhenOpened": "2025-07-04T08:49:12.48Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 2,
              "DocumentIndex": 3,
              "Title": "DeviceProcess.cs",
              "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\process\\DeviceProcess.cs",
              "RelativeDocumentMoniker": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\process\\DeviceProcess.cs",
@@ -123,7 +123,7 @@
              "RelativeDocumentMoniker": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\api\\AgvController.cs",
              "ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\api\\AgvController.cs",
              "RelativeToolTip": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\api\\AgvController.cs",
              "ViewState": "AgIAADEAAAAAAAAAAAAQwEYAAAAhAAAAAAAAAA==",
              "ViewState": "AgIAAEkAAAAAAAAAAAAgwFQAAAAnAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-07-04T00:47:08.402Z",
              "EditorCaption": ""
@@ -154,6 +154,18 @@
            },
            {
              "$type": "Document",
              "DocumentIndex": 4,
              "Title": "Program.cs",
              "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\Program.cs",
              "RelativeDocumentMoniker": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\Program.cs",
              "ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\Program.cs",
              "RelativeToolTip": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\Program.cs",
              "ViewState": "AgIAACsAAAAAAAAAAAAIwDAAAAAAAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-07-04T03:18:06.023Z"
            },
            {
              "$type": "Document",
              "DocumentIndex": 8,
              "Title": "LocCntrRel.cs",
              "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\models\\LocCntrRel.cs",
@@ -163,18 +175,6 @@
              "ViewState": "AgIAABAAAAAAAAAAAAAxwBsAAAAwAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-06-30T08:29:09.066Z"
            },
            {
              "$type": "Document",
              "DocumentIndex": 4,
              "Title": "WCSHelper.cs",
              "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\wms\\WCSHelper.cs",
              "RelativeDocumentMoniker": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\wms\\WCSHelper.cs",
              "ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\wms\\WCSHelper.cs",
              "RelativeToolTip": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\wms\\WCSHelper.cs",
              "ViewState": "AgIAACsAAAAAAAAAAAAuwDgAAABCAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-07-01T02:01:38.699Z"
            },
            {
              "$type": "Document",
.vs/HH.WCS.XiaoMi/v17/DocumentLayout.json
@@ -11,16 +11,16 @@
      "RelativeMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\HH.WCS.XiaoMi.csproj|solutionrelative:hh.wcs.mobox3\\hh.wcs.mobox3.xiaomi\\api\\agvcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\HH.WCS.XiaoMi.csproj|d:\\\u6C49\u548C\u667A\u80FD\\git-mobox3\\\u5C0F\u7C73\u7535\u9A71\\hh.wcs.mobox3\\hh.wcs.mobox3.xiaomi\\api\\apimodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\HH.WCS.XiaoMi.csproj|solutionrelative:hh.wcs.mobox3\\hh.wcs.mobox3.xiaomi\\api\\apimodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\HH.WCS.XiaoMi.csproj|D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\hh.wcs.mobox3\\hh.wcs.mobox3.xiaomi\\process\\deviceprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\HH.WCS.XiaoMi.csproj|solutionrelative:hh.wcs.mobox3\\hh.wcs.mobox3.xiaomi\\process\\deviceprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\HH.WCS.XiaoMi.csproj|d:\\\u6C49\u548C\u667A\u80FD\\git-mobox3\\\u5C0F\u7C73\u7535\u9A71\\hh.wcs.mobox3\\hh.wcs.mobox3.xiaomi\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\HH.WCS.XiaoMi.csproj|D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\hh.wcs.mobox3\\hh.wcs.mobox3.xiaomi\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\HH.WCS.XiaoMi.csproj|solutionrelative:hh.wcs.mobox3\\hh.wcs.mobox3.xiaomi\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\HH.WCS.XiaoMi.csproj|D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\hh.wcs.mobox3\\hh.wcs.mobox3.xiaomi\\wms\\wcshelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\HH.WCS.XiaoMi.csproj|solutionrelative:hh.wcs.mobox3\\hh.wcs.mobox3.xiaomi\\wms\\wcshelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\HH.WCS.XiaoMi.csproj|D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\hh.wcs.mobox3\\hh.wcs.mobox3.xiaomi\\models\\wcstask.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
@@ -54,19 +54,19 @@
      "DocumentGroups": [
        {
          "DockedWidth": 200,
          "SelectedChildIndex": 0,
          "SelectedChildIndex": 3,
          "Children": [
            {
              "$type": "Document",
              "DocumentIndex": 0,
              "Title": "GZRobot.cs",
              "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\dispatch\\GZRobot.cs",
              "RelativeDocumentMoniker": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\dispatch\\GZRobot.cs",
              "ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\dispatch\\GZRobot.cs",
              "RelativeToolTip": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\dispatch\\GZRobot.cs",
              "ViewState": "AgIAANwAAAAAAAAAAAAAAOEAAAARAAAAAAAAAA==",
              "DocumentIndex": 2,
              "Title": "ApiModel.cs",
              "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\api\\ApiModel.cs",
              "RelativeDocumentMoniker": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\api\\ApiModel.cs",
              "ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\api\\ApiModel.cs",
              "RelativeToolTip": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\api\\ApiModel.cs",
              "ViewState": "AgIAAD8BAAAAAAAAAAA2wEYBAAAdAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-07-04T08:49:12.48Z",
              "WhenOpened": "2025-07-07T08:58:20.955Z",
              "EditorCaption": ""
            },
            {
@@ -79,20 +79,20 @@
            },
            {
              "$type": "Document",
              "DocumentIndex": 3,
              "Title": "Program.cs",
              "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\Program.cs",
              "RelativeDocumentMoniker": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\Program.cs",
              "ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\Program.cs",
              "RelativeToolTip": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\Program.cs",
              "ViewState": "AgIAACsAAAAAAAAAAAAIwDAAAAAAAAAAAAAAAA==",
              "DocumentIndex": 0,
              "Title": "GZRobot.cs",
              "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\dispatch\\GZRobot.cs",
              "RelativeDocumentMoniker": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\dispatch\\GZRobot.cs",
              "ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\dispatch\\GZRobot.cs \u2B24",
              "RelativeToolTip": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\dispatch\\GZRobot.cs \u2B24",
              "ViewState": "AgIAABQBAAAAAAAAAAAAwBsBAAAJAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-07-04T03:18:06.023Z",
              "WhenOpened": "2025-07-04T08:49:12.48Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 2,
              "DocumentIndex": 3,
              "Title": "DeviceProcess.cs",
              "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\process\\DeviceProcess.cs",
              "RelativeDocumentMoniker": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\process\\DeviceProcess.cs",
@@ -123,7 +123,7 @@
              "RelativeDocumentMoniker": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\api\\AgvController.cs",
              "ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\api\\AgvController.cs",
              "RelativeToolTip": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\api\\AgvController.cs",
              "ViewState": "AgIAADEAAAAAAAAAAAAQwEYAAAAhAAAAAAAAAA==",
              "ViewState": "AgIAAEkAAAAAAAAAAAAgwFQAAAAiAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-07-04T00:47:08.402Z",
              "EditorCaption": ""
@@ -154,6 +154,18 @@
            },
            {
              "$type": "Document",
              "DocumentIndex": 4,
              "Title": "Program.cs",
              "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\Program.cs",
              "RelativeDocumentMoniker": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\Program.cs",
              "ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\Program.cs",
              "RelativeToolTip": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\Program.cs",
              "ViewState": "AgIAACsAAAAAAAAAAAAIwDAAAAAAAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-07-04T03:18:06.023Z"
            },
            {
              "$type": "Document",
              "DocumentIndex": 8,
              "Title": "LocCntrRel.cs",
              "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\models\\LocCntrRel.cs",
@@ -163,18 +175,6 @@
              "ViewState": "AgIAABAAAAAAAAAAAAAxwBsAAAAwAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-06-30T08:29:09.066Z"
            },
            {
              "$type": "Document",
              "DocumentIndex": 4,
              "Title": "WCSHelper.cs",
              "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\wms\\WCSHelper.cs",
              "RelativeDocumentMoniker": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\wms\\WCSHelper.cs",
              "ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\wms\\WCSHelper.cs",
              "RelativeToolTip": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\wms\\WCSHelper.cs",
              "ViewState": "AgIAACsAAAAAAAAAAAAuwDgAAABCAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-07-01T02:01:38.699Z"
            },
            {
              "$type": "Document",
HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/HH.WCS.XiaoMi.csproj
@@ -220,8 +220,8 @@
    <Compile Include="dispatch\RcsHelper.cs" />
    <Compile Include="dispatch\XMWcsHelper.cs" />
    <Compile Include="models\LocFrameRel.cs" />
    <Compile Include="models\smallMaterial.cs" />
    <Compile Include="models\bigMaterial.cs" />
    <Compile Include="models\smallMaterial.cs" />
    <Compile Include="models\AutoRepairEmptyTray.cs" />
    <Compile Include="models\TN_ISUSING.cs" />
    <Compile Include="models\BaseModel.cs" />
HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/api/AgvController.cs
@@ -68,20 +68,25 @@
        public GzResult applyReroute(orderReroute model)
        {
            LogHelper.Info("applyReroute 参数:" + JsonConvert.SerializeObject(model), "API");
            return GZRobot.applyReroute(model);
            var apply =  GZRobot.applyReroute(model);
            LogHelper.Info("applyReroute 返回参数:" + JsonConvert.SerializeObject(apply), "API");
            return apply;
        }
        ///// <summary>
        ///// 交管申请
        ///// </summary>
        ///// <param name="model"></param>
        ///// <returns></returns>
        //[HttpPost]
        //public GzResult agvTraffic(orderTraffic model)
        //{
        //    LogHelper.Info("agvTraffic 参数:" + JsonConvert.SerializeObject(model), "API");
        //    return GZRobot.agvTraffic(model);
        //}
        /// <summary>
        /// 交管申请
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        public GzResult agvTraffic(orderTraffic model)
        {
            LogHelper.Info("agvTraffic 参数:" + JsonConvert.SerializeObject(model), "API");
            var traffic = GZRobot.agvTraffic(model);
            LogHelper.Info("agvTraffic 返回参数:" + JsonConvert.SerializeObject(traffic), "API");
            return traffic;
        }
    }
}
HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/api/ApiModel.cs
@@ -310,6 +310,9 @@
        /// 额外信息2
        /// </summary>
        public string extraInfo2 { get; set; }
        //
        public string StatusChangeTime { get; set; }
    }
    public class orderReroute
@@ -342,31 +345,41 @@
    ////反馈小米
    //public class XiaoMiOrderStatusReport
    //{
    //    public string StatusChangeTime { get; set; }
    //    public int orderID { get; set; }
    //    public int orderName { get; set; }
    //    public string orderStatus { get; set; }
    //    public int errorCode { get; set; }
    //    public string extraInfo1 { get; set; }
    //    public string agvIDList { get; set; }
    //    public int priority { get; set; }
    //    public string currentDes { get; set; }
    //    public string currentCmd { get; set; }
    //    public int errorCode { get; set; }
    //    public string extraInfo1 { get; set; }
    //    //public statusParameter extraInfo1 { get; set; }
    //    public string extraInfo2 { get; set; }
    //    public string deadLine { get; set; }
    //    public string agvIDList { get; set; }
    //    public string currentCmd { get; set; }
    //    public string createdTime { get; set; }
    //    public string createdUser { get; set; }
    //    public string orderName { get; set; }
    //    public string StatusChangeTime { get; set; }
    //}
    //public class statusParameter
    //{
    //    public string wcstaskCode { get; set; }
    //    public string rcstaskCode { get; set; }
    //    public string sku { get; set; }
    //    public string boxType{ get; set; }
    //    public string num { get; set; }
    //}
    /// <summary>
    /// 返回给GZ
    /// </summary>
    public class GzResult
        /// <summary>
        /// 返回给GZ
        /// </summary>
        public class GzResult
    {
        public int resultCode { get; set; }
        public bool success { get; set; }
HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/api/WmsController.cs
@@ -33,14 +33,14 @@
        }
        [HttpPost]
        public TaskResponse smallMaterial(smallMaterial model)
        {
            LogHelper.Info("smallMaterial 参数:" + JsonConvert.SerializeObject(model), "WMSAPI");
            var res = TaskProcess.smallMaterial(model);
            LogHelper.Info("smallMaterial 返回:" + JsonConvert.SerializeObject(res), "WMSAPI");
            return res;
        }
        //[HttpPost]
        //public TaskResponse smallMaterial(smallMaterial model)
        //{
        //    LogHelper.Info("smallMaterial 参数:" + JsonConvert.SerializeObject(model), "WMSAPI");
        //    var res = TaskProcess.smallMaterial(model);
        //    LogHelper.Info("smallMaterial 返回:" + JsonConvert.SerializeObject(res), "WMSAPI");
        //    return res;
        //}
    }
}
HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/dispatch/GZRobot.cs
@@ -195,7 +195,8 @@
                agv.ForkliftNo = model.agvIDList;
                WCSCore.OperateAgvTaskStatus(agv);
                ////小米状态上报
                //xiaoMiRequestApi(model);
            }
@@ -228,7 +229,8 @@
                {
                    //1表示是否申请绕路
                    var endLoc = LocationHelper.GetLoc(wcsTask.S_END_LOC);
                    if (endLoc.N_CURRENT_NUM == 0 && endLoc.S_LOCK_STATE == "无")
                    LogHelper.Info($"applyReroute 申请是否绕路货位参数{JsonConvert.SerializeObject(endLoc)}");
                    if (endLoc.N_CURRENT_NUM == 0&& endLoc.S_LOCK_STATE=="入库锁")
                    {
                        result.resultCode = 0;
                        result.success = true;
@@ -274,42 +276,65 @@
            
        }
        /// <summary>
        /// 交管申请
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        public static GzResult agvTraffic(orderTraffic model)
        {
            GzResult result = new GzResult();
            try
            {
                result.resultCode = 0;
                result.msg = "success";
                return result;
            }
            catch (Exception ex)
            {
                result.resultCode = 1;
                result.success = false;
                result.msg = $"交管申请出现错误{JsonConvert.SerializeObject(ex.Message)}";
                return result;
            }
        ///// <summary>
        ///// 调用小米状态回报接口
        ///// </summary>
        ///// <param name="id"></param>
        ///// <returns></returns>
        //public static int xiaoMiRequestApi(orderStatusReportParme model)
        //{
        //    var msg = "";
        //    var orderId = 0;
        //    var request = JsonConvert.SerializeObject(model);
        //    var response = apiHelper.Post(baseUrl + "api/om/order/", request);
        //    msg = $"[xiaoMiRequestApi] request={request} response={response}";
        //    Console.WriteLine(msg);
        //    if (response != ""&& model.orderStatus == "6")
        //    {
        //        try
        //        {
        //            var dataResult = JsonConvert.DeserializeObject<gzResult<OrderInfoResult>>(response);
        //            if (dataResult.code == 0)
        //            {
        //                orderId = dataResult.data[0].in_order_id;
        //            }
        //        }
        //        catch (Exception ex)
        //        {
        //        }
        //    }
        //    else
        //    {
        //        msg = "[xiaoMiRequestApi]状态汇报失败";
        //        Console.WriteLine(msg);
        //    }
        }
        //    return orderId;
        //}
        /// <summary>
        /// 调用小米状态回报接口
        /// </summary>
        /// <param name="id"></param>
        /// <returns></returns>
        public static int xiaoMiRequestApi(orderStatusReportParme model)
        {
            var msg = "";
            var orderId = 0;
            var request = JsonConvert.SerializeObject(model);
            var response = apiHelper.Post(baseUrl + "api/om/order/", request);
            msg = $"[xiaoMiRequestApi] request={request} response={response}";
            Console.WriteLine(msg);
            if (response != "" && model.orderStatus == "6")
            {
                try
                {
                    var dataResult = JsonConvert.DeserializeObject<gzResult<OrderInfoResult>>(response);
                    if (dataResult.code == 0)
                    {
                        orderId = dataResult.data[0].in_order_id;
                    }
                }
                catch (Exception ex)
                {
                }
            }
            else
            {
                msg = "[xiaoMiRequestApi]状态汇报失败";
                Console.WriteLine(msg);
            }
            return orderId;
        }
    }
HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/dispatch/RcsHelper.cs
@@ -35,7 +35,16 @@
                    var dataResult = JsonConvert.DeserializeObject<RcsResult>(response);
                    if (dataResult.code == 0)
                    {
                        result = true;
                        var db = new SqlHelper<WCSTask>().GetInstance();
                        //存订单号
                        var task = db.Queryable<WCSTask>().Where(a => a.S_CODE == model.ts_name).First();
                        task.S_WORKSHOP_NO = dataResult.data.in_order_id;
                        var res = db.Updateable(task).UpdateColumns(it => it.S_WORKSHOP_NO).ExecuteCommand() > 0;
                        if (res)
                        {
                            result = true;
                        }
                    }
                }
                catch (Exception ex)
HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/models/WCSTask.cs
@@ -53,7 +53,7 @@
        public string S_OP_NAME { get; set; }
        //存小米任务号
        //存小米返回订单号
        public string S_WORKSHOP_NO { get; set; }
        public string S_WORKSHOP_NAME { get; set; }
        //public int N_START_LAYER { get; internal set; }
HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/models/bigMaterial.cs
@@ -1,45 +1,32 @@
using HH.WCS.XiaoMi.models;
using SqlSugar;
using System;
using System.Collections.Generic;
namespace HH.WCS.XiaoMi
{
    public class smallMaterial : BaseModel
    public class bigMaterial : BaseModel
    {
        //订单TS名字
        public string ts_name { get; set; }
        public string createdNamne { get; set; }
        public string routeType { get; set; }
        //订单优先级
        public string priority { get; set; }
        //任务类型 自动,人工
        public string taskType { get; set; }
        //料架编码
        public string rackCode { get; set; }
        //TS订单参数
        public List<Parameters> parameters { get; set; }
        public parameters parameters { get; set; }
        public string taskID { get; set; }
        //任务明细号
        public string order_name { get; set; }
        //订单创建时间(传时间戳)
        public DateTime dead_line { get; set; }
        
    }
    public class Parameters
    public class parameters
    {
        //立库起点、大件起点
        public string src { get; set; }
        //料架仓位明细
        public string trayCode { get; set; }
        //流利料架位置
        public string src_area { get; set; }
        public string dst { get; set; }
        //零件类
        public string dst_area { get; set; }
        public string sku { get; set; }
        //任务号
        public string BatchNo { get; set; }
        public string issueMode { get; set; }
        public int num { get; set; }
HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/models/smallMaterial.cs
@@ -1,34 +1,67 @@
using HH.WCS.XiaoMi.models;
using SqlSugar;
using System;
using System.Collections.Generic;
namespace HH.WCS.XiaoMi
{
    public class bigMaterial : BaseModel
    public class smallMaterial : BaseModel
    {
        //料架编号
        public string rackNumber { get; set; }
        //配送路径
        public string shippingRoute { get; set; }
        //料架编号
        public List<smallTaskList> taskList { get; set; }
        
        public string ts_name { get; set; }
        public string createdNamne { get; set; }
        public parameters parameters { get; set; }
        public string taskID { get; set; }
        public string order_name { get; set; }
        public DateTime dead_line { get; set; }
        
    }
    public class parameters
    public class smallTaskList
    {
        public string src { get; set; }
        public string src_area { get; set; }
        public string dst { get; set; }
        public string dst_area { get; set; }
        public string sku { get; set; }
        public string BatchNo { get; set; }
        public string issueMode { get; set; }
        public int num { get; set; }
        //任务明细号
        public string taskName { get; set; }
        //订单优先级
        public string priority { get; set; }
        //截止时间
        public DateTime dead_line { get; set; }
        //脚本名称
        public string ts_name { get; set; }
        //创建者名称
        public string createdName { get; set; }
        //任务编号
        public string taskID { get; set; }
        //料架库位
        public string rackPosition { get; set; }
        //TS订单参数
        public List<Parameters> parameters { get; set; }
        //public string routeType { get; set; }
        ////任务类型 自动,人工
        //public string taskType { get; set; }
        ////料架编码
        //public string rackCode { get; set; }
        ////任务明细号
        //public string order_name { get; set; }
    }
    public class Parameters
    {
        //任务号
        public string BatchNo { get; set; }
        //起点
        public string src { get; set; }
        //起点缓存区
        public string src_area { get; set; }
        //终点
        public string dst { get; set; }
        //终点缓存区
        public string dst_area { get; set; }
        //零件类
        public string sku { get; set; }
        //起点缓存区发料方式
        public string issueMode { get; set; }
        //数量
        public int num { get; set; }
    }
}
HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/process/TaskProcess.cs
@@ -140,6 +140,12 @@
            if (state == 7)
            {
                CacheBitCancelUpdate(mst);
                ////小米订单取消
                //CancelModel cancelModel = new CancelModel();
                //cancelModel.order_id = mst.S_WORKSHOP_NO;
                //cancelModel.order_command_type_id = "2";
                //RcsHelper.CancelOrder(cancelModel);
            }
        }
        
@@ -385,7 +391,7 @@
                {
                    string src = $"\"src\":\"{mst.S_START_LOC}\",";
                    string dst = $"\"dst\":\"{mst.S_END_LOC}\",";
                    string carrier_type_id = $"\"carrier_type_id\":\"-99\"";
                    string carrier_type_id = $"\"carrier_type_id\":\"1\"";
                    string parmeS = "{";
                    string parmeD = "}";
                    string parme = parmeS + src + dst + carrier_type_id + parmeD;
@@ -461,6 +467,7 @@
            var result = false;
            var trayCodes = cntrs;
            var taskNo = DateTime.Now.Ticks.ToString();
            var res = WCSHelper.CreateTaskDj(taskNo, start.Trim(), end.Trim(), taskType, priority, trayCodes, orderName,trayCarryCount, startLayer, endLayer);
@@ -1076,125 +1083,124 @@
        }
        
        public static TaskResponse smallMaterial(smallMaterial model) {
            var db = new SqlHelper<Location>().GetInstance();
        //public static TaskResponse smallMaterial(smallMaterial model) {
        //    var db = new SqlHelper<Location>().GetInstance();
            string Message = null;
        //    string Message = null;
            //拆分成两条任务,一条是料架到指定的缓存区,二是料架上的托盘到指定的工位(小米wcs传)一对多
            var startFrame = db.Queryable<LocFrameRel>().Where(a => a.S_LOC_CODE == model.parameters[0].src).First();
        //    //拆分成两条任务,一条是料架到指定的缓存区,二是料架上的托盘到指定的工位(小米wcs传)一对多
        //    var startFrame = db.Queryable<LocFrameRel>().Where(a => a.S_LOC_CODE == model.taskList[0].parameters[0].src).First();
            var startLoc = db.Queryable<Location>().Where(a => a.S_CODE == startFrame.S_FRAME_CODE).First();
            if (startLoc == null || startLoc.N_LOCK_STATE != 0)
            {
                return new TaskResponse
                {
                    header = new ResponseHead { code = 0, desc = $"{model.parameters[0].src}库位已被锁定!" }
                };
            }
            var endReservoirs = Settings.ReservoirAreas.Where(s => s.areaName == model.routeType).FirstOrDefault();
            var endLoc = TaskProcess.InWorkTransport(endReservoirs.areaCode);
            if (endLoc != null)
            {
                //创建到缓存区任务
                var locCntrRel = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE == startLoc.S_CODE).First();
                //创建任务
                LogHelper.Info($"创建任务 起点:{startLoc.S_CODE}终点:{endLoc.S_CODE}", model.ts_name);
                var res = TaskProcess.CreateTransportHj(startLoc.S_CODE, endLoc.S_CODE, model.ts_name, locCntrRel.S_FRAME_CODE, 1, 1);
                if (!res)
                {
                    return new TaskResponse
                    {
                        header = new ResponseHead { code = 0, desc = "自动上线任务创建失败" }
                    };
                }
            }
            //料架上的托盘到指定的工位
            foreach (var parameter in model.parameters)
            {
                var startLocHj = db.Queryable<Location>().Where(a => a.S_CODE == parameter.src).First();
                if (startLocHj == null || startLocHj.N_LOCK_STATE != 0)
                {
                     Message = Message==null? $"{model.parameters[0].src}库位已被锁定!": Message+ $"{model.parameters[0].src}库位已被锁定!";
                }
                else
                {
                    //货架上的货判断一下货架有没有锁
                    var startFrameParent = db.Queryable<LocFrameRel>().Where(a => a.S_LOC_CODE == parameter.src).First();
                    if (startFrameParent != null)
                    {
                        var startLocParent = db.Queryable<Location>().Where(a => a.S_CODE == startFrameParent.S_FRAME_CODE).First();
                        if (startLocParent == null || startLocParent.N_LOCK_STATE != 0)
                        {
                            return new TaskResponse
                            {
                                header = new ResponseHead { code = 0, desc = $"{startFrameParent.S_FRAME_CODE}货架已被锁定!" }
                            };
                        }
                    }
                    var endLocHj = db.Queryable<Location>().Where(a => a.S_CODE == parameter.dst).First();
                    if (endLocHj == null || endLocHj.N_LOCK_STATE != 0 || endLocHj.C_ENABLE != "Y")
                    {
                        //应该绕路
        //    var startLoc = db.Queryable<Location>().Where(a => a.S_CODE == startFrame.S_FRAME_CODE).First();
        //    if (startLoc == null || startLoc.N_LOCK_STATE != 0)
        //    {
        //        return new TaskResponse
        //        {
        //            header = new ResponseHead { code = 0, desc = $"{model.taskList[0].parameters[0].src}库位已被锁定!" }
        //        };
        //    }
        //    var endLoc = TaskProcess.InWorkTransport(model.shippingRoute);
        //    if (endLoc != null)
        //    {
        //        //创建到缓存区任务
        //        var locCntrRel = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE == startLoc.S_CODE).First();
        //        //创建任务
        //        LogHelper.Info($"创建任务 起点:{startLoc.S_CODE}终点:{endLoc.S_CODE}", model.ts_name);
        //        var res = TaskProcess.CreateTransportHj(startLoc.S_CODE, endLoc.S_CODE, model.ts_name, locCntrRel.S_FRAME_CODE, 1, 1);
        //        if (!res)
        //        {
        //            return new TaskResponse
        //            {
        //                header = new ResponseHead { code = 0, desc = "自动上线任务创建失败" }
        //            };
        //        }
        //    }
        //    //料架上的托盘到指定的工位
        //    foreach (var parameter in model.parameters)
        //    {
        //        var startLocHj = db.Queryable<Location>().Where(a => a.S_CODE == parameter.src).First();
        //        if (startLocHj == null || startLocHj.N_LOCK_STATE != 0)
        //        {
        //             Message = Message==null? $"{model.parameters[0].src}库位已被锁定!": Message+ $"{model.parameters[0].src}库位已被锁定!";
        //        }
        //        else
        //        {
        //            //货架上的货判断一下货架有没有锁
        //            var startFrameParent = db.Queryable<LocFrameRel>().Where(a => a.S_LOC_CODE == parameter.src).First();
        //            if (startFrameParent != null)
        //            {
        //                var startLocParent = db.Queryable<Location>().Where(a => a.S_CODE == startFrameParent.S_FRAME_CODE).First();
        //                if (startLocParent == null || startLocParent.N_LOCK_STATE != 0)
        //                {
        //                    return new TaskResponse
        //                    {
        //                        header = new ResponseHead { code = 0, desc = $"{startFrameParent.S_FRAME_CODE}货架已被锁定!" }
        //                    };
        //                }
        //            }
        //            var endLocHj = db.Queryable<Location>().Where(a => a.S_CODE == parameter.dst).First();
        //            if (endLocHj == null || endLocHj.N_LOCK_STATE != 0 || endLocHj.C_ENABLE != "Y")
        //            {
        //                //应该绕路
                        Message = Message == null ? $"{parameter.dst}库位已被锁定!" : Message + $"{parameter.dst}库位已被锁定!";
                    }
                    else
                    {
                        //货架上的货判断一下货架有没有锁
                        var endFrameParent = db.Queryable<LocFrameRel>().Where(a => a.S_LOC_CODE == parameter.dst).First();
                        if (endFrameParent != null)
                        {
                            var endLocParent = db.Queryable<Location>().Where(a => a.S_CODE == endFrameParent.S_FRAME_CODE).First();
                            if (endLocParent == null || endLocParent.N_LOCK_STATE != 0)
                            {
                                return new TaskResponse
                                {
                                    header = new ResponseHead { code = 0, desc = $"{endFrameParent.S_FRAME_CODE}货架已被锁定!" }
                                };
                            }
                        }
                        //创建到缓存区任务
                        var locCntrRel1 = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE == startLocHj.S_CODE).First();
                        //创建任务
                        LogHelper.Info($"创建任务 起点:{startLocHj.S_CODE}终点:{endLocHj.S_CODE}", model.ts_name);
                        var res = TaskProcess.CreateTransport(startLocHj.S_CODE, endLocHj.S_CODE, model.ts_name, locCntrRel1.S_CNTR_CODE, 1, 1);
                        if (!res)
                        {
                            return new TaskResponse
                            {
                                header = new ResponseHead { code = 0, desc = "自动上线任务2创建失败" }
                            };
                        }
        //                Message = Message == null ? $"{parameter.dst}库位已被锁定!" : Message + $"{parameter.dst}库位已被锁定!";
        //            }
        //            else
        //            {
        //                //货架上的货判断一下货架有没有锁
        //                var endFrameParent = db.Queryable<LocFrameRel>().Where(a => a.S_LOC_CODE == parameter.dst).First();
        //                if (endFrameParent != null)
        //                {
        //                    var endLocParent = db.Queryable<Location>().Where(a => a.S_CODE == endFrameParent.S_FRAME_CODE).First();
        //                    if (endLocParent == null || endLocParent.N_LOCK_STATE != 0)
        //                    {
        //                        return new TaskResponse
        //                        {
        //                            header = new ResponseHead { code = 0, desc = $"{endFrameParent.S_FRAME_CODE}货架已被锁定!" }
        //                        };
        //                    }
        //                }
        //                //创建到缓存区任务
        //                var locCntrRel1 = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE == startLocHj.S_CODE).First();
        //                //创建任务
        //                LogHelper.Info($"创建任务 起点:{startLocHj.S_CODE}终点:{endLocHj.S_CODE}", model.ts_name);
        //                var res = TaskProcess.CreateTransport(startLocHj.S_CODE, endLocHj.S_CODE, model.ts_name, locCntrRel1.S_CNTR_CODE, 1, 1);
        //                if (!res)
        //                {
        //                    return new TaskResponse
        //                    {
        //                        header = new ResponseHead { code = 0, desc = "自动上线任务2创建失败" }
        //                    };
        //                }
                    }
        //            }
                    
                }
            }
            var result = new TaskResponse();
            if (Message != null)
            {
                result = new TaskResponse
                {
                    header = new ResponseHead { code = 0, desc = Message }
                };
            }
            else
            {
                result = new TaskResponse
                {
                    header = new ResponseHead { code = 200, desc = "SUCCESS" },
                    body = new ResponseBody
                    {
                        msg = "success",
                        app_name = "Guozi client",
                        data = new List<ResponseData> { new ResponseData { in_order_id = model.taskID } },
                        version = ""
                    }
                };
            }
            return result;
        }
        //        }
        //    }
        //    var result = new TaskResponse();
        //    if (Message != null)
        //    {
        //        result = new TaskResponse
        //        {
        //            header = new ResponseHead { code = 0, desc = Message }
        //        };
        //    }
        //    else
        //    {
        //        result = new TaskResponse
        //        {
        //            header = new ResponseHead { code = 200, desc = "SUCCESS" },
        //            body = new ResponseBody
        //            {
        //                msg = "success",
        //                app_name = "Guozi client",
        //                data = new List<ResponseData> { new ResponseData { in_order_id = model.taskID } },
        //                version = ""
        //            }
        //        };
        //    }
        //    return result;
        //}
        
HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/wms/LocationHelper.cs
@@ -1,4 +1,5 @@
using HH.WCS.XiaoMi.util;
using Newtonsoft.Json;
using Opc.Ua;
using SqlSugar;
using System;
@@ -342,6 +343,7 @@
            var res = false;
            var db = new SqlHelper<object>().GetInstance();
            var model = db.Queryable<Location>().Where(a => a.S_CODE == loc).First();
            LogHelper.Info("LockLoc 货位参数=====:" + JsonConvert.SerializeObject(model));
            if (model != null && model.S_LOCK_STATE.Trim() == "无")
            {
                model.N_LOCK_STATE = lockState;
HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/wms/WCSHelper.cs
@@ -58,8 +58,13 @@
            var task = db.Queryable<WCSTask>().Where(a => a.S_CODE.Trim() == no).First();
            return task;
        }
        internal static WCSTask GetTaskName(string no)
        {
            var db = new SqlHelper<WCSTask>().GetInstance();
            var task = db.Queryable<WCSTask>().Where(a => a.S_WORKSHOP_NO.Trim() == no).First();
            return task;
        }
        internal static List<WCSTask> GetTaskBycntrcode(string no)
        {
            var db = new SqlHelper<WCSTask>().GetInstance();
@@ -122,7 +127,8 @@
            var endLoc = LocationHelper.GetLocation(to);
            WCSTask TN_Task = new WCSTask()
            {
                S_CODE = GenerateTaskNo(),
                //S_CODE = GenerateTaskNo(),
                S_CODE = orderName,
                S_START_AREA = fromLoc.S_AREA_CODE,
                S_END_AREA = endLoc.S_AREA_CODE,
                S_START_LOC = from,
@@ -134,8 +140,8 @@
                N_B_STATE = 0,
                S_B_STATE = WCSTask.GetStateStr(0),
                S_CNTR_CODE = cntrInfo,
                //存小米任务号
                S_WORKSHOP_NO = orderName
                ////存小米任务号
                //S_WORKSHOP_NO = orderName
                //N_START_LAYER = startLayer,
                //N_END_LAYER = endLayer,
                //N_CNTR_COUNT = cntrCount