From 4fa85e410dc2e34afcbe97d15b6c5d5ef8c09eb6 Mon Sep 17 00:00:00 2001 From: pengmn <pmn@HanInfo> Date: 星期一, 07 七月 2025 11:24:59 +0800 Subject: [PATCH] 1 --- HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/dispatch/GZRobot.cs | 2 +- .vs/HH.WCS.XiaoMi/v17/DocumentLayout.backup.json | 25 ++++++++++++------------- .vs/HH.WCS.XiaoMi/v17/DocumentLayout.json | 21 ++++++++++----------- 3 files changed, 23 insertions(+), 25 deletions(-) diff --git a/.vs/HH.WCS.XiaoMi/v17/DocumentLayout.backup.json b/.vs/HH.WCS.XiaoMi/v17/DocumentLayout.backup.json index e6e6821..53677c8 100644 --- a/.vs/HH.WCS.XiaoMi/v17/DocumentLayout.backup.json +++ b/.vs/HH.WCS.XiaoMi/v17/DocumentLayout.backup.json @@ -3,12 +3,12 @@ "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\\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\\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}", + "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}", @@ -50,7 +50,7 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 5, + "SelectedChildIndex": 2, "Children": [ { "$type": "Bookmark", @@ -62,13 +62,13 @@ }, { "$type": "Document", - "DocumentIndex": 1, + "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": "AgIAAM8AAAAAAAAAAAAkwNsAAAAzAAAAAAAAAA==", + "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": "AgIAANUAAAAAAAAAAAAAANsAAABBAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-07-04T08:49:12.48Z", "EditorCaption": "" @@ -99,16 +99,15 @@ }, { "$type": "Document", - "DocumentIndex": 0, + "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": "AgIAADoAAAAAAAAAAAD4v0YAAAAbAAAAAAAAAA==", + "ViewState": "AgIAACwAAAAAAAAAAADwv0YAAAAiAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-04T00:47:08.402Z", - "EditorCaption": "" + "WhenOpened": "2025-07-04T00:47:08.402Z" }, { "$type": "Document", diff --git a/.vs/HH.WCS.XiaoMi/v17/DocumentLayout.json b/.vs/HH.WCS.XiaoMi/v17/DocumentLayout.json index 0125876..53677c8 100644 --- a/.vs/HH.WCS.XiaoMi/v17/DocumentLayout.json +++ b/.vs/HH.WCS.XiaoMi/v17/DocumentLayout.json @@ -3,12 +3,12 @@ "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\\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\\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}", + "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}", @@ -50,7 +50,7 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 5, + "SelectedChildIndex": 2, "Children": [ { "$type": "Bookmark", @@ -62,13 +62,13 @@ }, { "$type": "Document", - "DocumentIndex": 1, + "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": "AgIAAM8AAAAAAAAAAAAkwNsAAAAzAAAAAAAAAA==", + "ViewState": "AgIAANUAAAAAAAAAAAAAANsAAABBAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-07-04T08:49:12.48Z", "EditorCaption": "" @@ -99,16 +99,15 @@ }, { "$type": "Document", - "DocumentIndex": 0, + "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": "AgIAADoAAAAAAAAAAAD4v0YAAAAbAAAAAAAAAA==", + "ViewState": "AgIAACwAAAAAAAAAAADwv0YAAAAiAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-04T00:47:08.402Z", - "EditorCaption": "" + "WhenOpened": "2025-07-04T00:47:08.402Z" }, { "$type": "Document", 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 5ea9fbd..bed8f32 100644 --- a/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/dispatch/GZRobot.cs +++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/dispatch/GZRobot.cs @@ -217,7 +217,7 @@ GzResult result = new GzResult(); try { - var wcsTask = WCSHelper.GetTaskName(model.orderName); + var wcsTask = WCSHelper.GetTask(model.orderName); if (wcsTask == null) { result.resultCode = 1; -- Gitblit v1.9.1