From 7f34e14e8eefc2eb178eb2786e5989fe53b207bb Mon Sep 17 00:00:00 2001 From: pengmn <pmn@HanInfo> Date: 星期一, 07 七月 2025 17:05:14 +0800 Subject: [PATCH] 1 --- HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/api/AgvController.cs | 29 +++++---- HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/dispatch/GZRobot.cs | 23 +++++++ HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/api/ApiModel.cs | 2 .vs/HH.WCS.XiaoMi/v17/DocumentLayout.backup.json | 45 ++++++++++---- .vs/HH.WCS.XiaoMi/v17/DocumentLayout.json | 45 ++++++++++---- 5 files changed, 106 insertions(+), 38 deletions(-) diff --git a/.vs/HH.WCS.XiaoMi/v17/DocumentLayout.backup.json b/.vs/HH.WCS.XiaoMi/v17/DocumentLayout.backup.json index 1ea7606..716a065 100644 --- a/.vs/HH.WCS.XiaoMi/v17/DocumentLayout.backup.json +++ b/.vs/HH.WCS.XiaoMi/v17/DocumentLayout.backup.json @@ -11,6 +11,10 @@ "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}" }, @@ -50,8 +54,21 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 2, + "SelectedChildIndex": 3, "Children": [ + { + "$type": "Document", + "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-07T08:58:20.955Z", + "EditorCaption": "" + }, { "$type": "Bookmark", "Name": "ST:0:0:{eefa5220-e298-11d0-8f78-00a0c9110057}" @@ -68,14 +85,14 @@ "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": "AgIAANUAAAAAAAAAAAAAAN8AAAAqAAAAAAAAAA==", + "ViewState": "AgIAAM8AAAAAAAAAAAAuwBUBAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "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", @@ -83,11 +100,12 @@ "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" + "WhenOpened": "2025-07-04T02:55:44.185Z", + "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 4, + "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", @@ -105,13 +123,14 @@ "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": "AgIAACwAAAAAAAAAAADwv0YAAAAiAAAAAAAAAA==", + "ViewState": "AgIAAEkAAAAAAAAAAAAgwFQAAAAnAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-04T00:47:08.402Z" + "WhenOpened": "2025-07-04T00:47:08.402Z", + "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 9, + "DocumentIndex": 10, "Title": "WMSCore.cs", "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\core\\WMSCore.cs", "RelativeDocumentMoniker": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\core\\WMSCore.cs", @@ -123,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", @@ -135,7 +154,7 @@ }, { "$type": "Document", - "DocumentIndex": 3, + "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", @@ -147,7 +166,7 @@ }, { "$type": "Document", - "DocumentIndex": 7, + "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", "RelativeDocumentMoniker": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\models\\LocCntrRel.cs", @@ -159,7 +178,7 @@ }, { "$type": "Document", - "DocumentIndex": 8, + "DocumentIndex": 9, "Title": "LocFrameRel.cs", "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\models\\LocFrameRel.cs", "RelativeDocumentMoniker": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\models\\LocFrameRel.cs", @@ -171,7 +190,7 @@ }, { "$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", diff --git a/.vs/HH.WCS.XiaoMi/v17/DocumentLayout.json b/.vs/HH.WCS.XiaoMi/v17/DocumentLayout.json index ad6256b..5961fb1 100644 --- a/.vs/HH.WCS.XiaoMi/v17/DocumentLayout.json +++ b/.vs/HH.WCS.XiaoMi/v17/DocumentLayout.json @@ -11,6 +11,10 @@ "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}" }, @@ -50,8 +54,21 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 2, + "SelectedChildIndex": 3, "Children": [ + { + "$type": "Document", + "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-07T08:58:20.955Z", + "EditorCaption": "" + }, { "$type": "Bookmark", "Name": "ST:0:0:{eefa5220-e298-11d0-8f78-00a0c9110057}" @@ -68,14 +85,14 @@ "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": "AgIAAOAAAAAAAAAAAADwv+YAAAAxAAAAAAAAAA==", + "ViewState": "AgIAABQBAAAAAAAAAAAAwBsBAAAJAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "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", @@ -83,11 +100,12 @@ "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" + "WhenOpened": "2025-07-04T02:55:44.185Z", + "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 4, + "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", @@ -105,13 +123,14 @@ "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": "AgIAACwAAAAAAAAAAADwv0YAAAAiAAAAAAAAAA==", + "ViewState": "AgIAAEkAAAAAAAAAAAAgwFQAAAAiAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-04T00:47:08.402Z" + "WhenOpened": "2025-07-04T00:47:08.402Z", + "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 9, + "DocumentIndex": 10, "Title": "WMSCore.cs", "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\core\\WMSCore.cs", "RelativeDocumentMoniker": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\core\\WMSCore.cs", @@ -123,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", @@ -135,7 +154,7 @@ }, { "$type": "Document", - "DocumentIndex": 3, + "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", @@ -147,7 +166,7 @@ }, { "$type": "Document", - "DocumentIndex": 7, + "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", "RelativeDocumentMoniker": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\models\\LocCntrRel.cs", @@ -159,7 +178,7 @@ }, { "$type": "Document", - "DocumentIndex": 8, + "DocumentIndex": 9, "Title": "LocFrameRel.cs", "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u5C0F\u7C73\u7535\u9A71\\HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\models\\LocFrameRel.cs", "RelativeDocumentMoniker": "HH.WCS.Mobox3\\HH.WCS.Mobox3.XiaoMi\\models\\LocFrameRel.cs", @@ -171,7 +190,7 @@ }, { "$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", diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/api/AgvController.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/api/AgvController.cs index 305d065..54cd220 100644 --- a/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/api/AgvController.cs +++ b/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; + } } } 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 09206b3..299b8e3 100644 --- a/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/api/ApiModel.cs +++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/api/ApiModel.cs @@ -342,6 +342,8 @@ + + ////鍙嶉灏忕背 //public class XiaoMiOrderStatusReport //{ 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 3236454..46a8c27 100644 --- a/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/dispatch/GZRobot.cs +++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/dispatch/GZRobot.cs @@ -275,6 +275,29 @@ } + /// <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> ///// 璋冪敤灏忕背鐘舵�鍥炴姤鎺ュ彛 -- Gitblit v1.9.1