From 2efbd25f2160cb68cf2464f370aca3d1ea21f86f Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期三, 04 六月 2025 17:28:24 +0800
Subject: [PATCH] 入库优先级配置
---
wms/WMSModel.cs | 32 +++
wms/TaskHelper.cs | 62 +++++-
core/Monitor.cs | 11
core/TaskCore.cs | 10
.vs/HH.WCS.ZhongCeJinTan/v17/DocumentLayout.backup.json | 168 ++++++++--------
util/LogHelper.cs | 2
.vs/HH.WCS.ZhongCeJinTan/v17/DocumentLayout.json | 160 ++++++++--------
process/TaskProcess.cs | 49 ++++
api/MoboxController.cs | 63 +++++
9 files changed, 363 insertions(+), 194 deletions(-)
diff --git a/.vs/HH.WCS.ZhongCeJinTan/v17/DocumentLayout.backup.json b/.vs/HH.WCS.ZhongCeJinTan/v17/DocumentLayout.backup.json
index a096aaa..89df8e9 100644
--- a/.vs/HH.WCS.ZhongCeJinTan/v17/DocumentLayout.backup.json
+++ b/.vs/HH.WCS.ZhongCeJinTan/v17/DocumentLayout.backup.json
@@ -3,56 +3,60 @@
"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\\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\\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\\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\\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\\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\\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\\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\\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\\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\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:program.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\\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\\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\\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\\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\\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\\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\\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\\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\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:program.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\\startup.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:api\\startup.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\\process\\deviceprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
@@ -63,16 +67,12 @@
"RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:util\\settings.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\\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\\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\\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\\startup.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:api\\startup.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\\wcsmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
@@ -90,7 +90,7 @@
"DocumentGroups": [
{
"DockedWidth": 200,
- "SelectedChildIndex": 12,
+ "SelectedChildIndex": 18,
"Children": [
{
"$type": "Bookmark",
@@ -102,7 +102,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 12,
+ "DocumentIndex": 17,
"Title": "Startup.cs",
"DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\Startup.cs",
"RelativeDocumentMoniker": "api\\Startup.cs",
@@ -110,24 +110,24 @@
"RelativeToolTip": "api\\Startup.cs",
"ViewState": "AgIAAAAAAAAAAAAAAADwvwUAAAAAAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-30T00:50:07.591Z",
- "EditorCaption": ""
+ "WhenOpened": "2025-05-30T00:50:07.591Z"
},
{
"$type": "Document",
- "DocumentIndex": 15,
+ "DocumentIndex": 2,
"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": "AgIAAEEAAAAAAAAAAAAiwFcAAAA/AQAAAAAAAA==",
+ "ViewState": "AgIAAEEAAAAAAAAAAAAiwFcAAABIAQAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-29T07:39:06.007Z"
+ "WhenOpened": "2025-05-29T07:39:06.007Z",
+ "EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 9,
+ "DocumentIndex": 16,
"Title": "NDCApi.cs",
"DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\dispatch\\NDCApi.cs",
"RelativeDocumentMoniker": "dispatch\\NDCApi.cs",
@@ -135,30 +135,29 @@
"RelativeToolTip": "dispatch\\NDCApi.cs",
"ViewState": "AgIAAGYAAAAAAAAAAAAawHgAAAAxAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-27T06:31:46.399Z",
- "EditorCaption": ""
+ "WhenOpened": "2025-05-27T06:31:46.399Z"
},
{
"$type": "Document",
- "DocumentIndex": 14,
+ "DocumentIndex": 15,
"Title": "Settings.cs",
"DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\util\\Settings.cs",
"RelativeDocumentMoniker": "util\\Settings.cs",
"ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\util\\Settings.cs",
"RelativeToolTip": "util\\Settings.cs",
- "ViewState": "AgIAAB0AAAAAAAAAAAAhwDMAAAABAAAAAAAAAA==",
+ "ViewState": "AgIAAIwAAAAAAAAAAADgv6QAAAAXAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-22T02:36:21.595Z"
},
{
"$type": "Document",
- "DocumentIndex": 11,
+ "DocumentIndex": 12,
"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": "AgIAADYAAAAAAAAAAAAQwDAAAAAhAAAAAAAAAA==",
+ "ViewState": "AgIAAEQAAAAAAAAAAADgvzEAAAALAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-20T00:59:46.638Z",
"EditorCaption": ""
@@ -177,13 +176,13 @@
},
{
"$type": "Document",
- "DocumentIndex": 8,
+ "DocumentIndex": 11,
"Title": "Program.cs",
"DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\Program.cs",
"RelativeDocumentMoniker": "Program.cs",
"ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\Program.cs",
"RelativeToolTip": "Program.cs",
- "ViewState": "AgIAAFIAAAAAAAAAAAAawGwAAAAlAAAAAAAAAA==",
+ "ViewState": "AgIAAFIAAAAAAAAAAAAawF4AAAAuAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-14T08:30:12.949Z",
"EditorCaption": ""
@@ -202,153 +201,154 @@
},
{
"$type": "Document",
- "DocumentIndex": 17,
+ "DocumentIndex": 6,
"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": "AgIAAJAAAAAAAAAAAAAAwJsAAAAZAAAAAAAAAA==",
+ "ViewState": "AgIAALsDAAAAAAAAAADgv7gDAAAVAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-14T02:39:17.635Z"
+ "WhenOpened": "2025-05-14T02:39:17.635Z",
+ "EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 1,
+ "DocumentIndex": 3,
"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": "AgIAAG4CAAAAAAAAAAApwI0CAAA1AAAAAAAAAA==",
+ "ViewState": "AgIAAMIDAAAAAAAAAAApwNkDAAAkAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-14T02:35:57.671Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 0,
+ "DocumentIndex": 4,
"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": "AgIAAE8AAAAAAAAAAAAawG8AAAAmAAAAAAAAAA==",
+ "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\core\\Monitor.cs",
+ "RelativeToolTip": "core\\Monitor.cs",
+ "ViewState": "AgIAAE0AAAAAAAAAAAASwGkAAABQAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-14T02:11:55.478Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 13,
+ "DocumentIndex": 14,
"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": "AgIAABcBAAAAAAAAAAAgwO0AAAAnAAAAAAAAAA==",
+ "ViewState": "AgIAABYBAAAAAAAAAADgvzMBAABIAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-13T09:22:54.115Z"
},
{
"$type": "Document",
- "DocumentIndex": 16,
+ "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": "AgIAAC4CAAAAAAAAAAAQwEACAAAHAAAAAAAAAA==",
+ "ViewState": "AgIAAPwAAAAAAAAAAADgvxQBAABCAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-13T09:19:48.409Z"
+ "WhenOpened": "2025-05-13T09:19:48.409Z",
+ "EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 6,
+ "DocumentIndex": 10,
"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": "AgIAAFIAAAAAAAAAAAApwGkAAAAwAAAAAAAAAA==",
+ "ViewState": "AgIAAPIEAAAAAAAAAAApwAkFAAAbAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-13T09:13:15.283Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 10,
+ "DocumentIndex": 8,
"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": "AgIAAKIAAAAAAAAAAAAYwFEBAAAkAAAAAAAAAA==",
+ "ViewState": "AgIAABkAAAAAAAAAAAAhwBoAAAAZAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-13T03:17:31.542Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 4,
+ "DocumentIndex": 13,
"Title": "config.json",
"DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\config\\config.json",
"RelativeDocumentMoniker": "config\\config.json",
- "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\config\\config.json*",
- "RelativeToolTip": "config\\config.json*",
+ "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\config\\config.json",
+ "RelativeToolTip": "config\\config.json",
"ViewState": "AgIAAAAAAAAAAAAAAAAAAAsAAAAEAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|",
- "WhenOpened": "2025-05-13T02:21:47.086Z",
- "EditorCaption": ""
+ "WhenOpened": "2025-05-13T02:21:47.086Z"
},
{
"$type": "Document",
- "DocumentIndex": 3,
+ "DocumentIndex": 0,
"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": "AgIAABEAAAAAAAAAAADgvyQAAAAsAAAAAAAAAA==",
+ "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\core\\TaskCore.cs*",
+ "RelativeToolTip": "core\\TaskCore.cs*",
+ "ViewState": "AgIAAE0AAAAAAAAAAAAhwGYAAAAoAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-13T01:45:08.835Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 5,
+ "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": "AgIAAC8FAAAAAAAAAADgv04FAAAhAAAAAAAAAA==",
+ "ViewState": "AgIAAGwIAAAAAAAAAAAtwJ8IAAAuAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-13T00:45:23.095Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 7,
+ "DocumentIndex": 9,
"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": "AgIAAAAAAAAAAAAAAAAiwB8AAAAoAAAAAAAAAA==",
+ "ViewState": "AgIAAAUAAAAAAAAAAADgvx8AAAAnAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-12T09:36:08.931Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 2,
+ "DocumentIndex": 7,
"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": "AgIAAPoCAAAAAAAAAIA2wA8DAAAfAAAAAAAAAA==",
+ "ViewState": "AgIAAOoFAAAAAAAAAAAlwPQFAAARAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-12T09:36:05.064Z",
"EditorCaption": ""
diff --git a/.vs/HH.WCS.ZhongCeJinTan/v17/DocumentLayout.json b/.vs/HH.WCS.ZhongCeJinTan/v17/DocumentLayout.json
index b33e0c0..7964084 100644
--- a/.vs/HH.WCS.ZhongCeJinTan/v17/DocumentLayout.json
+++ b/.vs/HH.WCS.ZhongCeJinTan/v17/DocumentLayout.json
@@ -3,56 +3,60 @@
"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\\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\\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\\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\\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\\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\\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\\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\\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\\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\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:program.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\\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\\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\\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\\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\\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\\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\\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\\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\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:program.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\\startup.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:api\\startup.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\\process\\deviceprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
@@ -63,16 +67,12 @@
"RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:util\\settings.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\\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\\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\\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\\startup.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:api\\startup.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\\wcsmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
@@ -90,7 +90,7 @@
"DocumentGroups": [
{
"DockedWidth": 200,
- "SelectedChildIndex": 12,
+ "SelectedChildIndex": 18,
"Children": [
{
"$type": "Bookmark",
@@ -102,7 +102,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 12,
+ "DocumentIndex": 17,
"Title": "Startup.cs",
"DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\Startup.cs",
"RelativeDocumentMoniker": "api\\Startup.cs",
@@ -110,24 +110,24 @@
"RelativeToolTip": "api\\Startup.cs",
"ViewState": "AgIAAAAAAAAAAAAAAADwvwUAAAAAAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-30T00:50:07.591Z",
- "EditorCaption": ""
+ "WhenOpened": "2025-05-30T00:50:07.591Z"
},
{
"$type": "Document",
- "DocumentIndex": 15,
+ "DocumentIndex": 2,
"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": "AgIAAEEAAAAAAAAAAAAiwFcAAAA/AQAAAAAAAA==",
+ "ViewState": "AgIAAEEAAAAAAAAAAAAiwFcAAABIAQAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-29T07:39:06.007Z"
+ "WhenOpened": "2025-05-29T07:39:06.007Z",
+ "EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 9,
+ "DocumentIndex": 16,
"Title": "NDCApi.cs",
"DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\dispatch\\NDCApi.cs",
"RelativeDocumentMoniker": "dispatch\\NDCApi.cs",
@@ -135,30 +135,29 @@
"RelativeToolTip": "dispatch\\NDCApi.cs",
"ViewState": "AgIAAGYAAAAAAAAAAAAawHgAAAAxAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-27T06:31:46.399Z",
- "EditorCaption": ""
+ "WhenOpened": "2025-05-27T06:31:46.399Z"
},
{
"$type": "Document",
- "DocumentIndex": 14,
+ "DocumentIndex": 15,
"Title": "Settings.cs",
"DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\util\\Settings.cs",
"RelativeDocumentMoniker": "util\\Settings.cs",
"ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\util\\Settings.cs",
"RelativeToolTip": "util\\Settings.cs",
- "ViewState": "AgIAAB0AAAAAAAAAAAAhwDMAAAABAAAAAAAAAA==",
+ "ViewState": "AgIAAIwAAAAAAAAAAADgv6QAAAAXAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-22T02:36:21.595Z"
},
{
"$type": "Document",
- "DocumentIndex": 11,
+ "DocumentIndex": 12,
"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": "AgIAADYAAAAAAAAAAAAQwDAAAAAhAAAAAAAAAA==",
+ "ViewState": "AgIAAEQAAAAAAAAAAADgvzEAAAALAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-20T00:59:46.638Z",
"EditorCaption": ""
@@ -177,13 +176,13 @@
},
{
"$type": "Document",
- "DocumentIndex": 8,
+ "DocumentIndex": 11,
"Title": "Program.cs",
"DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\Program.cs",
"RelativeDocumentMoniker": "Program.cs",
"ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\Program.cs",
"RelativeToolTip": "Program.cs",
- "ViewState": "AgIAAFIAAAAAAAAAAAAawGwAAAAlAAAAAAAAAA==",
+ "ViewState": "AgIAAFIAAAAAAAAAAAAawF4AAAAuAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-14T08:30:12.949Z",
"EditorCaption": ""
@@ -202,95 +201,97 @@
},
{
"$type": "Document",
- "DocumentIndex": 17,
+ "DocumentIndex": 6,
"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": "AgIAAJAAAAAAAAAAAAAAwJsAAAAZAAAAAAAAAA==",
+ "ViewState": "AgIAALsDAAAAAAAAAADgv7gDAAAVAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-14T02:39:17.635Z"
+ "WhenOpened": "2025-05-14T02:39:17.635Z",
+ "EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 1,
+ "DocumentIndex": 3,
"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": "AgIAAG4CAAAAAAAAAAApwI0CAAA1AAAAAAAAAA==",
+ "ViewState": "AgIAAMIDAAAAAAAAAAApwNkDAAAkAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-14T02:35:57.671Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 0,
+ "DocumentIndex": 4,
"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": "AgIAAE8AAAAAAAAAAAAawHIAAAAAAAAAAAAAAA==",
+ "ViewState": "AgIAAE0AAAAAAAAAAAASwGkAAABQAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-14T02:11:55.478Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 13,
+ "DocumentIndex": 14,
"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": "AgIAABcBAAAAAAAAAAAgwO0AAAAnAAAAAAAAAA==",
+ "ViewState": "AgIAABYBAAAAAAAAAADgvzMBAABIAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-13T09:22:54.115Z"
},
{
"$type": "Document",
- "DocumentIndex": 16,
+ "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": "AgIAAC4CAAAAAAAAAAAQwEACAAAHAAAAAAAAAA==",
+ "ViewState": "AgIAAPwAAAAAAAAAAADgvxQBAABCAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-13T09:19:48.409Z"
+ "WhenOpened": "2025-05-13T09:19:48.409Z",
+ "EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 6,
+ "DocumentIndex": 10,
"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": "AgIAAFIAAAAAAAAAAAApwGkAAAAwAAAAAAAAAA==",
+ "ViewState": "AgIAAPIEAAAAAAAAAAApwAkFAAAbAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-13T09:13:15.283Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 10,
+ "DocumentIndex": 8,
"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": "AgIAAKIAAAAAAAAAAAAYwFEBAAAkAAAAAAAAAA==",
+ "ViewState": "AgIAABkAAAAAAAAAAAAhwBoAAAAZAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-13T03:17:31.542Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 4,
+ "DocumentIndex": 13,
"Title": "config.json",
"DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\config\\config.json",
"RelativeDocumentMoniker": "config\\config.json",
@@ -298,57 +299,56 @@
"RelativeToolTip": "config\\config.json",
"ViewState": "AgIAAAAAAAAAAAAAAAAAAAsAAAAEAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|",
- "WhenOpened": "2025-05-13T02:21:47.086Z",
- "EditorCaption": ""
+ "WhenOpened": "2025-05-13T02:21:47.086Z"
},
{
"$type": "Document",
- "DocumentIndex": 3,
+ "DocumentIndex": 0,
"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": "AgIAABEAAAAAAAAAAADgvyQAAAAsAAAAAAAAAA==",
+ "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\core\\TaskCore.cs*",
+ "RelativeToolTip": "core\\TaskCore.cs*",
+ "ViewState": "AgIAAD4AAAAAAAAAAAAhwGUAAAAlAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-13T01:45:08.835Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 5,
+ "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": "AgIAAC8FAAAAAAAAAADgv04FAAAhAAAAAAAAAA==",
+ "ViewState": "AgIAAGwIAAAAAAAAAAAtwJ8IAAAuAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-13T00:45:23.095Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 7,
+ "DocumentIndex": 9,
"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": "AgIAAAAAAAAAAAAAAAAiwB8AAAAoAAAAAAAAAA==",
+ "ViewState": "AgIAAAUAAAAAAAAAAADgvx8AAAAnAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-12T09:36:08.931Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 2,
+ "DocumentIndex": 7,
"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": "AgIAAPoCAAAAAAAAAIA2wA8DAAAfAAAAAAAAAA==",
+ "ViewState": "AgIAAOoFAAAAAAAAAAAlwPQFAAARAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-12T09:36:05.064Z",
"EditorCaption": ""
diff --git a/api/MoboxController.cs b/api/MoboxController.cs
index 08a5103..67ab716 100644
--- a/api/MoboxController.cs
+++ b/api/MoboxController.cs
@@ -3,7 +3,9 @@
using HH.WCS.ZhongCeJinTan.process;
using HH.WCS.ZhongCeJinTan.util;
using HH.WCS.ZhongCeJinTan.wms;
+using Newtonsoft.Json;
using System.Linq;
+using System.Threading.Tasks;
using System.Web.Http;
using static HH.WCS.ZhongCeJinTan.api.ApiModel;
@@ -12,7 +14,7 @@
/// <summary>
/// mobox璋冪敤
/// </summary>
- [RoutePrefix("mobox")]
+ //[RoutePrefix("mobox")]
public class MoboxController : System.Web.Http.ApiController
{
[HttpPost]
@@ -46,9 +48,10 @@
//浣滀笟浠诲姟寮哄埗瀹屾垚
[HttpPost]
- //[Route("CompleteTask")]
public SimpleResult CompleteTask(MoboxTaskBase model)
{
+ LogHelper.Info("CompleteTask 鍙傛暟锛� + JsonConvert.SerializeObject(model), "寮哄埗瀹屾垚");
+
var result = new SimpleResult();
var task = TaskHelper.GetTask(model.TaskNo);
if (task != null)
@@ -57,13 +60,55 @@
{
result.resultMsg = "浠诲姟鏈墽琛岋紝涓嶅厑璁稿己鍒跺畬鎴愶紒";
}
-
- else if (task.S_B_STATE.Trim() != "鏈墽琛�)
+ else if (task.S_B_STATE.Trim() != "瀹屾垚"&& task.S_B_STATE.Trim() != "鍙栨秷")
{
- //宸叉帹閫佷絾鏄病鏈夊畬鎴愭垨鑰呭彇娑堬紝閫氱煡hosttoagv
- TaskHelper.UpdateStatus(model.TaskNo.Trim(), "瀹屾垚");
-
-
+
+
+ if (task.S_SCHEDULE_TYPE.Contains("agv"))
+ {
+ //鐪嬪皬杞︽湁娌℃湁4鍙栬揣瀹屾垚
+ WmsTaskAction ac4 = TaskHelper.GetActionRecord(task.S_CODE, "4");
+ if (ac4 != null)
+ {
+
+ LogHelper.Info("CompleteTask agv浠诲姟宸茬粡鍙栬揣瀹屾垚,浠诲姟寮哄埗瀹屾垚澶勭悊", "寮哄埗瀹屾垚");
+
+
+ TaskHelper.UpdateStatus(task, "鍗歌揣瀹屾垚");
+ LocationHelper.UnLockLoc(task.S_END_LOC);
+ TaskProcess.OperateStatus(task, 6);
+
+ //濡傛灉鏄簩娈典换鍔″垯涓嬪彂绔嬪簱浠诲姟
+ var wcsTask = TaskHelper.GetTaskByState("鏈墽琛�, "wcs", task.S_OP_CODE, "鍏ュ簱");
+ if (wcsTask != null)
+ {
+ LocationHelper.LockLoc(wcsTask.S_START_LOC, "鍑哄簱閿�, 2);
+ WcsTask.WcsTaskEntity(wcsTask);
+ }
+ TaskHelper.End(task);
+ }
+ else
+ {
+
+ LogHelper.Info("CompleteTask agv浠诲姟娌℃湁鍙栬揣瀹屾垚,浠诲姟鍙栨秷澶勭悊", "寮哄埗瀹屾垚");
+ var cancle = new cancleTaskParme();
+ cancle.task_no = task.S_CODE;
+ TaskProcess.cancelTask1(cancle);
+ }
+ }
+
+
+ if (task.S_SCHEDULE_TYPE.Contains("wcs")) {
+ LogHelper.Info("CompleteTask wcs浠诲姟寮哄埗瀹屾垚澶勭悊", "寮哄埗瀹屾垚");
+ LocationHelper.UnLockLoc(task.S_START_LOC);
+ TaskProcess.OperateStatus(task, 4);
+ LocationHelper.UnLockLoc(task.S_END_LOC);
+ TaskProcess.OperateStatus(task, 6);
+ TaskHelper.End(task);
+ LocationHelper.CreateUpAndDown(task);
+ }
+
+
}
else
{
@@ -76,6 +121,8 @@
result.resultCode = 1;
result.resultMsg = "浠诲姟涓嶅瓨鍦�;
}
+
+ LogHelper.Info("CompleteTask 杩斿洖锛� + JsonConvert.SerializeObject(model), "寮哄埗瀹屾垚");
return result;
}
diff --git a/core/Monitor.cs b/core/Monitor.cs
index 0f3917c..7f9637f 100644
--- a/core/Monitor.cs
+++ b/core/Monitor.cs
@@ -176,8 +176,8 @@
- //鏌ユ壘璧风偣
- List<Location> strrtList;
+ //鏌ユ壘璧风偣
+ List<Location> strrtList;
Location start = null;
@@ -249,6 +249,12 @@
continue;
}
+
+
+ LocationHelper.LockLoc(start.S_CODE, "鍑哄簱閿�, 2);
+
+
+
//璧风偣缁堢偣鏌ユ壘鎴愬姛锛屽垱寤轰綔涓�
var taskType = int.Parse(workFlow.FLOWCODE);
@@ -304,7 +310,6 @@
}
catch (Exception ex)
{
-
LogHelper.Info($"绌烘墭鍑哄簱寮傚父淇℃伅" + ex.Message, "绌烘墭鍑哄簱");
}
}
diff --git a/core/TaskCore.cs b/core/TaskCore.cs
index 3108067..4d8e582 100644
--- a/core/TaskCore.cs
+++ b/core/TaskCore.cs
@@ -63,7 +63,11 @@
}
break;
case 2:
- TaskHelper.End(wmsTask);
+ //绌烘墭鍑烘垨鑰呮弧鎵樺嚭浠诲姟瀹屾垚鍒ゆ柇鏄惁瑕佹彁楂樺叆搴撲紭鍏堢骇
+
+ LogHelper.Info($"浠诲姟{wmsTask.S_CODE}瀹屾垚锛屽垽鏂叆搴撲紭鍏堢骇", "鍏ュ簱浼樺厛绾�);
+ TaskProcess.inPri(wmsTask);
+ TaskHelper.End(wmsTask);
break;
case 7:
@@ -95,8 +99,8 @@
TaskProcess.OperateStatus(wmsTask, 4);
ContainerHelper.delCntr(wmsTask.S_CNTR_CODE);
ContainerHelper.delCntrItem(wmsTask.S_CNTR_CODE);
- }
- break;
+ }
+ break;
}
TaskHelper.AddActionRecord(wmsTask.S_CODE, model.state, model.forklift_no, model.ext_data);
diff --git a/process/TaskProcess.cs b/process/TaskProcess.cs
index 251e35e..85f22b8 100644
--- a/process/TaskProcess.cs
+++ b/process/TaskProcess.cs
@@ -2161,13 +2161,56 @@
}
-
-
+
+ internal static void inPri(WMSTask mst)
+ {
+ LogHelper.Info($"浠诲姟{mst.S_CODE}杩涘叆inpri", "鍏ュ簱浼樺厛绾�);
+ var inprilist = TaskHelper.GetInPri();
+ var db = new SqlHelper<object>().GetInstance();
+
+ foreach (var item in inprilist)
+ {
+
+ LogHelper.Info("鍏ュ簱浼樺厛绾ц褰曚俊鎭�+JsonConvert.SerializeObject(item), "鍏ュ簱浼樺厛绾�);
+
+ if (item.Type=="0" && mst.S_TYPE.Contains("绌烘墭鍑�))
+ {
+ if (mst.S_END_LOC.Contains(item.OutEndLoc))
+ {
+
+ var task = db.Queryable<WMSTask>().Where(a => a.S_B_STATE.Trim() == "宸叉帹閫� && a.S_SCHEDULE_TYPE.Contains("agv") && !a.S_TYPE.Contains("绌烘墭") && (a.S_TYPE.Contains("鍏ュ簱")|| a.S_TYPE.Contains("鍥炲簱")) && a.S_START_LOC.Contains(item.InStartLoc)).First();
+
+ LogHelper.Info($"鏌ユ壘璧风偣{item.InStartLoc}婊℃墭鍏ュ簱浠诲姟淇℃伅锛� + JsonConvert.SerializeObject(task), "鍏ュ簱浼樺厛绾�);
+ if (task != null)
+ {
+ NDCApi.ChangeOrderPri(task.S_CODE, item.Pri);
+ }
+
+ }
+ }
+
+
+ if (item.Type == "1" && !mst.S_TYPE.Contains("绌烘墭") && mst.S_TYPE.Contains("鍑哄簱"))
+ {
+ if (mst.S_END_LOC.Contains(item.OutEndLoc))
+ {
+ var task = db.Queryable<WMSTask>().Where(a => a.S_B_STATE.Trim() == "宸叉帹閫� && a.S_SCHEDULE_TYPE.Contains("agv") && a.S_TYPE.Contains("绌烘墭鍏ュ簱") && a.S_START_LOC.Contains(item.InStartLoc)).First();
+ LogHelper.Info($"鏌ユ壘璧风偣{item.InStartLoc}绌烘墭鍏ュ簱浠诲姟淇℃伅锛� + JsonConvert.SerializeObject(task), "鍏ュ簱浼樺厛绾�);
+ if (task != null)
+ {
+ NDCApi.ChangeOrderPri(task.S_CODE, item.Pri);
+ }
+ }
+ }
+
+ }
+ LogHelper.Info($"浠诲姟{mst.S_CODE}锛岀粨鏉焛npri", "鍏ュ簱浼樺厛绾�);
+ }
-
+
public class signalInfo
diff --git a/util/LogHelper.cs b/util/LogHelper.cs
index 51aa6a8..74f6748 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", "閽夐拤閫氱煡", "绌烘墭鍑哄簱" };
+ var loggerNames = new List<string>() { "ModBus", "API", "HosttoagvTask", "浠诲姟","寮哄埗瀹屾垚","鐐瑰埌鐐�,"鍙栨秷", "NDC", "鐗╂枡缁戝畾瑙ｇ粦", "淇敼鐗╂枡", "绔嬪簱", "鎶ヨ涓婃姤", "Mes浠诲姟涓嬪彂", "鎺ラ┏浣�, "Wcs浠诲姟鎵ц閫氱煡 ", "绔嬪簱涓嬪彂浠诲姟", "绔嬪簱鍙栨秷浠诲姟", "宸烽亾鍙敤涓婃姤", "閫氱煡纭", "agv鎵ц閫氱煡", "瀹夊叏浜や簰", "鏀捐揣鏈夎揣", "鑳庨潰浜や簰", "鏀归亾瀹夊叏浜や簰", "涓婁笅鏋惰褰�, "Wcs涓嬪彂浠诲姟", "闂ㄤ氦浜�, "HosttoagvCar", "閽夐拤閫氱煡", "绌烘墭鍑哄簱", "鍏ュ簱浼樺厛绾� };
LogManager.Configuration = DefaultConfig(loggerNames);
}
public static ILogger CreateLogger(string name) {
diff --git a/wms/TaskHelper.cs b/wms/TaskHelper.cs
index 77bc78b..489a7b9 100644
--- a/wms/TaskHelper.cs
+++ b/wms/TaskHelper.cs
@@ -111,7 +111,7 @@
internal static WMSTask GetTaskByStartLoc(string loc)
{
var db = new SqlHelper<WMSTask>().GetInstance();
- var task = db.Queryable<WMSTask>().Where(a => a.S_START_LOC == loc && a.S_B_STATE != "瀹屾垚" && a.S_B_STATE != "鍙栨秷" && a.S_B_STATE != "澶辫触" && a.S_B_STATE != "宸插畬鎴� && a.S_B_STATE != "鏈墽琛�).OrderByDescending(b => b.T_CREATE).First();
+ var task = db.Queryable<WMSTask>().Where(a => a.S_START_LOC == loc && a.S_B_STATE != "瀹屾垚" && a.S_B_STATE != "鍙栨秷" && a.S_B_STATE != "澶辫触" && a.S_B_STATE != "宸插畬鎴�).OrderByDescending(b => b.T_CREATE).First();
return task;
}
/// <summary>
@@ -122,7 +122,7 @@
internal static WMSTask GetTaskByEndLoc(string loc)
{
var db = new SqlHelper<WMSTask>().GetInstance();
- var task = db.Queryable<WMSTask>().Where(a => a.S_END_LOC == loc && a.S_B_STATE != "瀹屾垚" && a.S_B_STATE != "鍙栨秷" && a.S_B_STATE != "澶辫触" && a.S_B_STATE != "宸插畬鎴� && a.S_B_STATE != "鏈墽琛�).OrderByDescending(b => b.T_CREATE).First();
+ var task = db.Queryable<WMSTask>().Where(a => a.S_END_LOC == loc && a.S_B_STATE != "瀹屾垚" && a.S_B_STATE != "鍙栨秷" && a.S_B_STATE != "澶辫触" && a.S_B_STATE != "宸插畬鎴�).OrderByDescending(b => b.T_CREATE).First();
return task;
}
@@ -722,16 +722,16 @@
if (task.S_TYPE.Contains("鍑哄簱") && task.S_SCHEDULE_TYPE.Contains("wcs")) {
LocationHelper.LockLoc(task.S_END_LOC, "鍑哄簱閿�, 2);
}
-
- //if (task.S_TYPE.Contains("鍑哄簱")&&task.S_SCHEDULE_TYPE.Contains("agv") )
- //{
- // var location = db.Queryable<Location>().Where(a => a.S_CODE == task.S_END_LOC).First();
- // location.N_CURRENT_NUM = 0;
- // db.Updateable(location).UpdateColumns(it => new { it.N_CURRENT_NUM}).ExecuteCommand();
- // db.Deleteable<Container>().Where(it => it.S_CODE == task.S_CNTR_CODE).ExecuteCommand();
- // db.Deleteable<LocCntrRel>().Where(it => it.S_CNTR_CODE == task.S_CNTR_CODE).ExecuteCommand();
- // db.Deleteable<CntrItemRel>().Where(it => it.S_CNTR_CODE == task.S_CNTR_CODE).ExecuteCommand();
- //}
+
+ if (task.S_TYPE.Contains("鍑哄簱") && task.S_SCHEDULE_TYPE.Contains("agv"))
+ {
+ var location = db.Queryable<Location>().Where(a => a.S_CODE == task.S_END_LOC).First();
+ location.N_CURRENT_NUM = 0;
+ db.Updateable(location).UpdateColumns(it => new { it.N_CURRENT_NUM }).ExecuteCommand();
+ db.Deleteable<Container>().Where(it => it.S_CODE == task.S_CNTR_CODE).ExecuteCommand();
+ db.Deleteable<LocCntrRel>().Where(it => it.S_CNTR_CODE == task.S_CNTR_CODE).ExecuteCommand();
+ db.Deleteable<CntrItemRel>().Where(it => it.S_CNTR_CODE == task.S_CNTR_CODE).ExecuteCommand();
+ }
}
@@ -861,6 +861,29 @@
}
+
+ /// <summary>
+ /// 鏍规嵁浠诲姟鐘舵�鍜岃捣鐐瑰拰绫诲瀷鏌ユ壘浠诲姟
+ /// </summary>
+ /// <param name="state"></param>
+ /// <returns></returns>
+ internal static WMSTask GetTaskByType(string start,string type,string state)
+ {
+ try
+ {
+ var db = new SqlHelper<object>().GetInstance();
+ return db.Queryable<WMSTask>().Where(a => a.S_B_STATE.Trim() == state && a.S_TYPE.Contains(type) && a.S_START_LOC.Contains(start)).First();
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Error(ex.Message, ex);
+ return new WMSTask();
+ }
+
+ }
+
+
+
/// <summary>
/// 鏍规嵁浣滀笟缂栫爜鍜岃澶囩被鍨嬭幏鍙栧崟涓换鍔� /// </summary>
@@ -954,5 +977,20 @@
return db.Queryable<UnlimitedLoc>().ToList();
}
+
+
+ /// <summary>
+ /// 鑾峰彇鍏ュ簱浼樺厛绾ц〃
+ /// </summary>
+ /// <returns></returns>
+ internal static List<InPri> GetInPri()
+ {
+
+ var db = new SqlHelper<object>().GetInstance();
+
+ return db.Queryable<InPri>().Where(a=>a.Enable=="Y") .ToList();
+ }
+
+
}
}
diff --git a/wms/WMSModel.cs b/wms/WMSModel.cs
index 27846a2..f0823d6 100644
--- a/wms/WMSModel.cs
+++ b/wms/WMSModel.cs
@@ -1518,5 +1518,37 @@
public string Loc { get; set; }
}
+ /// <summary>
+ /// 鍏ュ簱浼樺厛绾ц〃
+ /// </summary>
+ [ST("鍏ュ簱浼樺厛绾ц〃")]
+ public class InPri : BaseModel
+ {
+ /// <summary>
+ /// 鍑哄簱绫诲瀷 0绌烘墭鍑�1婊℃墭鍑� 婊℃墭鍑烘壘绌烘墭鍏� 绌烘墭鍑烘壘婊℃墭鍏�+ /// </summary>
+ public string Type { get; set; }
+
+ /// <summary>
+ /// 鍑哄簱浠诲姟缁堢偣
+ /// </summary>
+ public string OutEndLoc { get; set; }
+
+ /// <summary>
+ /// 鍏ュ簱浠诲姟璧风偣
+ /// </summary>
+ public string InStartLoc { get; set; }
+
+ /// <summary>
+ /// 鎻愰珮浼樺厛绾�+ /// </summary>
+ public int Pri { get; set; }
+
+ /// <summary>
+ /// 鍚敤 Y/N
+ /// </summary>
+ public string Enable { get; set; }
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.1