From b46e37857200e173edbefa2751c5a8bd4a5bb69a Mon Sep 17 00:00:00 2001 From: jinxin <1013386558@qq.com> Date: 星期四, 05 六月 2025 21:21:30 +0800 Subject: [PATCH] 11 --- HH.WCS.NongFuChaYuan/HH.WCS.NongFuChaYuan.sln | 25 +++++++++++++++++++++++++ .vs/农夫茶园/v17/DocumentLayout.backup.json | 12 ++++++++++++ .vs/农夫茶园/v17/.wsuo | 0 .vs/VSWorkspaceState.json | 2 +- HH.WCS.NongFuChaYuan/ApiService/AgvController.cs | 4 ++-- .vs/农夫茶园/v17/DocumentLayout.json | 12 ++++++++++++ .vs/农夫茶园/FileContentIndex/7b7090f8-f935-4f11-8dbd-98922ed8efde.vsidx | 0 7 files changed, 52 insertions(+), 3 deletions(-) diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json index 827b10e..9a13fa4 100644 --- a/.vs/VSWorkspaceState.json +++ b/.vs/VSWorkspaceState.json @@ -2,6 +2,6 @@ "ExpandedNodes": [ "" ], - "SelectedNode": "\\E:\\椤圭洰\\Git\\鍐滃か鑼跺洯", + "PreviewInSolutionExplorer": false } \ No newline at end of file diff --git "a/.vs/\345\206\234\345\244\253\350\214\266\345\233\255/FileContentIndex/7b7090f8-f935-4f11-8dbd-98922ed8efde.vsidx" "b/.vs/\345\206\234\345\244\253\350\214\266\345\233\255/FileContentIndex/7b7090f8-f935-4f11-8dbd-98922ed8efde.vsidx" new file mode 100644 index 0000000..3509759 --- /dev/null +++ "b/.vs/\345\206\234\345\244\253\350\214\266\345\233\255/FileContentIndex/7b7090f8-f935-4f11-8dbd-98922ed8efde.vsidx" Binary files differ diff --git "a/.vs/\345\206\234\345\244\253\350\214\266\345\233\255/v17/.wsuo" "b/.vs/\345\206\234\345\244\253\350\214\266\345\233\255/v17/.wsuo" new file mode 100644 index 0000000..d2f9a15 --- /dev/null +++ "b/.vs/\345\206\234\345\244\253\350\214\266\345\233\255/v17/.wsuo" Binary files differ diff --git "a/.vs/\345\206\234\345\244\253\350\214\266\345\233\255/v17/DocumentLayout.backup.json" "b/.vs/\345\206\234\345\244\253\350\214\266\345\233\255/v17/DocumentLayout.backup.json" new file mode 100644 index 0000000..505b650 --- /dev/null +++ "b/.vs/\345\206\234\345\244\253\350\214\266\345\233\255/v17/DocumentLayout.backup.json" @@ -0,0 +1,12 @@ +{ + "Version": 1, + "WorkspaceRootPath": "D:\\\u5DE5\u4F5C\\\u519C\u592B\u8336\u56ED\\", + "Documents": [], + "DocumentGroupContainers": [ + { + "Orientation": 0, + "VerticalTabListWidth": 256, + "DocumentGroups": [] + } + ] +} \ No newline at end of file diff --git "a/.vs/\345\206\234\345\244\253\350\214\266\345\233\255/v17/DocumentLayout.json" "b/.vs/\345\206\234\345\244\253\350\214\266\345\233\255/v17/DocumentLayout.json" new file mode 100644 index 0000000..505b650 --- /dev/null +++ "b/.vs/\345\206\234\345\244\253\350\214\266\345\233\255/v17/DocumentLayout.json" @@ -0,0 +1,12 @@ +{ + "Version": 1, + "WorkspaceRootPath": "D:\\\u5DE5\u4F5C\\\u519C\u592B\u8336\u56ED\\", + "Documents": [], + "DocumentGroupContainers": [ + { + "Orientation": 0, + "VerticalTabListWidth": 256, + "DocumentGroups": [] + } + ] +} \ No newline at end of file diff --git a/HH.WCS.NongFuChaYuan/ApiService/AgvController.cs b/HH.WCS.NongFuChaYuan/ApiService/AgvController.cs index dbafe90..dbe4903 100644 --- a/HH.WCS.NongFuChaYuan/ApiService/AgvController.cs +++ b/HH.WCS.NongFuChaYuan/ApiService/AgvController.cs @@ -15,10 +15,10 @@ [HttpPost] [Route("AGVCallbackState")] public ReturnResult AGVCallbackState(AgvTaskState model) { - LogHelper.Info("AGVCallbackState Request锛� + JsonConvert.SerializeObject(model), "HosttoagvTask"); + LogHelper.Info("AGVCallbackState Request锛� + JsonConvert.SerializeObject(model), "HosttoagvTask"); ApiHelper.OperateTaskStatus(model); ReturnResult result = new ReturnResult(); - LogHelper.Info("AGVCallbackState Return锛� + JsonConvert.SerializeObject(result), "HosttoagvTask"); + LogHelper.Info("AGVCallbackState Return锛� + JsonConvert.SerializeObject(result), "HosttoagvTask"); return result; } diff --git a/HH.WCS.NongFuChaYuan/HH.WCS.NongFuChaYuan.sln b/HH.WCS.NongFuChaYuan/HH.WCS.NongFuChaYuan.sln new file mode 100644 index 0000000..03f4627 --- /dev/null +++ b/HH.WCS.NongFuChaYuan/HH.WCS.NongFuChaYuan.sln @@ -0,0 +1,25 @@ +锘�+Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.33529.622 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HH.WCS.NongFuChaYuan", "HH.WCS.NongFuChaYuan.csproj", "{450AAB20-19D7-4C6A-9CDD-50F0EDCB27EC}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {450AAB20-19D7-4C6A-9CDD-50F0EDCB27EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {450AAB20-19D7-4C6A-9CDD-50F0EDCB27EC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {450AAB20-19D7-4C6A-9CDD-50F0EDCB27EC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {450AAB20-19D7-4C6A-9CDD-50F0EDCB27EC}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {61711BEF-C1B8-4819-9608-2938DB3C9FFF} + EndGlobalSection +EndGlobal -- Gitblit v1.9.1