From 3a56820d028e98ac3c4bd315aa76181d7d6720cd Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期一, 28 七月 2025 17:29:57 +0800
Subject: [PATCH] 金坛二合一出库修改
---
wms/LocationHelper.cs | 29 +
core/Monitor.cs | 6
.vs/HH.WCS.ZhongCeJinTan/v17/DocumentLayout.backup.json | 315 +++++++++++++-------------
dispatch/WcsTask.cs | 7
util/LogHelper.cs | 2
.vs/HH.WCS.ZhongCeJinTan/v17/DocumentLayout.json | 306 ++++++++++++------------
process/TaskProcess.cs | 13
api/MoboxController.cs | 9
api/WmsController.cs | 8
9 files changed, 357 insertions(+), 338 deletions(-)
diff --git a/.vs/HH.WCS.ZhongCeJinTan/v17/DocumentLayout.backup.json b/.vs/HH.WCS.ZhongCeJinTan/v17/DocumentLayout.backup.json
index 44dabff..82252e5 100644
--- a/.vs/HH.WCS.ZhongCeJinTan/v17/DocumentLayout.backup.json
+++ b/.vs/HH.WCS.ZhongCeJinTan/v17/DocumentLayout.backup.json
@@ -7,44 +7,56 @@
"RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:process\\taskprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
- "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\wmscontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:api\\wmscontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|c:\\users\\29562\\source\\repos\\hh-0129_zhongcejintan\\api\\moboxcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:api\\moboxcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\wcscontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:api\\wcscontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\dispatch\\wcstask.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:dispatch\\wcstask.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\core\\monitor.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|c:\\users\\29562\\source\\repos\\hh-0129_zhongcejintan\\core\\monitor.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:core\\monitor.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\process\\deviceprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:process\\deviceprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\core\\taskcore.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:core\\taskcore.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
+ "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\locationhelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:wms\\locationhelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\process\\deviceprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:process\\deviceprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\dispatch\\wcstask.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:dispatch\\wcstask.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\wmscontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:api\\wmscontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\moboxcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:api\\moboxcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
"AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\taskhelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:wms\\taskhelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
- "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\config\\config.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}",
- "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:config\\config.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}"
+ "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\wcscontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:api\\wcscontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\wmsmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:wms\\wmsmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\apimodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:api\\apimodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\agvcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:api\\agvcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\config\\config.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}",
+ "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:config\\config.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}"
},
{
"AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\dispatch\\ndcapi.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
@@ -53,18 +65,6 @@
{
"AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\util\\loghelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:util\\loghelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\wmsmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:wms\\wmsmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\locationhelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:wms\\locationhelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\agvcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:api\\agvcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
@@ -118,7 +118,7 @@
"DocumentGroups": [
{
"DockedHeight": 387,
- "SelectedChildIndex": 3,
+ "SelectedChildIndex": 8,
"Children": [
{
"$type": "Bookmark",
@@ -134,28 +134,93 @@
},
{
"$type": "Document",
+ "DocumentIndex": 1,
+ "Title": "Monitor.cs",
+ "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\core\\Monitor.cs",
+ "RelativeDocumentMoniker": "core\\Monitor.cs",
+ "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\core\\Monitor.cs*",
+ "RelativeToolTip": "core\\Monitor.cs*",
+ "ViewState": "AgIAAL8AAAAAAAAAAADgv+IAAABEAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-14T02:11:55.478Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 9,
+ "Title": "WcsController.cs",
+ "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\WcsController.cs",
+ "RelativeDocumentMoniker": "api\\WcsController.cs",
+ "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\WcsController.cs",
+ "RelativeToolTip": "api\\WcsController.cs",
+ "ViewState": "AgIAAAkAAAAAAAAAAAAAABwAAAApAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-06-30T05:56:36.418Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 5,
+ "Title": "WcsTask.cs",
+ "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\dispatch\\WcsTask.cs",
+ "RelativeDocumentMoniker": "dispatch\\WcsTask.cs",
+ "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\dispatch\\WcsTask.cs*",
+ "RelativeToolTip": "dispatch\\WcsTask.cs*",
+ "ViewState": "AgIAAEUEAAAAAAAAAAAawFQEAAAbAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-13T09:19:48.409Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 3,
+ "Title": "LocationHelper.cs",
+ "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\LocationHelper.cs",
+ "RelativeDocumentMoniker": "wms\\LocationHelper.cs",
+ "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\LocationHelper.cs*",
+ "RelativeToolTip": "wms\\LocationHelper.cs*",
+ "ViewState": "AgIAADkHAAAAAAAAAAASwE8HAABUAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-13T09:13:15.283Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 10,
+ "Title": "WMSModel.cs",
+ "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\WMSModel.cs",
+ "RelativeDocumentMoniker": "wms\\WMSModel.cs",
+ "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\WMSModel.cs",
+ "RelativeToolTip": "wms\\WMSModel.cs",
+ "ViewState": "AgIAAF0DAAAAAAAAAAAEwHMDAAAOAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-12T09:36:05.064Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
"DocumentIndex": 0,
"Title": "TaskProcess.cs",
"DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\process\\TaskProcess.cs",
"RelativeDocumentMoniker": "process\\TaskProcess.cs",
"ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\process\\TaskProcess.cs*",
"RelativeToolTip": "process\\TaskProcess.cs*",
- "ViewState": "AgIAAIUEAAAAAAAAAAAhwHoEAAAZAAAAAAAAAA==",
+ "ViewState": "AgIAADMAAAAAAAAAAAAawEgAAAAdAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-13T00:45:23.095Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 5,
- "Title": "Monitor.cs",
- "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\core\\Monitor.cs",
- "RelativeDocumentMoniker": "core\\Monitor.cs",
- "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\core\\Monitor.cs",
- "RelativeToolTip": "core\\Monitor.cs",
- "ViewState": "AgIAAMMAAAAAAAAAAAAhwN8AAABOAAAAAAAAAA==",
+ "DocumentIndex": 6,
+ "Title": "WmsController.cs",
+ "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\WmsController.cs",
+ "RelativeDocumentMoniker": "api\\WmsController.cs",
+ "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\WmsController.cs",
+ "RelativeToolTip": "api\\WmsController.cs",
+ "ViewState": "AgIAABEAAAAAAAAAAAAwwCAAAAAlAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-14T02:11:55.478Z",
+ "WhenOpened": "2025-05-12T09:36:08.931Z",
"EditorCaption": ""
},
{
@@ -166,91 +231,78 @@
"RelativeDocumentMoniker": "wms\\TaskHelper.cs",
"ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\TaskHelper.cs",
"RelativeToolTip": "wms\\TaskHelper.cs",
- "ViewState": "AgIAAKQCAAAAAAAAAAAawLkCAABFAAAAAAAAAA==",
+ "ViewState": "AgIAAEgDAAAAAAAAAAAawFEDAAAVAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-14T02:35:57.671Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 1,
- "Title": "WmsController.cs",
- "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\WmsController.cs",
- "RelativeDocumentMoniker": "api\\WmsController.cs",
- "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\WmsController.cs",
- "RelativeToolTip": "api\\WmsController.cs",
- "ViewState": "AgIAADwAAAAAAAAAAAAYwE8AAAAmAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-12T09:36:08.931Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
"DocumentIndex": 7,
- "Title": "TaskCore.cs",
- "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\core\\TaskCore.cs",
- "RelativeDocumentMoniker": "core\\TaskCore.cs",
- "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\core\\TaskCore.cs",
- "RelativeToolTip": "core\\TaskCore.cs",
- "ViewState": "AgIAAHAAAAAAAAAAAAAlwKUAAAAjAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-13T01:45:08.835Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 2,
"Title": "MoboxController.cs",
"DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\MoboxController.cs",
"RelativeDocumentMoniker": "api\\MoboxController.cs",
- "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\MoboxController.cs",
- "RelativeToolTip": "api\\MoboxController.cs",
- "ViewState": "AgIAAAkAAAAAAAAAAAASwFAAAAA5AAAAAAAAAA==",
+ "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\MoboxController.cs*",
+ "RelativeToolTip": "api\\MoboxController.cs*",
+ "ViewState": "AgIAAPgAAAAAAAAAAAAtwEcBAAAkAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-20T00:59:46.638Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 3,
- "Title": "WcsController.cs",
- "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\WcsController.cs",
- "RelativeDocumentMoniker": "api\\WcsController.cs",
- "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\WcsController.cs",
- "RelativeToolTip": "api\\WcsController.cs",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAABwAAAAnAAAAAAAAAA==",
+ "DocumentIndex": 2,
+ "Title": "TaskCore.cs",
+ "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\core\\TaskCore.cs",
+ "RelativeDocumentMoniker": "core\\TaskCore.cs",
+ "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\core\\TaskCore.cs",
+ "RelativeToolTip": "core\\TaskCore.cs",
+ "ViewState": "AgIAABIAAAAAAAAAAAAtwKUAAAAjAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-06-30T05:56:36.418Z",
+ "WhenOpened": "2025-05-13T01:45:08.835Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 4,
- "Title": "WcsTask.cs",
- "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\dispatch\\WcsTask.cs",
- "RelativeDocumentMoniker": "dispatch\\WcsTask.cs",
- "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\dispatch\\WcsTask.cs",
- "RelativeToolTip": "dispatch\\WcsTask.cs",
- "ViewState": "AgIAADIDAAAAAAAAAAAhwFYDAAAFAAAAAAAAAA==",
+ "Title": "DeviceProcess.cs",
+ "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\process\\DeviceProcess.cs",
+ "RelativeDocumentMoniker": "process\\DeviceProcess.cs",
+ "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\process\\DeviceProcess.cs",
+ "RelativeToolTip": "process\\DeviceProcess.cs",
+ "ViewState": "AgIAAA8BAAAAAAAAAAAhwBYBAAAdAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-13T09:19:48.409Z",
+ "WhenOpened": "2025-05-13T09:22:54.115Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 11,
+ "Title": "ApiModel.cs",
+ "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\ApiModel.cs",
+ "RelativeDocumentMoniker": "api\\ApiModel.cs",
+ "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\ApiModel.cs",
+ "RelativeToolTip": "api\\ApiModel.cs",
+ "ViewState": "AgIAAC0CAAAAAAAAAAASwDMCAAAVAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-14T02:39:17.635Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 12,
- "Title": "LogHelper.cs",
- "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\util\\LogHelper.cs",
- "RelativeDocumentMoniker": "util\\LogHelper.cs",
- "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\util\\LogHelper.cs",
- "RelativeToolTip": "util\\LogHelper.cs",
- "ViewState": "AgIAADcAAAAAAAAAAAAnwFcAAABiAQAAAAAAAA==",
+ "Title": "AgvController.cs",
+ "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\AgvController.cs",
+ "RelativeDocumentMoniker": "api\\AgvController.cs",
+ "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\AgvController.cs",
+ "RelativeToolTip": "api\\AgvController.cs",
+ "ViewState": "AgIAAAEAAAAAAAAAAAASwBoAAAAkAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-29T07:39:06.007Z"
+ "WhenOpened": "2025-05-13T03:17:31.542Z"
},
{
"$type": "Document",
- "DocumentIndex": 11,
+ "DocumentIndex": 14,
"Title": "NDCApi.cs",
"DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\dispatch\\NDCApi.cs",
"RelativeDocumentMoniker": "dispatch\\NDCApi.cs",
@@ -262,32 +314,19 @@
},
{
"$type": "Document",
- "DocumentIndex": 10,
- "Title": "ApiModel.cs",
- "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\ApiModel.cs",
- "RelativeDocumentMoniker": "api\\ApiModel.cs",
- "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\ApiModel.cs",
- "RelativeToolTip": "api\\ApiModel.cs",
- "ViewState": "AgIAAG4AAAAAAAAAAIA8wIIAAAAgAAAAAAAAAA==",
+ "DocumentIndex": 15,
+ "Title": "LogHelper.cs",
+ "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\util\\LogHelper.cs",
+ "RelativeDocumentMoniker": "util\\LogHelper.cs",
+ "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\util\\LogHelper.cs",
+ "RelativeToolTip": "util\\LogHelper.cs",
+ "ViewState": "AgIAADcAAAAAAAAAAAAnwFcAAABiAQAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-14T02:39:17.635Z"
+ "WhenOpened": "2025-05-29T07:39:06.007Z"
},
{
"$type": "Document",
- "DocumentIndex": 6,
- "Title": "DeviceProcess.cs",
- "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\process\\DeviceProcess.cs",
- "RelativeDocumentMoniker": "process\\DeviceProcess.cs",
- "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\process\\DeviceProcess.cs",
- "RelativeToolTip": "process\\DeviceProcess.cs",
- "ViewState": "AgIAAAEBAAAAAAAAAAApwJ4AAAAdAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-13T09:22:54.115Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 9,
+ "DocumentIndex": 13,
"Title": "config.json",
"DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\config\\config.json",
"RelativeDocumentMoniker": "config\\config.json",
@@ -296,42 +335,6 @@
"ViewState": "AgIAAEsAAAAAAAAAAAAAAGcAAAAFAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|",
"WhenOpened": "2025-05-13T02:21:47.086Z"
- },
- {
- "$type": "Document",
- "DocumentIndex": 13,
- "Title": "WMSModel.cs",
- "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\WMSModel.cs",
- "RelativeDocumentMoniker": "wms\\WMSModel.cs",
- "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\WMSModel.cs",
- "RelativeToolTip": "wms\\WMSModel.cs",
- "ViewState": "AgIAANABAAAAAAAAAADgv+IBAAATAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-12T09:36:05.064Z"
- },
- {
- "$type": "Document",
- "DocumentIndex": 14,
- "Title": "LocationHelper.cs",
- "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\LocationHelper.cs",
- "RelativeDocumentMoniker": "wms\\LocationHelper.cs",
- "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\LocationHelper.cs",
- "RelativeToolTip": "wms\\LocationHelper.cs",
- "ViewState": "AgIAADQHAAAAAAAAAAAhwEoHAAAbAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-13T09:13:15.283Z"
- },
- {
- "$type": "Document",
- "DocumentIndex": 15,
- "Title": "AgvController.cs",
- "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\AgvController.cs",
- "RelativeDocumentMoniker": "api\\AgvController.cs",
- "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\AgvController.cs",
- "RelativeToolTip": "api\\AgvController.cs",
- "ViewState": "AgIAAAEAAAAAAAAAAAASwBoAAAAkAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-13T03:17:31.542Z"
},
{
"$type": "Document",
diff --git a/.vs/HH.WCS.ZhongCeJinTan/v17/DocumentLayout.json b/.vs/HH.WCS.ZhongCeJinTan/v17/DocumentLayout.json
index e61d9d9..49dc255 100644
--- a/.vs/HH.WCS.ZhongCeJinTan/v17/DocumentLayout.json
+++ b/.vs/HH.WCS.ZhongCeJinTan/v17/DocumentLayout.json
@@ -3,12 +3,16 @@
"WorkspaceRootPath": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\",
"Documents": [
{
- "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\core\\monitor.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:core\\monitor.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\util\\loghelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:util\\loghelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\process\\taskprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:process\\taskprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|c:\\users\\29562\\source\\repos\\hh-0129_zhongcejintan\\core\\monitor.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:core\\monitor.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\core\\taskcore.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
@@ -19,16 +23,20 @@
"RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:wms\\locationhelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
- "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\wmscontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:api\\wmscontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\agvcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:api\\agvcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\process\\deviceprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:process\\deviceprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\dispatch\\wcstask.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:dispatch\\wcstask.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\wmscontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:api\\wmscontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\moboxcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:api\\moboxcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\taskhelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
@@ -39,32 +47,24 @@
"RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:api\\wcscontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
- "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|c:\\users\\29562\\source\\repos\\hh-0129_zhongcejintan\\api\\moboxcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:api\\moboxcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\process\\deviceprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:process\\deviceprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\config\\config.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}",
- "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:config\\config.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}"
+ "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\wmsmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:wms\\wmsmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\apimodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:api\\apimodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
+ "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\agvcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:api\\agvcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\config\\config.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}",
+ "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:config\\config.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}"
+ },
+ {
"AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\dispatch\\ndcapi.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:dispatch\\ndcapi.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\util\\loghelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:util\\loghelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\wmsmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:wms\\wmsmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
@@ -118,7 +118,7 @@
"DocumentGroups": [
{
"DockedHeight": 387,
- "SelectedChildIndex": 4,
+ "SelectedChildIndex": 14,
"Children": [
{
"$type": "Bookmark",
@@ -134,91 +134,26 @@
},
{
"$type": "Document",
- "DocumentIndex": 1,
- "Title": "TaskProcess.cs",
- "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\process\\TaskProcess.cs",
- "RelativeDocumentMoniker": "process\\TaskProcess.cs",
- "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\process\\TaskProcess.cs",
- "RelativeToolTip": "process\\TaskProcess.cs",
- "ViewState": "AgIAAOgAAAAAAAAAAAAawPEAAAAdAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-13T00:45:23.095Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 0,
+ "DocumentIndex": 2,
"Title": "Monitor.cs",
"DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\core\\Monitor.cs",
"RelativeDocumentMoniker": "core\\Monitor.cs",
"ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\core\\Monitor.cs",
"RelativeToolTip": "core\\Monitor.cs",
- "ViewState": "AgIAAIYBAAAAAAAAAAAowJwBAAAjAAAAAAAAAA==",
+ "ViewState": "AgIAAL8AAAAAAAAAAADgv+IAAABEAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-14T02:11:55.478Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 7,
- "Title": "TaskHelper.cs",
- "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\TaskHelper.cs",
- "RelativeDocumentMoniker": "wms\\TaskHelper.cs",
- "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\TaskHelper.cs",
- "RelativeToolTip": "wms\\TaskHelper.cs",
- "ViewState": "AgIAAM8CAAAAAAAAAAASwOUCAAAwAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-14T02:35:57.671Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 4,
- "Title": "WmsController.cs",
- "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\WmsController.cs",
- "RelativeDocumentMoniker": "api\\WmsController.cs",
- "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\WmsController.cs",
- "RelativeToolTip": "api\\WmsController.cs",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAACAAAAAoAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-12T09:36:08.931Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 2,
- "Title": "TaskCore.cs",
- "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\core\\TaskCore.cs",
- "RelativeDocumentMoniker": "core\\TaskCore.cs",
- "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\core\\TaskCore.cs",
- "RelativeToolTip": "core\\TaskCore.cs",
- "ViewState": "AgIAAIwAAAAAAAAAAAAtwKUAAAAjAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-13T01:45:08.835Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 9,
- "Title": "MoboxController.cs",
- "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\MoboxController.cs",
- "RelativeDocumentMoniker": "api\\MoboxController.cs",
- "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\MoboxController.cs",
- "RelativeToolTip": "api\\MoboxController.cs",
- "ViewState": "AgIAAAkAAAAAAAAAAAASwFAAAAA5AAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-20T00:59:46.638Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 8,
+ "DocumentIndex": 10,
"Title": "WcsController.cs",
"DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\WcsController.cs",
"RelativeDocumentMoniker": "api\\WcsController.cs",
"ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\WcsController.cs",
"RelativeToolTip": "api\\WcsController.cs",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAABwAAAAkAAAAAAAAAA==",
+ "ViewState": "AgIAAAkAAAAAAAAAAAAAABwAAAApAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-06-30T05:56:36.418Z",
"EditorCaption": ""
@@ -231,9 +166,126 @@
"RelativeDocumentMoniker": "dispatch\\WcsTask.cs",
"ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\dispatch\\WcsTask.cs",
"RelativeToolTip": "dispatch\\WcsTask.cs",
- "ViewState": "AgIAAF8CAAAAAAAAAAAhwH0CAABFAAAAAAAAAA==",
+ "ViewState": "AgIAAEUEAAAAAAAAAAAawFQEAAAbAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-13T09:19:48.409Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 4,
+ "Title": "LocationHelper.cs",
+ "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\LocationHelper.cs",
+ "RelativeDocumentMoniker": "wms\\LocationHelper.cs",
+ "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\LocationHelper.cs",
+ "RelativeToolTip": "wms\\LocationHelper.cs",
+ "ViewState": "AgIAADkHAAAAAAAAAAASwE8HAABUAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-13T09:13:15.283Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 11,
+ "Title": "WMSModel.cs",
+ "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\WMSModel.cs",
+ "RelativeDocumentMoniker": "wms\\WMSModel.cs",
+ "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\WMSModel.cs",
+ "RelativeToolTip": "wms\\WMSModel.cs",
+ "ViewState": "AgIAAF0DAAAAAAAAAAAEwHMDAAAOAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-12T09:36:05.064Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 1,
+ "Title": "TaskProcess.cs",
+ "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\process\\TaskProcess.cs",
+ "RelativeDocumentMoniker": "process\\TaskProcess.cs",
+ "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\process\\TaskProcess.cs",
+ "RelativeToolTip": "process\\TaskProcess.cs",
+ "ViewState": "AgIAADMAAAAAAAAAAAAawEkAAABLAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-13T00:45:23.095Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 7,
+ "Title": "WmsController.cs",
+ "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\WmsController.cs",
+ "RelativeDocumentMoniker": "api\\WmsController.cs",
+ "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\WmsController.cs",
+ "RelativeToolTip": "api\\WmsController.cs",
+ "ViewState": "AgIAABEAAAAAAAAAAAAwwCAAAAAlAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-12T09:36:08.931Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 9,
+ "Title": "TaskHelper.cs",
+ "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\TaskHelper.cs",
+ "RelativeDocumentMoniker": "wms\\TaskHelper.cs",
+ "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\TaskHelper.cs",
+ "RelativeToolTip": "wms\\TaskHelper.cs",
+ "ViewState": "AgIAAEgDAAAAAAAAAAAawFEDAAAVAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-14T02:35:57.671Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 8,
+ "Title": "MoboxController.cs",
+ "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\MoboxController.cs",
+ "RelativeDocumentMoniker": "api\\MoboxController.cs",
+ "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\MoboxController.cs",
+ "RelativeToolTip": "api\\MoboxController.cs",
+ "ViewState": "AgIAAPgAAAAAAAAAAAAtwEcBAAAkAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-20T00:59:46.638Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 3,
+ "Title": "TaskCore.cs",
+ "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\core\\TaskCore.cs",
+ "RelativeDocumentMoniker": "core\\TaskCore.cs",
+ "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\core\\TaskCore.cs",
+ "RelativeToolTip": "core\\TaskCore.cs",
+ "ViewState": "AgIAABIAAAAAAAAAAAAtwKUAAAAjAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-13T01:45:08.835Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 5,
+ "Title": "DeviceProcess.cs",
+ "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\process\\DeviceProcess.cs",
+ "RelativeDocumentMoniker": "process\\DeviceProcess.cs",
+ "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\process\\DeviceProcess.cs",
+ "RelativeToolTip": "process\\DeviceProcess.cs",
+ "ViewState": "AgIAAA8BAAAAAAAAAAAhwBYBAAAdAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-13T09:22:54.115Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 0,
+ "Title": "LogHelper.cs",
+ "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\util\\LogHelper.cs",
+ "RelativeDocumentMoniker": "util\\LogHelper.cs",
+ "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\util\\LogHelper.cs*",
+ "RelativeToolTip": "util\\LogHelper.cs*",
+ "ViewState": "AgIAADcAAAAAAAAAAAAnwFcAAABkAQAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-29T07:39:06.007Z",
"EditorCaption": ""
},
{
@@ -244,26 +296,14 @@
"RelativeDocumentMoniker": "api\\ApiModel.cs",
"ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\ApiModel.cs",
"RelativeToolTip": "api\\ApiModel.cs",
- "ViewState": "AgIAAG4AAAAAAAAAAIA8wIIAAAAgAAAAAAAAAA==",
+ "ViewState": "AgIAAC0CAAAAAAAAAAASwDMCAAAVAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-14T02:39:17.635Z"
- },
- {
- "$type": "Document",
- "DocumentIndex": 10,
- "Title": "DeviceProcess.cs",
- "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\process\\DeviceProcess.cs",
- "RelativeDocumentMoniker": "process\\DeviceProcess.cs",
- "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\process\\DeviceProcess.cs",
- "RelativeToolTip": "process\\DeviceProcess.cs",
- "ViewState": "AgIAAAEBAAAAAAAAAAApwJ4AAAAdAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-13T09:22:54.115Z",
+ "WhenOpened": "2025-05-14T02:39:17.635Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 5,
+ "DocumentIndex": 13,
"Title": "AgvController.cs",
"DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\AgvController.cs",
"RelativeDocumentMoniker": "api\\AgvController.cs",
@@ -271,25 +311,11 @@
"RelativeToolTip": "api\\AgvController.cs",
"ViewState": "AgIAAAEAAAAAAAAAAAASwBoAAAAkAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-13T03:17:31.542Z",
- "EditorCaption": ""
+ "WhenOpened": "2025-05-13T03:17:31.542Z"
},
{
"$type": "Document",
- "DocumentIndex": 3,
- "Title": "LocationHelper.cs",
- "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\LocationHelper.cs",
- "RelativeDocumentMoniker": "wms\\LocationHelper.cs",
- "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\LocationHelper.cs",
- "RelativeToolTip": "wms\\LocationHelper.cs",
- "ViewState": "AgIAAFoCAAAAAAAAAAAhwHACAAAnAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-13T09:13:15.283Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 13,
+ "DocumentIndex": 15,
"Title": "NDCApi.cs",
"DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\dispatch\\NDCApi.cs",
"RelativeDocumentMoniker": "dispatch\\NDCApi.cs",
@@ -302,18 +328,6 @@
{
"$type": "Document",
"DocumentIndex": 14,
- "Title": "LogHelper.cs",
- "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\util\\LogHelper.cs",
- "RelativeDocumentMoniker": "util\\LogHelper.cs",
- "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\util\\LogHelper.cs",
- "RelativeToolTip": "util\\LogHelper.cs",
- "ViewState": "AgIAADcAAAAAAAAAAAAnwFcAAABiAQAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-29T07:39:06.007Z"
- },
- {
- "$type": "Document",
- "DocumentIndex": 11,
"Title": "config.json",
"DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\config\\config.json",
"RelativeDocumentMoniker": "config\\config.json",
@@ -322,18 +336,6 @@
"ViewState": "AgIAAEsAAAAAAAAAAAAAAGcAAAAFAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|",
"WhenOpened": "2025-05-13T02:21:47.086Z"
- },
- {
- "$type": "Document",
- "DocumentIndex": 15,
- "Title": "WMSModel.cs",
- "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\WMSModel.cs",
- "RelativeDocumentMoniker": "wms\\WMSModel.cs",
- "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\WMSModel.cs",
- "RelativeToolTip": "wms\\WMSModel.cs",
- "ViewState": "AgIAANABAAAAAAAAAADgv+IBAAATAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-12T09:36:05.064Z"
},
{
"$type": "Document",
diff --git a/api/MoboxController.cs b/api/MoboxController.cs
index fed9a2b..b9cbb86 100644
--- a/api/MoboxController.cs
+++ b/api/MoboxController.cs
@@ -230,6 +230,8 @@
{
TaskHelper.Fail(agvTask1);
NDCApi.CancelOrder(agvTask1.S_CODE.Trim());
+
+ LogHelper.Info($"CancelWcsTask鍙栨秷{model.TaskNo}锛岃В閿�, "瑙ｉ攣");
TaskProcess.CacheBitCancelUpdate(agvTask1);
}
}
@@ -432,7 +434,8 @@
LogHelper.Info("CompleteTask agv浠诲姟宸茬粡鍙栬揣瀹屾垚,浠诲姟寮哄埗瀹屾垚澶勭悊", "寮哄埗瀹屾垚");
TaskHelper.UpdateStatus(task, "鍗歌揣瀹屾垚");
- LocationHelper.UnLockLoc(task.S_END_LOC);
+
+ //LocationHelper.UnLockLoc(task.S_END_LOC);
TaskProcess.OperateStatus(task, 6);
//濡傛灉鏄簩娈典换鍔″垯涓嬪彂绔嬪簱浠诲姟
@@ -456,9 +459,9 @@
if (task.S_SCHEDULE_TYPE.Contains("wcs")) {
LogHelper.Info("CompleteTask wcs浠诲姟寮哄埗瀹屾垚澶勭悊", "寮哄埗瀹屾垚");
- LocationHelper.UnLockLoc(task.S_START_LOC);
+ //LocationHelper.UnLockLoc(task.S_START_LOC);
TaskProcess.OperateStatus(task, 4);
- LocationHelper.UnLockLoc(task.S_END_LOC);
+ //LocationHelper.UnLockLoc(task.S_END_LOC);
TaskProcess.OperateStatus(task, 6);
TaskHelper.End(task);
LocationHelper.CreateUpAndDown(task);
diff --git a/api/WmsController.cs b/api/WmsController.cs
index c5c7daa..23bbb1d 100644
--- a/api/WmsController.cs
+++ b/api/WmsController.cs
@@ -102,12 +102,12 @@
/// </summary>
/// <returns></returns>
[HttpPost]
- [Route("api/InventoryRecords")]
- public MesAreaSecItemReturn InventoryRecords(MesAreaSecItemParme model)
+ [Route("api/MesSecItem")]
+ public MesAreaSecItemReturn MesSecItem(MesAreaSecItemParme model)
{
- LogHelper.Info("InventoryRecords 鍙傛暟锛� + JsonConvert.SerializeObject(model), "鐗╂枡缁戝畾瑙ｇ粦");
+ LogHelper.Info("MesSecItem 鍙傛暟锛� + JsonConvert.SerializeObject(model), "鐗╂枡缁戝畾瑙ｇ粦");
var res = TaskProcess.MesAreaSecItem(model);
- LogHelper.Info("InventoryRecords 杩斿洖锛� + JsonConvert.SerializeObject(res), "鐗╂枡缁戝畾瑙ｇ粦");
+ LogHelper.Info("MesSecItem 杩斿洖锛� + JsonConvert.SerializeObject(res), "鐗╂枡缁戝畾瑙ｇ粦");
return res;
}
diff --git a/core/Monitor.cs b/core/Monitor.cs
index 5b937db..b65b40f 100644
--- a/core/Monitor.cs
+++ b/core/Monitor.cs
@@ -172,7 +172,7 @@
break;
case 4:
TaskHelper.UpdateStatus(wmsTask, "鍙栬揣瀹屾垚");
- LocationHelper.UnLockLoc(wmsTask.S_START_LOC);
+ //LocationHelper.UnLockLoc(wmsTask.S_START_LOC);
TaskProcess.OperateStatus(wmsTask, 4);
TaskHelper.opMesTask(wmsTask, 1);
break;
@@ -181,7 +181,7 @@
break;
case 6:
TaskHelper.UpdateStatus(wmsTask, "鍗歌揣瀹屾垚");
- LocationHelper.UnLockLoc(wmsTask.S_END_LOC);
+ //LocationHelper.UnLockLoc(wmsTask.S_END_LOC);
TaskProcess.OperateStatus(wmsTask, 6);
//濡傛灉鏄簩娈典换鍔″垯涓嬪彂绔嬪簱浠诲姟
@@ -413,7 +413,7 @@
//浜屽悎涓�簱鍖洪渶瑕佸尯鍒�
//瀵绘壘绔嬪簱鍖虹┖鎵�
- start = LocationHelper.FindStartcolByLoclistAndcntr(strrtList, workFlow.STARTAREA,workFlow.CONNECTION);
+ start = LocationHelper.FindStartcolByLoclistAndcntr(strrtList, workFlow.STARTAREA,workFlow.CONNECTION,workFlow.TOOLSTYPE);
LogHelper.Info($"绌烘墭{kt.task_no}鍑哄簱浠诲姟涓嬪彂璧风偣淇℃伅" + JsonConvert.SerializeObject(start), "绌烘墭鍑哄簱");
diff --git a/dispatch/WcsTask.cs b/dispatch/WcsTask.cs
index 9528c7f..2e50bb6 100644
--- a/dispatch/WcsTask.cs
+++ b/dispatch/WcsTask.cs
@@ -641,9 +641,7 @@
//浠诲姟瀹屾垚
case "2":
LogHelper.Info($"浠诲姟{taskNo}瀹屾垚", "Wcs浠诲姟鎵ц閫氱煡");
- LocationHelper.UnLockLoc(transportTask.S_START_LOC);
TaskProcess.OperateStatus(transportTask, 4);
- LocationHelper.UnLockLoc(transportTask.S_END_LOC);
TaskProcess.OperateStatus(transportTask, 6);
TaskHelper.End(transportTask);
LocationHelper.CreateUpAndDown(transportTask);
@@ -878,6 +876,8 @@
{
TaskHelper.Fail(agvTask1);
NDCApi.CancelOrder(agvTask1.S_CODE.Trim());
+
+ LogHelper.Info($"Wcs浠诲姟鎵ц閫氱煡锛屼换鍔″彿{transportTask.S_CODE}鍙栨秷,瑙ｉ攣", "瑙ｉ攣");
TaskProcess.CacheBitCancelUpdate(agvTask1);
}
}
@@ -1350,6 +1350,7 @@
{
LogHelper.Info($"浠诲姟鍙穥task.S_CODE},鍙栨秷浠诲姟鎴愬姛锛岃捣鐐箋task.S_START_LOC}璁句负寮傚父", "鍙栬揣鏃犺揣");
TaskHelper.Fail(task);
+
TaskProcess.OperateStatus(task, 7);
LocationHelper.updateLocLock(task.S_START_LOC, 3, "鍏朵粬閿�);
var agvTask = TaskHelper.GetTaskByWorkNo(task.S_OP_CODE, "agv");
@@ -1360,6 +1361,8 @@
NDCApi.CancelOrder(agvTask.S_CODE.Trim());
}
TaskHelper.Fail(agvTask);
+
+ LogHelper.Info($"鍙栬揣鏃犺揣锛屼换鍔″彿{task.S_CODE}鍙栨秷,瑙ｉ攣", "瑙ｉ攣");
TaskProcess.CacheBitCancelUpdate(agvTask);
}
}
diff --git a/process/TaskProcess.cs b/process/TaskProcess.cs
index 63905a7..475d1c8 100644
--- a/process/TaskProcess.cs
+++ b/process/TaskProcess.cs
@@ -54,13 +54,13 @@
if (load)
{
Console.WriteLine($"浠诲姟{mst.S_CODE} 璐т綅{mst.S_START_LOC}鍙栬揣瀹屾垚锛岃捣鐐硅В缁戝鍣▄mst.S_CNTR_CODE}");
- LogHelper.Info($"浠诲姟{mst.S_CODE} 璐т綅{mst.S_START_LOC}鍙栬揣瀹屾垚锛岃捣鐐硅В缁戝鍣▄mst.S_CNTR_CODE}");
+ LogHelper.Info($"浠诲姟{mst.S_CODE} 璐т綅{mst.S_START_LOC}鍙栬揣瀹屾垚锛岃捣鐐硅В缁戝鍣▄mst.S_CNTR_CODE}","瑙ｉ攣");
LocationHelper.UnBindingLoc(mst.S_START_LOC, mst.S_CNTR_CODE.Split(',').ToList());
}
else
{
Console.WriteLine($"浠诲姟{mst.S_CODE} 璐т綅{mst.S_END_LOC}鍗歌揣瀹屾垚锛岀粓鐐圭粦瀹氬鍣▄mst.S_CNTR_CODE}");
- LogHelper.Info($"浠诲姟{mst.S_CODE} 璐т綅{mst.S_END_LOC}鍗歌揣瀹屾垚锛岀粓鐐圭粦瀹氬鍣▄mst.S_CNTR_CODE}");
+ LogHelper.Info($"浠诲姟{mst.S_CODE} 璐т綅{mst.S_END_LOC}鍗歌揣瀹屾垚锛岀粓鐐圭粦瀹氬鍣▄mst.S_CNTR_CODE}","瑙ｉ攣");
LocationHelper.BindingLoc(mst.S_END_LOC, mst.S_CNTR_CODE.Split(',').ToList());
}
@@ -71,7 +71,7 @@
/// </summary>
/// <param name="mst"></param>
internal static void CacheBitCancelUpdate(WMSTask mst) {
-
+ LogHelper.Info($"CacheBitCancelUpdate瑙ｉ攣锛氫换鍔″彿锛歿mst.S_CODE}", "瑙ｉ攣");
LocationHelper.UnLockLoc(mst.S_START_LOC);
LocationHelper.UnLockLoc(mst.S_END_LOC);
@@ -245,9 +245,6 @@
try
{
-
-
-
//绌烘墭鍏ュ簱鍒ゆ柇绌烘墭鍑虹紦瀛樿〃锛屾湁瀵瑰簲璁板綍鐩存帴鏀归亾鍒扮紦瀛樿〃缁堢偣
if (workFlow.FLOWCODE=="3") {
var kt = db.Queryable<MesKtTask>().Where(e => e.TOOLS_TPYE==task.TOOLSTYPE && e.Status=="N").OrderBy(a=>a.CreateDate).First();
@@ -1023,6 +1020,8 @@
work.T_END_TIME = DateTime.Now;
var db = new SqlHelper<object>().GetInstance();
db.Updateable(work).UpdateColumns(it => new { it.N_B_STATE, it.S_B_STATE, it.T_MODIFY, it.T_END_TIME }).ExecuteCommand();
+
+ LogHelper.Info($"cancelTask1鍙栨秷{model.task_no}锛岃В閿�, "瑙ｉ攣");
LocationHelper.UnLockLoc(work.S_START_LOC);
LocationHelper.UnLockLoc(work.S_END_LOC);
if (!string.IsNullOrEmpty(work.CONNECTION))
@@ -1050,6 +1049,7 @@
//鏈墽琛岀洿鎺ヤ慨鏀圭姸鎬佷负鍙栨秷
TaskHelper.opMesTask(task, 3);
TaskHelper.Fail(task);
+
TaskProcess.CacheBitCancelUpdate(task);
ContainerHelper.delCntr(task.S_CNTR_CODE);
@@ -2193,6 +2193,7 @@
{
if (connection != "")
{
+ LogHelper.Info($"{operation.S_CODE}閿佽揣浣�, "涓婇攣");
LocationHelper.LockLoc(operation.S_START_LOC, "鍑哄簱閿�, 2);
LocationHelper.LockLoc(operation.S_END_LOC, "鍏ュ簱閿�, 1);
LocationHelper.LockLoc(operation.CONNECTION, "鍏朵粬閿�, 3);
diff --git a/util/LogHelper.cs b/util/LogHelper.cs
index a8b3e00..e531ed6 100644
--- a/util/LogHelper.cs
+++ b/util/LogHelper.cs
@@ -85,7 +85,7 @@
/// 閫氳繃閰嶇疆鏂囦欢閰嶇疆鏃ュ織
/// </summary>
static LogFactory() {
- var loggerNames = new List<string>() { "ModBus", "API", "HosttoagvTask", "浠诲姟","寮哄埗瀹屾垚","鐐瑰埌鐐�,"鍙栨秷", "NDC", "鐗╂枡缁戝畾瑙ｇ粦","淇敼鐗╂枡", "绔嬪簱", "鎶ヨ涓婃姤", "Mes浠诲姟涓嬪彂","鎺ラ┏浣�,"Wcs浠诲姟鎵ц閫氱煡","绔嬪簱涓嬪彂浠诲姟","绔嬪簱鍙栨秷浠诲姟","宸烽亾鍙敤涓婃姤","閫氱煡纭","agv鎵ц閫氱煡","瀹夊叏浜や簰","鏀捐揣鏈夎揣","鑳庨潰浜や簰","鏀归亾瀹夊叏浜や簰","涓婁笅鏋惰褰�,"Wcs涓嬪彂浠诲姟","闂ㄤ氦浜�,"HosttoagvCar", "閽夐拤閫氱煡","绌烘墭鍑哄簱", "鍏ュ簱浼樺厛绾�,"agv鍔ㄤ綔缂撳瓨","鍥炴姤Mes浠诲姟","鍙栬揣鏃犺揣","鏄惁鏈夎揣","Mobox鍙栨秷" };
+ var loggerNames = new List<string>() { "ModBus", "API", "HosttoagvTask", "浠诲姟","寮哄埗瀹屾垚","鐐瑰埌鐐�,"鍙栨秷", "NDC", "鐗╂枡缁戝畾瑙ｇ粦","淇敼鐗╂枡", "绔嬪簱", "鎶ヨ涓婃姤", "Mes浠诲姟涓嬪彂","鎺ラ┏浣�,"Wcs浠诲姟鎵ц閫氱煡","绔嬪簱涓嬪彂浠诲姟","绔嬪簱鍙栨秷浠诲姟","宸烽亾鍙敤涓婃姤","閫氱煡纭","agv鎵ц閫氱煡","瀹夊叏浜や簰","鏀捐揣鏈夎揣","鑳庨潰浜や簰","鏀归亾瀹夊叏浜や簰","涓婁笅鏋惰褰�,"Wcs涓嬪彂浠诲姟","闂ㄤ氦浜�,"HosttoagvCar", "閽夐拤閫氱煡","绌烘墭鍑哄簱", "鍏ュ簱浼樺厛绾�,"agv鍔ㄤ綔缂撳瓨","鍥炴姤Mes浠诲姟","鍙栬揣鏃犺揣","鏄惁鏈夎揣","Mobox鍙栨秷","瑙ｉ攣","涓婇攣" };
LogManager.Configuration = DefaultConfig(loggerNames);
}
public static ILogger CreateLogger(string name) {
diff --git a/wms/LocationHelper.cs b/wms/LocationHelper.cs
index ffadab0..6fdf323 100644
--- a/wms/LocationHelper.cs
+++ b/wms/LocationHelper.cs
@@ -12,6 +12,7 @@
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
+using System.Web.Services.Description;
using Top.Api;
using WebSocketSharp.Frame;
using static HH.WCS.ZhongCeJinTan.api.ApiModel;
@@ -818,7 +819,7 @@
foreach (var item in result)
{
- var loclist = lstTrueLocation.Where(o => o.N_ROADWAY == item.loc.N_ROADWAY && o.N_CURRENT_NUM==0 ).OrderBy(b => b.N_ROW).OrderBy(b => b.N_COL).OrderBy(b => b.N_LAYER).ToList();
+ var loclist = lstTrueLocation.Where(o => o.N_ROADWAY == item.loc.N_ROADWAY && o.N_CURRENT_NUM==0 && o.S_LOCK_STATE=="鏃�).OrderBy(b => b.N_ROW).OrderBy(b => b.N_COL).OrderBy(b => b.N_LAYER).ToList();
foreach (var item1 in loclist)
{
location_roadray.Add(item1);
@@ -1034,7 +1035,7 @@
/// </summary>
/// <param name="locations"></param>
/// <returns></returns>
- internal static Location FindStartcolByLoclistAndcntr(List<Location> locations,string startArea, string CONNECTION = "") {
+ internal static Location FindStartcolByLoclistAndcntr(List<Location> locations,string startArea, string CONNECTION = "",string cntrType="") {
var db = new SqlHelper<object>().GetInstance();
try
{
@@ -1103,8 +1104,8 @@
{
var tp1 = db.Queryable<Container>().Where(s => s.S_CODE == tp.S_CNTR_CODE).First();
- LogHelper.Info($"绌烘墭鑷姩鍑哄簱tp1淇℃伅"+JsonConvert.SerializeObject(tp1), "绌烘墭鍑哄簱");
- if (tp1 != null && tp1.N_DETAIL_COUNT==0)
+ LogHelper.Info($"绌烘墭鑷姩鍑哄簱,cntrType:{cntrType},tp1淇℃伅" +JsonConvert.SerializeObject(tp1), "绌烘墭鍑哄簱");
+ if (tp1 != null && tp1.N_DETAIL_COUNT==0 && tp1.S_TYPE== cntrType)
{
start = item;
break;
@@ -1851,6 +1852,8 @@
var res = false;
var db = new SqlHelper<object>().GetInstance();
var model = db.Queryable<Location>().Where(a => a.S_CODE == loc).First();
+ LogHelper.Info($"閿佽揣浣嶅弬鏁帮細loc:{loc},lockState:{lockState},lockNo:{lockNo}", "涓婇攣");
+ LogHelper.Info($"閿佽揣浣嶄俊鎭�+JsonConvert.SerializeObject(model), "涓婇攣");
if (model != null && model.S_LOCK_STATE.Trim() == "鏃�) {
model.S_LOCK_STATE = lockState;
model.N_LOCK_STATE = lockNo;
@@ -1865,7 +1868,8 @@
/// <param name="loc"></param>
/// <returns></returns>
public static bool UnLockLoc(string loc) {
- LogHelper.Info("UnLockLoc:" + loc);
+
+ LogHelper.Info($"UnLockLoc瑙ｉ攣璐т綅鍙傛暟锛歭oc:{loc},lockState:鏃�lockNo:0", "瑙ｉ攣");
var res = false;
var db = new SqlHelper<object>().GetInstance();
var model = db.Queryable<Location>().Where(a => a.S_CODE == loc).First();
@@ -1873,10 +1877,10 @@
model.S_LOCK_STATE = "鏃�;
model.N_LOCK_STATE = 0;
res = db.Updateable(model).UpdateColumns(it => new { it.S_LOCK_STATE, it.N_LOCK_STATE }).ExecuteCommand() > 0;
- LogHelper.Info("UnLockLoc:瑙ｉ攣缁撴灉" + res);
+ LogHelper.Info("UnLockLoc:瑙ｉ攣缁撴灉" + res, "瑙ｉ攣");
}
else {
- LogHelper.Info("UnLockLoc 澶辫触");
+ LogHelper.Info($"UnLockLoc锛宭oc:{loc} 澶辫触", "瑙ｉ攣");
}
return res;
}
@@ -2033,7 +2037,7 @@
/// <returns></returns>
public static bool UnBindingLoc(string loc, List<string> cntrs)
{
- LogHelper.Info($"UnBindingLoc淇℃伅:loc锛歿loc},cntrs:{cntrs}");
+ LogHelper.Info($"UnBindingLoc淇℃伅:loc锛歿loc},cntrs:{cntrs}","瑙ｉ攣");
var res = false;
var db = new SqlHelper<object>().GetInstance();
var location = db.Queryable<Location>().Where(a => a.S_CODE == loc).First();
@@ -2043,8 +2047,7 @@
var lcrList = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE == loc).ToList();
var count = db.Deleteable<LocCntrRel>().Where(it => cntrs.Contains(it.S_CNTR_CODE) && it.S_LOC_CODE == loc).ExecuteCommand();
- LogHelper.Info($"lcrList淇℃伅" + JsonConvert.SerializeObject(lcrList));
- LogHelper.Info($"count淇℃伅" + JsonConvert.SerializeObject(count));
+
location.N_CURRENT_NUM = lcrList.Count - count;
location.S_LOCK_STATE = "鏃�;
@@ -2052,6 +2055,7 @@
db.Updateable(location).UpdateColumns(it => new { it.N_CURRENT_NUM, it.S_LOCK_STATE, it.N_LOCK_STATE }).ExecuteCommand();
db.CommitTran();
+ LogHelper.Info($"UnBindingLoc瑙ｉ攣閿佽揣浣嶅弬鏁帮細loc:{loc},lockState:鏃�lockNo:0", "瑙ｉ攣");
res = true;
}
catch (Exception ex)
@@ -2069,6 +2073,7 @@
/// <returns></returns>
public static bool BindingLoc(string loc, List<string> cntrs)
{
+ LogHelper.Info($"BindingLoc淇℃伅:loc锛歿loc},cntrs:{cntrs}", "瑙ｉ攣");
var res = false;
var db = new SqlHelper<object>().GetInstance();
var location = db.Queryable<Location>().Where(a => a.S_CODE == loc).First();
@@ -2087,10 +2092,12 @@
location.N_CURRENT_NUM = lcrList.Count + count;
location.N_LOCK_STATE = 0;
location.S_LOCK_STATE = "鏃�;
-
+
db.Updateable(location).UpdateColumns(it => new { it.N_CURRENT_NUM, it.S_LOCK_STATE }).ExecuteCommand();
db.CommitTran();
+ LogHelper.Info($"BindingLoc瑙ｉ攣閿佽揣浣嶅弬鏁帮細loc:{loc},lockState:鏃�lockNo:0", "瑙ｉ攣");
+
res = true;
}
catch (Exception ex)
--
Gitblit v1.9.1