From a8baebe7ac7d7e03ae833815e8d94b996dfd3b5e Mon Sep 17 00:00:00 2001 From: lss <Lss@HanInfo> Date: 星期五, 16 五月 2025 17:23:15 +0800 Subject: [PATCH] 叠盘机流程开发与问题优化 --- HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/MesController.cs | 5 HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/TaskProcess.cs | 60 +++++--- HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/.vs/HH.WCS.JiaTong/v17/DocumentLayout.backup.json | 121 ++++++++++++++--- HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/ApiHelper.cs | 26 ++- HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/DeviceProcess.cs | 9 HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/device/S7Helper.cs | 24 +++ HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/core/WCSCore.cs | 2 HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/.vs/HH.WCS.JiaTong/v17/DocumentLayout.json | 147 +++++++++++++------- 8 files changed, 276 insertions(+), 118 deletions(-) diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/.vs/HH.WCS.JiaTong/v17/DocumentLayout.backup.json b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/.vs/HH.WCS.JiaTong/v17/DocumentLayout.backup.json index 101483e..84a6d67 100644 --- a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/.vs/HH.WCS.JiaTong/v17/DocumentLayout.backup.json +++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/.vs/HH.WCS.JiaTong/v17/DocumentLayout.backup.json @@ -3,20 +3,40 @@ "WorkspaceRootPath": "D:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\HH-0035_HeFeiLiaoTongAGV\\HH.WCS.Mobox3\\HH.WCS.Mobox3.JiaTong\\", "Documents": [ { + "AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|d:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\hh-0035_hefeiliaotongagv\\hh.wcs.mobox3\\hh.wcs.mobox3.jiatong\\process\\deviceprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|solutionrelative:process\\deviceprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|D:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\HH-0035_HeFeiLiaoTongAGV\\HH.WCS.Mobox3\\HH.WCS.Mobox3.JiaTong\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|solutionrelative:program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|d:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\hh-0035_hefeiliaotongagv\\hh.wcs.mobox3\\hh.wcs.mobox3.jiatong\\process\\taskprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|solutionrelative:process\\taskprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|d:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\hh-0035_hefeiliaotongagv\\hh.wcs.mobox3\\hh.wcs.mobox3.jiatong\\wms\\wcshelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|solutionrelative:wms\\wcshelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|d:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\hh-0035_hefeiliaotongagv\\hh.wcs.mobox3\\hh.wcs.mobox3.jiatong\\wms\\locationhelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|solutionrelative:wms\\locationhelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|d:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\hh-0035_hefeiliaotongagv\\hh.wcs.mobox3\\hh.wcs.mobox3.jiatong\\api\\apihelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|solutionrelative:api\\apihelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { "AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|d:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\hh-0035_hefeiliaotongagv\\hh.wcs.mobox3\\hh.wcs.mobox3.jiatong\\api\\mescontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|solutionrelative:api\\mescontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|d:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\hh-0035_hefeiliaotongagv\\hh.wcs.mobox3\\hh.wcs.mobox3.jiatong\\api\\debugcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|D:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\HH-0035_HeFeiLiaoTongAGV\\HH.WCS.Mobox3\\HH.WCS.Mobox3.JiaTong\\api\\debugcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|solutionrelative:api\\debugcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|d:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\hh-0035_hefeiliaotongagv\\hh.wcs.mobox3\\hh.wcs.mobox3.jiatong\\api\\likucontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|D:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\HH-0035_HeFeiLiaoTongAGV\\HH.WCS.Mobox3\\HH.WCS.Mobox3.JiaTong\\api\\likucontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|solutionrelative:api\\likucontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|d:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\hh-0035_hefeiliaotongagv\\hh.wcs.mobox3\\hh.wcs.mobox3.jiatong\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|solutionrelative:program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" } ], "DocumentGroupContainers": [ @@ -26,8 +46,73 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 5, + "SelectedChildIndex": 3, "Children": [ + { + "$type": "Document", + "DocumentIndex": 2, + "Title": "TaskProcess.cs", + "DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\HH-0035_HeFeiLiaoTongAGV\\HH.WCS.Mobox3\\HH.WCS.Mobox3.JiaTong\\process\\TaskProcess.cs", + "RelativeDocumentMoniker": "process\\TaskProcess.cs", + "ToolTip": "D:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\HH-0035_HeFeiLiaoTongAGV\\HH.WCS.Mobox3\\HH.WCS.Mobox3.JiaTong\\process\\TaskProcess.cs", + "RelativeToolTip": "process\\TaskProcess.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-05-16T02:47:02.633Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 4, + "Title": "LocationHelper.cs", + "DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\HH-0035_HeFeiLiaoTongAGV\\HH.WCS.Mobox3\\HH.WCS.Mobox3.JiaTong\\wms\\LocationHelper.cs", + "RelativeDocumentMoniker": "wms\\LocationHelper.cs", + "ToolTip": "D:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\HH-0035_HeFeiLiaoTongAGV\\HH.WCS.Mobox3\\HH.WCS.Mobox3.JiaTong\\wms\\LocationHelper.cs", + "RelativeToolTip": "wms\\LocationHelper.cs", + "ViewState": "AgIAADEAAAAAAAAAAAAIwAAAAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-05-16T02:43:35.272Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 3, + "Title": "WCSHelper.cs", + "DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\HH-0035_HeFeiLiaoTongAGV\\HH.WCS.Mobox3\\HH.WCS.Mobox3.JiaTong\\wms\\WCSHelper.cs", + "RelativeDocumentMoniker": "wms\\WCSHelper.cs", + "ToolTip": "D:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\HH-0035_HeFeiLiaoTongAGV\\HH.WCS.Mobox3\\HH.WCS.Mobox3.JiaTong\\wms\\WCSHelper.cs", + "RelativeToolTip": "wms\\WCSHelper.cs", + "ViewState": "AgIAACwAAAAAAAAAAAAtwEEAAAAJAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-05-16T02:38:08.426Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 0, + "Title": "DeviceProcess.cs", + "DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\HH-0035_HeFeiLiaoTongAGV\\HH.WCS.Mobox3\\HH.WCS.Mobox3.JiaTong\\process\\DeviceProcess.cs", + "RelativeDocumentMoniker": "process\\DeviceProcess.cs", + "ToolTip": "D:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\HH-0035_HeFeiLiaoTongAGV\\HH.WCS.Mobox3\\HH.WCS.Mobox3.JiaTong\\process\\DeviceProcess.cs", + "RelativeToolTip": "process\\DeviceProcess.cs", + "ViewState": "AgIAAB8AAAAAAAAAAAAAwDMAAAAWAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-05-16T02:36:49.555Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 5, + "Title": "ApiHelper.cs", + "DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\HH-0035_HeFeiLiaoTongAGV\\HH.WCS.Mobox3\\HH.WCS.Mobox3.JiaTong\\api\\ApiHelper.cs", + "RelativeDocumentMoniker": "api\\ApiHelper.cs", + "ToolTip": "D:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\HH-0035_HeFeiLiaoTongAGV\\HH.WCS.Mobox3\\HH.WCS.Mobox3.JiaTong\\api\\ApiHelper.cs", + "RelativeToolTip": "api\\ApiHelper.cs", + "ViewState": "AgIAABAEAAAAAAAAAADwvysEAAAyAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-05-16T00:57:25.72Z", + "EditorCaption": "" + }, { "$type": "Bookmark", "Name": "ST:0:0:{aa2115a1-9712-457b-9047-dbb71ca2cdd2}" @@ -42,7 +127,7 @@ }, { "$type": "Document", - "DocumentIndex": 1, + "DocumentIndex": 7, "Title": "DebugController.cs", "DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\HH-0035_HeFeiLiaoTongAGV\\HH.WCS.Mobox3\\HH.WCS.Mobox3.JiaTong\\api\\DebugController.cs", "RelativeDocumentMoniker": "api\\DebugController.cs", @@ -50,29 +135,24 @@ "RelativeToolTip": "api\\DebugController.cs", "ViewState": "AgIAAAAAAAAAAAAAAADwvwAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-15T09:13:46.377Z", - "EditorCaption": "" - }, - { - "$type": "Bookmark", - "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}" + "WhenOpened": "2025-05-15T09:13:46.377Z" }, { "$type": "Document", - "DocumentIndex": 0, + "DocumentIndex": 6, "Title": "MesController.cs", "DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\HH-0035_HeFeiLiaoTongAGV\\HH.WCS.Mobox3\\HH.WCS.Mobox3.JiaTong\\api\\MesController.cs", "RelativeDocumentMoniker": "api\\MesController.cs", "ToolTip": "D:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\HH-0035_HeFeiLiaoTongAGV\\HH.WCS.Mobox3\\HH.WCS.Mobox3.JiaTong\\api\\MesController.cs", "RelativeToolTip": "api\\MesController.cs", - "ViewState": "AgIAAAYAAAAAAAAAAAAAACEAAAAVAAAAAAAAAA==", + "ViewState": "AgIAAGUAAAAAAAAAAAAQwHIAAAAoAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-05-15T08:45:16.362Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 2, + "DocumentIndex": 8, "Title": "LiKuController.cs", "DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\HH-0035_HeFeiLiaoTongAGV\\HH.WCS.Mobox3\\HH.WCS.Mobox3.JiaTong\\api\\LiKuController.cs", "RelativeDocumentMoniker": "api\\LiKuController.cs", @@ -80,18 +160,17 @@ "RelativeToolTip": "api\\LiKuController.cs", "ViewState": "AgIAAAAAAAAAAAAAAADwvxYAAAAvAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-15T08:45:06.1Z", - "EditorCaption": "" + "WhenOpened": "2025-05-15T08:45:06.1Z" }, { "$type": "Document", - "DocumentIndex": 3, + "DocumentIndex": 1, "Title": "Program.cs", "DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\HH-0035_HeFeiLiaoTongAGV\\HH.WCS.Mobox3\\HH.WCS.Mobox3.JiaTong\\Program.cs", "RelativeDocumentMoniker": "Program.cs", "ToolTip": "D:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\HH-0035_HeFeiLiaoTongAGV\\HH.WCS.Mobox3\\HH.WCS.Mobox3.JiaTong\\Program.cs", "RelativeToolTip": "Program.cs", - "ViewState": "AgIAAAYAAAAAAAAAAADwvxEAAAAdAAAAAAAAAA==", + "ViewState": "AgIAAFwAAAAAAAAAAAAUwG0AAAA5AAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-05-15T07:55:15.792Z", "EditorCaption": "" diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/.vs/HH.WCS.JiaTong/v17/DocumentLayout.json b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/.vs/HH.WCS.JiaTong/v17/DocumentLayout.json index 84a6d67..24fded4 100644 --- a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/.vs/HH.WCS.JiaTong/v17/DocumentLayout.json +++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/.vs/HH.WCS.JiaTong/v17/DocumentLayout.json @@ -3,40 +3,48 @@ "WorkspaceRootPath": "D:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\HH-0035_HeFeiLiaoTongAGV\\HH.WCS.Mobox3\\HH.WCS.Mobox3.JiaTong\\", "Documents": [ { - "AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|d:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\hh-0035_hefeiliaotongagv\\hh.wcs.mobox3\\hh.wcs.mobox3.jiatong\\process\\deviceprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|solutionrelative:process\\deviceprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|d:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\hh-0035_hefeiliaotongagv\\hh.wcs.mobox3\\hh.wcs.mobox3.jiatong\\api\\apihelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|solutionrelative:api\\apihelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|D:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\HH-0035_HeFeiLiaoTongAGV\\HH.WCS.Mobox3\\HH.WCS.Mobox3.JiaTong\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|solutionrelative:program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|d:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\hh-0035_hefeiliaotongagv\\hh.wcs.mobox3\\hh.wcs.mobox3.jiatong\\core\\wcscore.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|solutionrelative:core\\wcscore.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { "AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|d:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\hh-0035_hefeiliaotongagv\\hh.wcs.mobox3\\hh.wcs.mobox3.jiatong\\process\\taskprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|solutionrelative:process\\taskprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|d:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\hh-0035_hefeiliaotongagv\\hh.wcs.mobox3\\hh.wcs.mobox3.jiatong\\wms\\wcshelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|solutionrelative:wms\\wcshelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|d:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\hh-0035_hefeiliaotongagv\\hh.wcs.mobox3\\hh.wcs.mobox3.jiatong\\wms\\locationhelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|solutionrelative:wms\\locationhelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|d:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\hh-0035_hefeiliaotongagv\\hh.wcs.mobox3\\hh.wcs.mobox3.jiatong\\api\\apihelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|solutionrelative:api\\apihelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|D:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\HH-0035_HeFeiLiaoTongAGV\\HH.WCS.Mobox3\\HH.WCS.Mobox3.JiaTong\\api\\likucontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|solutionrelative:api\\likucontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { "AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|d:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\hh-0035_hefeiliaotongagv\\hh.wcs.mobox3\\hh.wcs.mobox3.jiatong\\api\\mescontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|solutionrelative:api\\mescontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|D:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\HH-0035_HeFeiLiaoTongAGV\\HH.WCS.Mobox3\\HH.WCS.Mobox3.JiaTong\\api\\debugcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|solutionrelative:api\\debugcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|d:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\hh-0035_hefeiliaotongagv\\hh.wcs.mobox3\\hh.wcs.mobox3.jiatong\\config\\configdesc.txt||{8B382828-6202-11D1-8870-0000F87579D2}", + "RelativeMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|solutionrelative:config\\configdesc.txt||{8B382828-6202-11D1-8870-0000F87579D2}" }, { - "AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|D:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\HH-0035_HeFeiLiaoTongAGV\\HH.WCS.Mobox3\\HH.WCS.Mobox3.JiaTong\\api\\likucontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|solutionrelative:api\\likucontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|d:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\hh-0035_hefeiliaotongagv\\hh.wcs.mobox3\\hh.wcs.mobox3.jiatong\\process\\deviceprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|solutionrelative:process\\deviceprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|d:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\hh-0035_hefeiliaotongagv\\hh.wcs.mobox3\\hh.wcs.mobox3.jiatong\\wms\\wcshelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|solutionrelative:wms\\wcshelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|D:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\HH-0035_HeFeiLiaoTongAGV\\HH.WCS.Mobox3\\HH.WCS.Mobox3.JiaTong\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|solutionrelative:program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|d:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\hh-0035_hefeiliaotongagv\\hh.wcs.mobox3\\hh.wcs.mobox3.jiatong\\wms\\locationhelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|solutionrelative:wms\\locationhelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|D:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\HH-0035_HeFeiLiaoTongAGV\\HH.WCS.Mobox3\\HH.WCS.Mobox3.JiaTong\\api\\debugcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E11111}|HH.WCS.JiaTong.csproj|solutionrelative:api\\debugcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" } ], "DocumentGroupContainers": [ @@ -46,8 +54,34 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 3, + "SelectedChildIndex": 6, "Children": [ + { + "$type": "Document", + "DocumentIndex": 1, + "Title": "WCSCore.cs", + "DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\HH-0035_HeFeiLiaoTongAGV\\HH.WCS.Mobox3\\HH.WCS.Mobox3.JiaTong\\core\\WCSCore.cs", + "RelativeDocumentMoniker": "core\\WCSCore.cs", + "ToolTip": "D:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\HH-0035_HeFeiLiaoTongAGV\\HH.WCS.Mobox3\\HH.WCS.Mobox3.JiaTong\\core\\WCSCore.cs", + "RelativeToolTip": "core\\WCSCore.cs", + "ViewState": "AgIAABYAAAAAAAAAAAAAwDMAAAAmAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-05-16T04:08:16.115Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 5, + "Title": "configDesc.txt", + "DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\HH-0035_HeFeiLiaoTongAGV\\HH.WCS.Mobox3\\HH.WCS.Mobox3.JiaTong\\config\\configDesc.txt", + "RelativeDocumentMoniker": "config\\configDesc.txt", + "ToolTip": "D:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\HH-0035_HeFeiLiaoTongAGV\\HH.WCS.Mobox3\\HH.WCS.Mobox3.JiaTong\\config\\configDesc.txt", + "RelativeToolTip": "config\\configDesc.txt", + "ViewState": "AgIAAAAAAAAAAAAAAAAAABMAAAAWAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003109|", + "WhenOpened": "2025-05-16T03:10:42.328Z", + "EditorCaption": "" + }, { "$type": "Document", "DocumentIndex": 2, @@ -56,14 +90,14 @@ "RelativeDocumentMoniker": "process\\TaskProcess.cs", "ToolTip": "D:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\HH-0035_HeFeiLiaoTongAGV\\HH.WCS.Mobox3\\HH.WCS.Mobox3.JiaTong\\process\\TaskProcess.cs", "RelativeToolTip": "process\\TaskProcess.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", + "ViewState": "AgIAADUBAAAAAAAAAAAvwEoBAAAeAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-05-16T02:47:02.633Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 4, + "DocumentIndex": 9, "Title": "LocationHelper.cs", "DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\HH-0035_HeFeiLiaoTongAGV\\HH.WCS.Mobox3\\HH.WCS.Mobox3.JiaTong\\wms\\LocationHelper.cs", "RelativeDocumentMoniker": "wms\\LocationHelper.cs", @@ -76,39 +110,39 @@ }, { "$type": "Document", - "DocumentIndex": 3, + "DocumentIndex": 7, "Title": "WCSHelper.cs", "DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\HH-0035_HeFeiLiaoTongAGV\\HH.WCS.Mobox3\\HH.WCS.Mobox3.JiaTong\\wms\\WCSHelper.cs", "RelativeDocumentMoniker": "wms\\WCSHelper.cs", "ToolTip": "D:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\HH-0035_HeFeiLiaoTongAGV\\HH.WCS.Mobox3\\HH.WCS.Mobox3.JiaTong\\wms\\WCSHelper.cs", "RelativeToolTip": "wms\\WCSHelper.cs", - "ViewState": "AgIAACwAAAAAAAAAAAAtwEEAAAAJAAAAAAAAAA==", + "ViewState": "AgIAADcAAAAAAAAAAAAvwEAAAAAgAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-05-16T02:38:08.426Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 0, + "DocumentIndex": 6, "Title": "DeviceProcess.cs", "DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\HH-0035_HeFeiLiaoTongAGV\\HH.WCS.Mobox3\\HH.WCS.Mobox3.JiaTong\\process\\DeviceProcess.cs", "RelativeDocumentMoniker": "process\\DeviceProcess.cs", "ToolTip": "D:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\HH-0035_HeFeiLiaoTongAGV\\HH.WCS.Mobox3\\HH.WCS.Mobox3.JiaTong\\process\\DeviceProcess.cs", "RelativeToolTip": "process\\DeviceProcess.cs", - "ViewState": "AgIAAB8AAAAAAAAAAAAAwDMAAAAWAAAAAAAAAA==", + "ViewState": "AgIAAFIAAAAAAAAAAADgv2EAAAAZAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-05-16T02:36:49.555Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 5, + "DocumentIndex": 0, "Title": "ApiHelper.cs", "DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\HH-0035_HeFeiLiaoTongAGV\\HH.WCS.Mobox3\\HH.WCS.Mobox3.JiaTong\\api\\ApiHelper.cs", "RelativeDocumentMoniker": "api\\ApiHelper.cs", "ToolTip": "D:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\HH-0035_HeFeiLiaoTongAGV\\HH.WCS.Mobox3\\HH.WCS.Mobox3.JiaTong\\api\\ApiHelper.cs", "RelativeToolTip": "api\\ApiHelper.cs", - "ViewState": "AgIAABAEAAAAAAAAAADwvysEAAAyAAAAAAAAAA==", + "ViewState": "AgIAAJUCAAAAAAAAAADgv8kCAAAXAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-05-16T00:57:25.72Z", "EditorCaption": "" @@ -126,8 +160,38 @@ "Name": "ST:130:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" }, { + "$type": "Bookmark", + "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}" + }, + { "$type": "Document", - "DocumentIndex": 7, + "DocumentIndex": 4, + "Title": "MesController.cs", + "DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\HH-0035_HeFeiLiaoTongAGV\\HH.WCS.Mobox3\\HH.WCS.Mobox3.JiaTong\\api\\MesController.cs", + "RelativeDocumentMoniker": "api\\MesController.cs", + "ToolTip": "D:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\HH-0035_HeFeiLiaoTongAGV\\HH.WCS.Mobox3\\HH.WCS.Mobox3.JiaTong\\api\\MesController.cs", + "RelativeToolTip": "api\\MesController.cs", + "ViewState": "AgIAABMAAAAAAAAAAAAxwCsAAAAkAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-05-15T08:45:16.362Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 3, + "Title": "LiKuController.cs", + "DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\HH-0035_HeFeiLiaoTongAGV\\HH.WCS.Mobox3\\HH.WCS.Mobox3.JiaTong\\api\\LiKuController.cs", + "RelativeDocumentMoniker": "api\\LiKuController.cs", + "ToolTip": "D:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\HH-0035_HeFeiLiaoTongAGV\\HH.WCS.Mobox3\\HH.WCS.Mobox3.JiaTong\\api\\LiKuController.cs", + "RelativeToolTip": "api\\LiKuController.cs", + "ViewState": "AgIAAAkAAAAAAAAAAADwvxYAAAAvAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-05-15T08:45:06.1Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 10, "Title": "DebugController.cs", "DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\HH-0035_HeFeiLiaoTongAGV\\HH.WCS.Mobox3\\HH.WCS.Mobox3.JiaTong\\api\\DebugController.cs", "RelativeDocumentMoniker": "api\\DebugController.cs", @@ -139,38 +203,13 @@ }, { "$type": "Document", - "DocumentIndex": 6, - "Title": "MesController.cs", - "DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\HH-0035_HeFeiLiaoTongAGV\\HH.WCS.Mobox3\\HH.WCS.Mobox3.JiaTong\\api\\MesController.cs", - "RelativeDocumentMoniker": "api\\MesController.cs", - "ToolTip": "D:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\HH-0035_HeFeiLiaoTongAGV\\HH.WCS.Mobox3\\HH.WCS.Mobox3.JiaTong\\api\\MesController.cs", - "RelativeToolTip": "api\\MesController.cs", - "ViewState": "AgIAAGUAAAAAAAAAAAAQwHIAAAAoAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-15T08:45:16.362Z", - "EditorCaption": "" - }, - { - "$type": "Document", "DocumentIndex": 8, - "Title": "LiKuController.cs", - "DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\HH-0035_HeFeiLiaoTongAGV\\HH.WCS.Mobox3\\HH.WCS.Mobox3.JiaTong\\api\\LiKuController.cs", - "RelativeDocumentMoniker": "api\\LiKuController.cs", - "ToolTip": "D:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\HH-0035_HeFeiLiaoTongAGV\\HH.WCS.Mobox3\\HH.WCS.Mobox3.JiaTong\\api\\LiKuController.cs", - "RelativeToolTip": "api\\LiKuController.cs", - "ViewState": "AgIAAAAAAAAAAAAAAADwvxYAAAAvAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-15T08:45:06.1Z" - }, - { - "$type": "Document", - "DocumentIndex": 1, "Title": "Program.cs", "DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\HH-0035_HeFeiLiaoTongAGV\\HH.WCS.Mobox3\\HH.WCS.Mobox3.JiaTong\\Program.cs", "RelativeDocumentMoniker": "Program.cs", "ToolTip": "D:\\01-\u6C49\u548C\u667A\u80FD\\007-\u5408\u80A5\u4F73\u901A\\HH-0035_HeFeiLiaoTongAGV\\HH.WCS.Mobox3\\HH.WCS.Mobox3.JiaTong\\Program.cs", "RelativeToolTip": "Program.cs", - "ViewState": "AgIAAFwAAAAAAAAAAAAUwG0AAAA5AAAAAAAAAA==", + "ViewState": "AgIAAFkAAAAAAAAAAAAawG0AAAAwAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-05-15T07:55:15.792Z", "EditorCaption": "" diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/ApiHelper.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/ApiHelper.cs index 9f1fc00..c9ea9be 100644 --- a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/ApiHelper.cs +++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/ApiHelper.cs @@ -173,6 +173,12 @@ } } + //鍒ゆ柇鏄惁鏄┖鎵樺洖搴�+ var CntrItem = db.Queryable<CntrItemDetail>().Where(a => a.S_CNTR_CODE.Trim() == CntrCode).First(); + if (CntrItem == null) + { + note = "绌烘墭鍥炲簱";//浜曟澗绌烘墭鍥炲簱锛岄渶瑕佷笌鍙犵洏鏈哄畨鍏ㄤ氦浜�+ } endloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == taskData.dropStation).First(); if (endloc != null) { @@ -508,6 +514,8 @@ } + + /// <summary> /// 棰勫搴撲换鍔$姸鎬佷笅鍙� /// </summary> @@ -668,7 +676,8 @@ string areacode = ""; try { - #region 鍒ゆ柇鎵樼洏缁戝畾璐т綅鏄惁鍜屼笅鍙戠粦瀹氳捣鐐圭浉鍚�+ + #region 鍒ゆ柇鎵樼洏缁戝畾璐т綅鏄惁鍜屼笅鍙戠粦瀹氳捣鐐圭浉鍚�濡傛灉娌$粦瀹氭墭鐩樺垯缁戝畾鎵樼洏 var CntrLoc = db.Queryable<LocCntrRel>().Where(a => a.S_CNTR_CODE.Trim() == model.Rfid).First(); if (CntrLoc != null) { @@ -683,11 +692,12 @@ } else { - LogHelper.Info($"ItemBack锛氬垱寤轰换鍔″け璐ワ紝鎵樼洏:{model.Rfid}鏈壘鍒扮粦瀹氳揣浣�); - result.code = "1"; - result.msg = $"鍒涘缓浠诲姟澶辫触锛屾墭鐩�{model.Rfid}鏈壘鍒扮粦瀹氳揣浣�; - AddErrorInfo("鏌ユ壘鎵樼洏璐т綅澶辫触", result.msg); - return result; + LocationHelper.BindingLoc(Start, new List<string> { model.Rfid }); + //LogHelper.Info($"ItemBack锛氬垱寤轰换鍔″け璐ワ紝鎵樼洏:{model.Rfid}鏈壘鍒扮粦瀹氳揣浣�); + //result.code = "1"; + //result.msg = $"鍒涘缓浠诲姟澶辫触锛屾墭鐩�{model.Rfid}鏈壘鍒扮粦瀹氳揣浣�; + //AddErrorInfo("鏌ユ壘鎵樼洏璐т綅澶辫触", result.msg); + //return result; } // Console.WriteLine("鏌ヨ璐т綅缁戝畾鍏崇郴"); //鍒ゆ柇鎵樼洏涓庤揣浣嶆槸鍚︽湁缁戝畾鍏崇郴锛屽鏋滄病鏈夊垯杩涜缁戝畾 @@ -713,7 +723,6 @@ //} #endregion - #region 鏍规嵁璧风偣璐т綅鐨勪粨搴撶紪鐮�鑾峰彇骞冲簱缂栫爜,骞惰绠楀叆搴撹揣浣� string End = ""; @@ -803,6 +812,7 @@ return result; } #endregion + return result; } catch (Exception ex) @@ -1033,7 +1043,7 @@ var dploc = db.Queryable<Location>().Where(a => a.S_NOTE.Trim() == "鍙犵洏" && a.N_LAYER == startloc.N_LAYER && a.S_WH_CODE.Trim() == startloc.S_WH_CODE).ToList(); if (dploc.Count > 0) { - // LogHelper.Info($"鑾峰彇鍙犵洏璐т綅:{JsonConvert.SerializeObject(dploc)}"); + // LogHelper.Info($"鑾峰彇鍙犵洏璐т綅:{JsonConvert.SerializeObject(dploc)}"); loc = dploc.FindAll(a => a.N_LOCK_STATE == 0 && a.N_CURRENT_NUM < 6).OrderByDescending(a => a.N_CURRENT_NUM).FirstOrDefault(); if (loc == null) { diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/MesController.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/MesController.cs index 89d7922..105eee9 100644 --- a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/MesController.cs +++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/MesController.cs @@ -198,11 +198,7 @@ foreach (var item in model.data) { result = ApiHelper.ClearLoc(item); } - - - return result; - } /// <summary> @@ -216,7 +212,6 @@ LogHelper.Info("ClearLoc Request锛� + JsonConvert.SerializeObject(model)); result = ApiHelper.CreatTask(model.data); - return result; } diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/core/WCSCore.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/core/WCSCore.cs index de656bc..2a03bd3 100644 --- a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/core/WCSCore.cs +++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/core/WCSCore.cs @@ -183,7 +183,7 @@ } if (!string.IsNullOrEmpty(url)) { - TaskProcess.OperateReq(model.task_no, model.state, url, model.forklift_no, model.ext_data, TN_Task.Z_TYPE); + TaskProcess.OperateReq(model,url, TN_Task); } else { diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/device/S7Helper.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/device/S7Helper.cs index daf817e..9ebdd29 100644 --- a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/device/S7Helper.cs +++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/device/S7Helper.cs @@ -67,8 +67,30 @@ //https://www.ad.siemens.com.cn/productportal/Prods/S7-1200_PLC_EASY_PLUS/SmartSMS/060.html //https://www.ad.siemens.com.cn/productportal/Prods/S7-1200_PLC_EASY_PLUS/07-Program/02-basic/01-Data_Type/09-String.html + /// <summary> + /// 鍚堣偉浣抽�璇诲彇鍙犵洏鏈�+ /// </summary> + /// <param name="pyl">鍋忕Щ閲忓湴鍧�紝浣抽�byte鍗犱綅鎵�互鍙互鐢ㄨ繖鏍锋柟寮忕洿鎺ヨ鍙栧啓鍏�DB200.DBX0.1</param> + /// <returns></returns> + public static int ReadDpj(string pyl) + { var plc = new Plc(CpuType.S71500, "192.168.1.1", 0, 1); + S7Helper.Link(plc); + return (int)plc.Read(pyl); + } + /// <summary> + /// 鍚堣偉浣抽�鍐欏叆鍙犵洏鏈�+ /// </summary> + /// <param name="pyl">鍋忕Щ閲忓湴鍧�紝浣抽�byte鍗犱綅鎵�互鍙互鐢ㄨ繖鏍锋柟寮忕洿鎺ヨ鍙栧啓鍏�DB200.DBX0.1</param> + /// <param name="value">鍐欏叆鍊�byte绫诲瀷鍙兘0 1</param> + /// <returns></returns> + public static int WriteDpj(string pyl,int value) + { + var plc = new Plc(CpuType.S71500, "192.168.1.1", 0, 1); + S7Helper.Link(plc); + return (int)plc.Write(pyl, value); + } internal static short[] ReadInt(string device, int db, int byteAddr, int count) { short[] result = null; try { @@ -115,8 +137,6 @@ } return result; } - - /// <summary> /// diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/DeviceProcess.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/DeviceProcess.cs index 83ce6c7..a153929 100644 --- a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/DeviceProcess.cs +++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/DeviceProcess.cs @@ -4,6 +4,7 @@ using HH.WCS.JiaTong.util; using HH.WCS.JiaTong.wms; using Newtonsoft.Json; +using S7.Net; using System; using System.Collections.Generic; using System.Linq; @@ -31,7 +32,7 @@ { if (data == "") { - // Traystacker(plc); + // Traystacker(plc); } } } @@ -45,7 +46,7 @@ /// <summary> /// 鍙犵洏鏈虹┖鎵樿繑鍥� /// </summary> - internal static void Traystacker(string loc,int qty) + internal static void Traystacker(string loc, int qty) { try { @@ -109,12 +110,14 @@ } internal static void KjTraffic() { + + var db = new SqlHelper<object>().GetInstance(); List<string> locs = new List<string>() { "PMDDW-001" }; var location = db.Queryable<Location>().Where(a => locs.Contains(a.S_CODE)).ToList(); if (location.Count > 0) { - // string cntrcode = ""; + // string cntrcode = ""; foreach (var item in location) { diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/TaskProcess.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/TaskProcess.cs index df349b2..4ecd908 100644 --- a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/TaskProcess.cs +++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/TaskProcess.cs @@ -1,5 +1,6 @@ 锘縰sing HH.WCS.JiaTong.api; using HH.WCS.JiaTong.core; +using HH.WCS.JiaTong.device; using HH.WCS.JiaTong.dispatch; using HH.WCS.JiaTong.LISTA.process; using HH.WCS.JiaTong.util; @@ -12,6 +13,7 @@ using System.IdentityModel.Protocols.WSTrust; using System.Linq; using System.Security.Cryptography; +using static HH.WCS.JiaTong.api.ApiModel; using static HH.WCS.JiaTong.LISTA.process.HttpModel; namespace HH.WCS.JiaTong.process @@ -71,27 +73,26 @@ /// <summary> /// 瀹夊叏璇锋眰 /// </summary> - /// <param name="no"></param> - /// <param name="state"></param> - /// <param name="forkliftNo"></param> - /// <param name="extData"></param> - internal static void OperateReq(string no, int state, string url, string forkliftNo, string extData, int Z_type) + /// <param name="model"></param> + /// <param name="url"></param> + /// <param name="wcs"></param> + internal static void OperateReq(AgvTaskState model, string url, WCSTask TN_Task) { try { LogHelper.Info($"-------寮�瀹夊叏璇锋眰------"); - var TN_Task = WCSHelper.GetTask(no); + if (TN_Task != null) { int type = 0; string loc = ""; - if (state == 1101) + if (model.state == 1101) { //璇锋眰鍙栬揣锛� type = 1; loc = TN_Task.S_START_LOC; - if (Z_type == 4) + if (TN_Task.Z_TYPE == 4)//鍘熸潗鏂欏簱鍥借嚜瀹夊叏浜や簰 { if (GZOperateReqByPost(url, TN_Task.S_EQ_NO, loc, type)) { @@ -101,19 +102,31 @@ } else { - if (OperateReqByPost(url, TN_Task.S_EQ_NO, TN_Task.S_CODE, loc, type, state)) + //浜曟澗鍙犵洏鏈哄畨鍏ㄤ氦浜�+ if (TN_Task.Z_TYPE == 2&& TN_Task.S_NOTE=="绌烘墭鍥炲簱") { - // NDCHelper.ChangeParam(TN_Task.S_CODE.Trim(), 1101, 18); - NDCApi.ChangeOrderParam(TN_Task.S_CODE.Trim(), 6, "1"); + if (S7Helper.ReadDpj("DB200.DBX0.4")==1) + { + NDCApi.ChangeOrderParam(TN_Task.S_CODE.Trim(), 6, "1"); + } } + else + { + if (OperateReqByPost(url, TN_Task.S_EQ_NO, TN_Task.S_CODE, loc, type, model.state)) + { + // NDCHelper.ChangeParam(TN_Task.S_CODE.Trim(), 1101, 18); + NDCApi.ChangeOrderParam(TN_Task.S_CODE.Trim(), 6, "1"); + } + } + } } - if (state == 1102) + if (model.state == 1102) { type = 3; - if (Z_type == 4) + if (TN_Task.Z_TYPE == 4)//鍘熸潗鏂欏簱鍥借嚜瀹夊叏浜や簰 { loc = TN_Task.S_START_LOC; if (GZOperateReqByPost(url, TN_Task.S_EQ_NO, loc, type)) @@ -121,13 +134,17 @@ //NDCHelper.ChangeParam(TN_Task.S_CODE.Trim(), 1101, 18); } } + if (TN_Task.Z_TYPE == 2 && TN_Task.S_NOTE == "绌烘墭鍥炲簱") + { + S7Helper.WriteDpj("DB100.DBX0.1",1); + } } - if (state == 1103) + if (model.state == 1103) { //璇锋眰鍗歌揣 type = 2; loc = TN_Task.S_END_LOC; - if (Z_type == 4) + if (TN_Task.Z_TYPE == 4)//鍘熸潗鏂欏簱鍥借嚜瀹夊叏浜や簰 { loc = TN_Task.S_END_LOC; if (GZOperateReqByPost(url, TN_Task.S_EQ_NO, loc, type)) @@ -138,18 +155,16 @@ } else { - if (OperateReqByPost(url, TN_Task.S_EQ_NO, TN_Task.S_CODE, loc, type, state)) + if (OperateReqByPost(url, TN_Task.S_EQ_NO, TN_Task.S_CODE, loc, type, model.state)) { NDCApi.ChangeOrderParam(TN_Task.S_CODE.Trim(), 6, "1"); } } - - } - if (state == 1104) + if (model.state == 1104) { type = 4; - if (Z_type == 4) + if (TN_Task.Z_TYPE == 4)//鍘熸潗鏂欏簱鍥借嚜瀹夊叏浜や簰 { loc = TN_Task.S_END_LOC; if (GZOperateReqByPost(url, TN_Task.S_EQ_NO, loc, type)) @@ -159,10 +174,7 @@ } } } - else - { - LogHelper.Info($"瀹夊叏璇锋眰==銆嬫牴鎹换鍔″彿{no}鏈壘鍒板搴斾换鍔�); - } + } catch (Exception ex) { -- Gitblit v1.9.1