From fdb591381753f9eabca095fce8a2cfd506c3fe32 Mon Sep 17 00:00:00 2001 From: pengmn <pmn@HanInfo> Date: 星期五, 04 七月 2025 16:53:10 +0800 Subject: [PATCH] 1 --- /dev/null | 0 HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/dispatch/GZRobot.cs | 95 ++++++++------- HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/api/ApiModel.cs | 1 .vs/HH.WCS.XiaoMi/v17/DocumentLayout.backup.json | 108 ++++++++--------- .vs/HH.WCS.XiaoMi/FileContentIndex/37d7396f-518e-43c3-b0c1-30ccf729eafc.vsidx | 0 HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/config/config.json | 3 .vs/HH.WCS.XiaoMi/v17/DocumentLayout.json | 108 ++++++++--------- .vs/HH.WCS.XiaoMi/FileContentIndex/c9c95b20-3edf-4c0d-ab79-3caa54d0597e.vsidx | 0 8 files changed, 160 insertions(+), 155 deletions(-) diff --git a/.vs/HH.WCS.XiaoMi/FileContentIndex/37d7396f-518e-43c3-b0c1-30ccf729eafc.vsidx b/.vs/HH.WCS.XiaoMi/FileContentIndex/37d7396f-518e-43c3-b0c1-30ccf729eafc.vsidx new file mode 100644 index 0000000..f33bc4d --- /dev/null +++ b/.vs/HH.WCS.XiaoMi/FileContentIndex/37d7396f-518e-43c3-b0c1-30ccf729eafc.vsidx Binary files differ diff --git a/.vs/HH.WCS.XiaoMi/FileContentIndex/b4622226-4fe5-49ed-b06c-00e58d9a07b0.vsidx b/.vs/HH.WCS.XiaoMi/FileContentIndex/b4622226-4fe5-49ed-b06c-00e58d9a07b0.vsidx deleted file mode 100644 index 422d348..0000000 --- a/.vs/HH.WCS.XiaoMi/FileContentIndex/b4622226-4fe5-49ed-b06c-00e58d9a07b0.vsidx +++ /dev/null Binary files differ diff --git a/.vs/HH.WCS.XiaoMi/FileContentIndex/7615c927-6362-4803-9c59-058ffe1ca248.vsidx b/.vs/HH.WCS.XiaoMi/FileContentIndex/c9c95b20-3edf-4c0d-ab79-3caa54d0597e.vsidx similarity index 94% rename from .vs/HH.WCS.XiaoMi/FileContentIndex/7615c927-6362-4803-9c59-058ffe1ca248.vsidx rename to .vs/HH.WCS.XiaoMi/FileContentIndex/c9c95b20-3edf-4c0d-ab79-3caa54d0597e.vsidx index f9b7d36..6c79b11 100644 --- a/.vs/HH.WCS.XiaoMi/FileContentIndex/7615c927-6362-4803-9c59-058ffe1ca248.vsidx +++ b/.vs/HH.WCS.XiaoMi/FileContentIndex/c9c95b20-3edf-4c0d-ab79-3caa54d0597e.vsidx Binary files differ diff --git a/.vs/HH.WCS.XiaoMi/v17/DocumentLayout.backup.json b/.vs/HH.WCS.XiaoMi/v17/DocumentLayout.backup.json index c9383fd..c957541 100644 --- a/.vs/HH.WCS.XiaoMi/v17/DocumentLayout.backup.json +++ b/.vs/HH.WCS.XiaoMi/v17/DocumentLayout.backup.json @@ -3,16 +3,20 @@ "WorkspaceRootPath": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\", "Documents": [ { - "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\\dispatch\\gzrobot.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\\dispatch\\gzrobot.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\\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\\agvcontroller.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\\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\\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}", + "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}", @@ -29,10 +33,6 @@ { "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\\bigmaterial.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\\models\\bigmaterial.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\\taskprocess.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\\taskprocess.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\\loccntrrel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", @@ -59,27 +59,14 @@ { "$type": "Document", "DocumentIndex": 0, - "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", - "ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\process\\DeviceProcess.cs", - "RelativeToolTip": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\process\\DeviceProcess.cs", - "ViewState": "AgIAAAwAAAAAAAAAAAAswBoAAAAAAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-04T02:55:44.185Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 1, "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": "AgIAAO0AAAAAAAAAAAAAAPUAAAAvAAAAAAAAAA==", + "ViewState": "AgIAANwAAAAAAAAAAAAAAOEAAAARAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-04T00:53:30.701Z", + "WhenOpened": "2025-07-04T08:49:12.48Z", "EditorCaption": "" }, { @@ -92,20 +79,33 @@ }, { "$type": "Document", - "DocumentIndex": 2, - "Title": "AgvController.cs", - "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\api\\AgvController.cs", - "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": "AgIAADEAAAAAAAAAAAAswEYAAAAhAAAAAAAAAA==", + "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==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-04T00:47:08.402Z", + "WhenOpened": "2025-07-04T03:18:06.023Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 4, + "DocumentIndex": 2, + "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", + "ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\process\\DeviceProcess.cs", + "RelativeToolTip": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\process\\DeviceProcess.cs", + "ViewState": "AgIAAAwAAAAAAAAAAAAswBoAAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-07-04T02:55:44.185Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 5, "Title": "WCSTask.cs", "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\models\\WCSTask.cs", "RelativeDocumentMoniker": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\models\\WCSTask.cs", @@ -113,7 +113,19 @@ "RelativeToolTip": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\models\\WCSTask.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAuwAcAAAARAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-01T02:13:02.571Z", + "WhenOpened": "2025-07-01T02:13:02.571Z" + }, + { + "$type": "Document", + "DocumentIndex": 1, + "Title": "AgvController.cs", + "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\api\\AgvController.cs", + "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==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-07-04T00:47:08.402Z", "EditorCaption": "" }, { @@ -130,7 +142,7 @@ }, { "$type": "Document", - "DocumentIndex": 6, + "DocumentIndex": 7, "Title": "bigMaterial.cs", "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\models\\bigMaterial.cs", "RelativeDocumentMoniker": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\models\\bigMaterial.cs", @@ -138,8 +150,7 @@ "RelativeToolTip": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\models\\bigMaterial.cs", "ViewState": "AgIAABQAAAAAAAAAAAAcwAwAAAAtAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-06-30T01:48:12.435Z", - "EditorCaption": "" + "WhenOpened": "2025-06-30T01:48:12.435Z" }, { "$type": "Document", @@ -155,7 +166,7 @@ }, { "$type": "Document", - "DocumentIndex": 3, + "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", @@ -163,8 +174,7 @@ "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", - "EditorCaption": "" + "WhenOpened": "2025-07-01T02:01:38.699Z" }, { "$type": "Document", @@ -180,20 +190,7 @@ }, { "$type": "Document", - "DocumentIndex": 7, - "Title": "TaskProcess.cs", - "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\process\\TaskProcess.cs", - "RelativeDocumentMoniker": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\process\\TaskProcess.cs", - "ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\process\\TaskProcess.cs", - "RelativeToolTip": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\process\\TaskProcess.cs", - "ViewState": "AgIAAL0DAAAAAAAAAAAuwGkEAAAAAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-06-30T01:30:52.325Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 5, + "DocumentIndex": 6, "Title": "WmsController.cs", "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\api\\WmsController.cs", "RelativeDocumentMoniker": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\api\\WmsController.cs", @@ -201,8 +198,7 @@ "RelativeToolTip": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\api\\WmsController.cs", "ViewState": "AgIAABQAAAAAAAAAAAAmwCcAAAA7AAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-01T07:30:55.256Z", - "EditorCaption": "" + "WhenOpened": "2025-07-01T07:30:55.256Z" } ] } diff --git a/.vs/HH.WCS.XiaoMi/v17/DocumentLayout.json b/.vs/HH.WCS.XiaoMi/v17/DocumentLayout.json index c9383fd..c957541 100644 --- a/.vs/HH.WCS.XiaoMi/v17/DocumentLayout.json +++ b/.vs/HH.WCS.XiaoMi/v17/DocumentLayout.json @@ -3,16 +3,20 @@ "WorkspaceRootPath": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\", "Documents": [ { - "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\\dispatch\\gzrobot.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\\dispatch\\gzrobot.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\\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\\agvcontroller.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\\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\\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}", + "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}", @@ -29,10 +33,6 @@ { "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\\bigmaterial.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\\models\\bigmaterial.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\\taskprocess.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\\taskprocess.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\\loccntrrel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", @@ -59,27 +59,14 @@ { "$type": "Document", "DocumentIndex": 0, - "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", - "ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\process\\DeviceProcess.cs", - "RelativeToolTip": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\process\\DeviceProcess.cs", - "ViewState": "AgIAAAwAAAAAAAAAAAAswBoAAAAAAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-04T02:55:44.185Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 1, "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": "AgIAAO0AAAAAAAAAAAAAAPUAAAAvAAAAAAAAAA==", + "ViewState": "AgIAANwAAAAAAAAAAAAAAOEAAAARAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-04T00:53:30.701Z", + "WhenOpened": "2025-07-04T08:49:12.48Z", "EditorCaption": "" }, { @@ -92,20 +79,33 @@ }, { "$type": "Document", - "DocumentIndex": 2, - "Title": "AgvController.cs", - "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\api\\AgvController.cs", - "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": "AgIAADEAAAAAAAAAAAAswEYAAAAhAAAAAAAAAA==", + "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==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-04T00:47:08.402Z", + "WhenOpened": "2025-07-04T03:18:06.023Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 4, + "DocumentIndex": 2, + "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", + "ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\process\\DeviceProcess.cs", + "RelativeToolTip": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\process\\DeviceProcess.cs", + "ViewState": "AgIAAAwAAAAAAAAAAAAswBoAAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-07-04T02:55:44.185Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 5, "Title": "WCSTask.cs", "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\models\\WCSTask.cs", "RelativeDocumentMoniker": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\models\\WCSTask.cs", @@ -113,7 +113,19 @@ "RelativeToolTip": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\models\\WCSTask.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAuwAcAAAARAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-01T02:13:02.571Z", + "WhenOpened": "2025-07-01T02:13:02.571Z" + }, + { + "$type": "Document", + "DocumentIndex": 1, + "Title": "AgvController.cs", + "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\api\\AgvController.cs", + "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==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-07-04T00:47:08.402Z", "EditorCaption": "" }, { @@ -130,7 +142,7 @@ }, { "$type": "Document", - "DocumentIndex": 6, + "DocumentIndex": 7, "Title": "bigMaterial.cs", "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\models\\bigMaterial.cs", "RelativeDocumentMoniker": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\models\\bigMaterial.cs", @@ -138,8 +150,7 @@ "RelativeToolTip": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\models\\bigMaterial.cs", "ViewState": "AgIAABQAAAAAAAAAAAAcwAwAAAAtAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-06-30T01:48:12.435Z", - "EditorCaption": "" + "WhenOpened": "2025-06-30T01:48:12.435Z" }, { "$type": "Document", @@ -155,7 +166,7 @@ }, { "$type": "Document", - "DocumentIndex": 3, + "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", @@ -163,8 +174,7 @@ "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", - "EditorCaption": "" + "WhenOpened": "2025-07-01T02:01:38.699Z" }, { "$type": "Document", @@ -180,20 +190,7 @@ }, { "$type": "Document", - "DocumentIndex": 7, - "Title": "TaskProcess.cs", - "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\process\\TaskProcess.cs", - "RelativeDocumentMoniker": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\process\\TaskProcess.cs", - "ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\process\\TaskProcess.cs", - "RelativeToolTip": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\process\\TaskProcess.cs", - "ViewState": "AgIAAL0DAAAAAAAAAAAuwGkEAAAAAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-06-30T01:30:52.325Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 5, + "DocumentIndex": 6, "Title": "WmsController.cs", "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\api\\WmsController.cs", "RelativeDocumentMoniker": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\api\\WmsController.cs", @@ -201,8 +198,7 @@ "RelativeToolTip": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\api\\WmsController.cs", "ViewState": "AgIAABQAAAAAAAAAAAAmwCcAAAA7AAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-01T07:30:55.256Z", - "EditorCaption": "" + "WhenOpened": "2025-07-01T07:30:55.256Z" } ] } diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/api/ApiModel.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/api/ApiModel.cs index e5b0d60..09206b3 100644 --- a/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/api/ApiModel.cs +++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/api/ApiModel.cs @@ -369,6 +369,7 @@ public class GzResult { public int resultCode { get; set; } + public bool success { get; set; } public string msg { get; set; } public int orderID { get; set; } public string orderData { get; set; } diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/config/config.json b/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/config/config.json index 5bdb110..fb1794a 100644 --- a/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/config/config.json +++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/config/config.json @@ -1,7 +1,8 @@ { "HostToAgvServerUrl": "http://192.168.1.146:9988/HostToAGV.cgi", - "HASeverUrl": "http://172.16.10.41", "GZSeverUrl": "http://192.192.209.241", + "HASeverUrl": "http://172.16.10.41:3003", + "WcsSeverUrl": "http://172.16.10.41:3003", diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/dispatch/GZRobot.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/dispatch/GZRobot.cs index 658a6c6..bed8f32 100644 --- a/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/dispatch/GZRobot.cs +++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/dispatch/GZRobot.cs @@ -215,52 +215,63 @@ public static GzResult applyReroute(orderReroute model) { GzResult result = new GzResult(); - var wcsTask = WCSHelper.GetTask(model.orderName); - if (wcsTask == null) + try + { + var wcsTask = WCSHelper.GetTask(model.orderName); + if (wcsTask == null) + { + result.resultCode = 1; + result.msg = "璁㈠崟涓嶅瓨鍦�"; + return result; + } + if (model.orderType == 1) + { + //1琛ㄧず鏄惁鐢宠缁曡矾 + var endLoc = LocationHelper.GetLoc(wcsTask.S_END_LOC); + if (endLoc.N_CURRENT_NUM == 0 && endLoc.S_LOCK_STATE == "鏃�) + { + result.resultCode = 0; + result.success = true; + result.msg = "鐩爣璐т綅宸茬┖"; + return result; + } + else + { + result.resultCode = 1; + result.success = false; + result.msg = "鐩爣璐т綅涓烘弧"; + return result; + } + } + else + { + //2琛ㄧず鐢宠鐩爣搴撲綅 + var apply = new ApplyModel() { wcsTaskCode = wcsTask.S_WORKSHOP_NO }; + var end = XMWcsHelper.GetPositionApply(apply); + if (!string.IsNullOrEmpty(end.body.pointCode)) + { + result.resultCode = 0; + result.msg = "鐩爣搴撲綅宸茬敵璇�; + result.orderData = end.body.pointCode; + return result; + } + else + { + result.resultCode = 1; + result.msg = "鐩爣搴撲綅宸茬敵璇�; + result.orderData = ""; + return result; + } + } + } + catch (Exception ex) { result.resultCode = 1; - result.msg = "璁㈠崟涓嶅瓨鍦�"; + result.success = false; + result.msg = $"agv鐢宠缁曡矾鍑虹幇閿欒{JsonConvert.SerializeObject(ex.Message)}"; return result; } - if (model.orderType == 1) - { - //1琛ㄧず鏄惁鐢宠缁曡矾 - var endLoc = LocationHelper.GetLoc(wcsTask.S_END_LOC); - if (endLoc.N_CURRENT_NUM == 0 && endLoc.S_LOCK_STATE == "鏃�) - { - result.resultCode = 0; - result.msg = "鐩爣璐т綅宸茬┖"; - return result; - } - else - { - result.resultCode = 1; - result.msg = "鐩爣璐т綅涓烘弧"; - return result; - } - } - else - { - //2琛ㄧず鐢宠鐩爣搴撲綅 - var apply = new ApplyModel() { wcsTaskCode = wcsTask.S_WORKSHOP_NO }; - var end = XMWcsHelper.GetPositionApply(apply); - if (!string.IsNullOrEmpty(end.body.pointCode)) - { - result.resultCode = 0; - result.msg = "鐩爣搴撲綅宸茬敵璇�; - result.orderData = end.body.pointCode; - return result; - } - else - { - result.resultCode = 1; - result.msg = "鐩爣搴撲綅宸茬敵璇�; - result.orderData = ""; - return result; - } - } - - return result; + } -- Gitblit v1.9.1