From 65ddd36c0036014ff656417767b4a9438efb76b1 Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期四, 15 五月 2025 17:32:31 +0800
Subject: [PATCH] bug处理
---
wms/WMSModel.cs | 21
wms/TaskHelper.cs | 6
wms/LocationHelper.cs | 3
core/TaskCore.cs | 15
.vs/HH.WCS.ZhongCeJinTan/v17/DocumentLayout.backup.json | 401 +++++++++++-----------
dispatch/WcsTask.cs | 62 ++-
config/config.json | 129 ++++--
.vs/HH.WCS.ZhongCeJinTan/v17/DocumentLayout.json | 401 +++++++++++-----------
process/TaskProcess.cs | 6
9 files changed, 557 insertions(+), 487 deletions(-)
diff --git a/.vs/HH.WCS.ZhongCeJinTan/v17/DocumentLayout.backup.json b/.vs/HH.WCS.ZhongCeJinTan/v17/DocumentLayout.backup.json
index 7934030..220dbc7 100644
--- a/.vs/HH.WCS.ZhongCeJinTan/v17/DocumentLayout.backup.json
+++ b/.vs/HH.WCS.ZhongCeJinTan/v17/DocumentLayout.backup.json
@@ -3,60 +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\\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\\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\\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\\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\\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\\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\\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\\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\\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\\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\\wcsmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:wms\\wcsmodel.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\\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\\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\\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}",
+ "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\\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\\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\\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\\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\\wcsmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:wms\\wcsmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
}
],
"DocumentGroupContainers": [
@@ -66,171 +66,11 @@
"DocumentGroups": [
{
"DockedWidth": 200,
- "SelectedChildIndex": 16,
+ "SelectedChildIndex": 12,
"Children": [
- {
- "$type": "Document",
- "DocumentIndex": 3,
- "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": "AgIAAEcAAAAAAAAAAAA3wF4AAAAvAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-14T08:30:12.949Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 8,
- "Title": "WcsModel.cs",
- "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\WcsModel.cs",
- "RelativeDocumentMoniker": "wms\\WcsModel.cs",
- "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\WcsModel.cs",
- "RelativeToolTip": "wms\\WcsModel.cs",
- "ViewState": "AgIAADAAAAAAAAAAAAAkwEEAAAAaAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-14T06:24:55.849Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 7,
- "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": "AgIAAAsDAAAAAAAAAAAAwBwDAAAaAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-14T02:39:17.635Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 1,
- "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": "AgIAACkCAAAAAAAAAAAAAD0CAAAzAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-14T02:35:57.671Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "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": "AgIAAAMAAAAAAAAAAAAAACEAAAAiAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-14T02:11:55.478Z",
- "EditorCaption": ""
- },
- {
- "$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": "AgIAAGwBAAAAAAAAAAAmwIwBAAAtAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-13T09:22:54.115Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 6,
- "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": "AgIAANUCAAAAAAAAAAAswHIAAAAbAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-13T09:19:48.409Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 11,
- "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": "AgIAADIAAAAAAAAAAAAcwEMAAAAjAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-13T09:13:15.283Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 12,
- "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": "AgIAAAAAAAAAAAAAAADwvxoAAAAjAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-13T03:17:31.542Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "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",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAAAQAAAALAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|",
- "WhenOpened": "2025-05-13T02:21:47.086Z",
- "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": "AgIAAF0AAAAAAAAAAAAAwHUAAAApAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-13T01:45:08.835Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 9,
- "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": "AgIAAKwEAAAAAAAAAAAmwJsEAAAjAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-13T00:45:23.095Z",
- "EditorCaption": ""
- },
{
"$type": "Bookmark",
"Name": "ST:129:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
- },
- {
- "$type": "Bookmark",
- "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}"
},
{
"$type": "Bookmark",
@@ -238,26 +78,181 @@
},
{
"$type": "Document",
+ "DocumentIndex": 6,
+ "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": "AgIAAEwAAAAAAAAAAAAgwF4AAAAQAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-14T08:30:12.949Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 13,
+ "Title": "WcsModel.cs",
+ "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\WcsModel.cs",
+ "RelativeDocumentMoniker": "wms\\WcsModel.cs",
+ "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\WcsModel.cs",
+ "RelativeToolTip": "wms\\WcsModel.cs",
+ "ViewState": "AgIAAGcAAAAAAAAAAAAswHEAAAAVAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-14T06:24:55.849Z"
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 12,
+ "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": "AgIAAEIAAAAAAAAAAAA0wFkAAAAvAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-14T02:39:17.635Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 4,
+ "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": "AgIAAF8CAAAAAAAAAAAAwHMCAAAvAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-14T02:35:57.671Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 10,
+ "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": "AgIAAA8AAAAAAAAAAAAAACEAAAAiAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-14T02:11:55.478Z",
+ "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": "AgIAANkAAAAAAAAAAAAYwO0AAAAoAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-13T09:22:54.115Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 1,
+ "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": "AgIAAKAAAAAAAAAAAAAYwJgAAAAbAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-13T09:19:48.409Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 7,
+ "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": "AgIAAHECAAAAAAAAAAAYwIwCAAAVAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-13T09:13:15.283Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 11,
+ "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": "AgIAAAAAAAAAAAAAAADwvxoAAAAiAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-13T03:17:31.542Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 9,
+ "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",
+ "ViewState": "AgIAADkAAAAAAAAAAAAAAFUAAAAZAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|",
+ "WhenOpened": "2025-05-13T02:21:47.086Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "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": "AgIAADgAAAAAAAAAAAAAwFMAAAAtAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-13T01:45:08.835Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 3,
+ "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": "AgIAAHgAAAAAAAAAAAAYwJEAAAAAAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-13T00:45:23.095Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 2,
"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": "AgIAAIAAAAAAAAAAAAAgwJQAAAAeAAAAAAAAAA==",
+ "ViewState": "AgIAALkAAAAAAAAAAAAswMsAAAAkAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-12T09:36:08.931Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 0,
+ "DocumentIndex": 8,
"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": "AgIAAIEFAAAAAAAAAAAowJUFAAAGAAAAAAAAAA==",
+ "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\WMSModel.cs",
+ "RelativeToolTip": "wms\\WMSModel.cs",
+ "ViewState": "AgIAAK0AAAAAAAAAAAAswLwAAAAHAAAAAAAAAA==",
"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 f7eea0e..bb8a72c 100644
--- a/.vs/HH.WCS.ZhongCeJinTan/v17/DocumentLayout.json
+++ b/.vs/HH.WCS.ZhongCeJinTan/v17/DocumentLayout.json
@@ -3,60 +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\\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\\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\\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\\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\\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\\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\\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\\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\\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\\wcsmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:wms\\wcsmodel.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\\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\\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\\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}",
+ "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\\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\\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\\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\\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\\wcsmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:wms\\wcsmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
}
],
"DocumentGroupContainers": [
@@ -66,171 +66,11 @@
"DocumentGroups": [
{
"DockedWidth": 200,
- "SelectedChildIndex": 3,
+ "SelectedChildIndex": 12,
"Children": [
- {
- "$type": "Document",
- "DocumentIndex": 3,
- "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": "AgIAAEcAAAAAAAAAAAA3wF4AAAAvAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-14T08:30:12.949Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 8,
- "Title": "WcsModel.cs",
- "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\WcsModel.cs",
- "RelativeDocumentMoniker": "wms\\WcsModel.cs",
- "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\WcsModel.cs",
- "RelativeToolTip": "wms\\WcsModel.cs",
- "ViewState": "AgIAADAAAAAAAAAAAAAkwEEAAAAaAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-14T06:24:55.849Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 7,
- "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": "AgIAAAsDAAAAAAAAAAAAwBwDAAAaAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-14T02:39:17.635Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 0,
- "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": "AgIAACkCAAAAAAAAAAAgwEQCAAAfAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-14T02:35:57.671Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "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": "AgIAAAMAAAAAAAAAAAAAACEAAAAiAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-14T02:11:55.478Z",
- "EditorCaption": ""
- },
- {
- "$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": "AgIAAGwBAAAAAAAAAAAmwIwBAAAtAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-13T09:22:54.115Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 6,
- "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": "AgIAANUCAAAAAAAAAAAswHIAAAAbAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-13T09:19:48.409Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 11,
- "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": "AgIAADIAAAAAAAAAAAAcwEMAAAAjAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-13T09:13:15.283Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 12,
- "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": "AgIAAAAAAAAAAAAAAADwvxoAAAAjAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-13T03:17:31.542Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "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",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAAAQAAAALAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|",
- "WhenOpened": "2025-05-13T02:21:47.086Z",
- "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": "AgIAAF0AAAAAAAAAAAAAwHUAAAApAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-13T01:45:08.835Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 9,
- "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": "AgIAAKwEAAAAAAAAAAAmwJsEAAAjAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-13T00:45:23.095Z",
- "EditorCaption": ""
- },
{
"$type": "Bookmark",
"Name": "ST:129:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
- },
- {
- "$type": "Bookmark",
- "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}"
},
{
"$type": "Bookmark",
@@ -238,26 +78,181 @@
},
{
"$type": "Document",
+ "DocumentIndex": 6,
+ "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": "AgIAAEwAAAAAAAAAAAAgwF4AAAAQAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-14T08:30:12.949Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 13,
+ "Title": "WcsModel.cs",
+ "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\WcsModel.cs",
+ "RelativeDocumentMoniker": "wms\\WcsModel.cs",
+ "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\WcsModel.cs",
+ "RelativeToolTip": "wms\\WcsModel.cs",
+ "ViewState": "AgIAAGcAAAAAAAAAAAAswHEAAAAVAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-14T06:24:55.849Z"
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 12,
+ "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": "AgIAAEIAAAAAAAAAAAA0wFkAAAAvAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-14T02:39:17.635Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 4,
+ "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": "AgIAAF8CAAAAAAAAAAAAwHMCAAAvAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-14T02:35:57.671Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 10,
+ "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": "AgIAAA8AAAAAAAAAAAAAACEAAAAiAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-14T02:11:55.478Z",
+ "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": "AgIAANkAAAAAAAAAAAAYwO0AAAAoAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-13T09:22:54.115Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 1,
+ "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": "AgIAAKAAAAAAAAAAAAAYwJgAAAAbAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-13T09:19:48.409Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 7,
+ "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": "AgIAAHECAAAAAAAAAAAYwIwCAAAVAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-13T09:13:15.283Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 11,
+ "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": "AgIAAAAAAAAAAAAAAADwvxoAAAAiAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-13T03:17:31.542Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 9,
+ "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",
+ "ViewState": "AgIAADkAAAAAAAAAAAAAAFUAAAAZAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|",
+ "WhenOpened": "2025-05-13T02:21:47.086Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "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": "AgIAADgAAAAAAAAAAAAAwFAAAAAfAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-13T01:45:08.835Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 3,
+ "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": "AgIAAHgAAAAAAAAAAAAYwJEAAAAAAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-13T00:45:23.095Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 2,
"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": "AgIAAIAAAAAAAAAAAAAgwJQAAAAeAAAAAAAAAA==",
+ "ViewState": "AgIAALkAAAAAAAAAAAAswMsAAAAkAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-12T09:36:08.931Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 1,
+ "DocumentIndex": 8,
"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": "AgIAAIEFAAAAAAAAAAAowJMFAAAhAAAAAAAAAA==",
+ "ViewState": "AgIAAK0AAAAAAAAAAAAswLwAAAAHAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-12T09:36:05.064Z",
"EditorCaption": ""
diff --git a/config/config.json b/config/config.json
index 82ffef1..d477c31 100644
--- a/config/config.json
+++ b/config/config.json
@@ -1,11 +1,11 @@
{
- "SqlServer": "Data Source=192.168.1.144;Initial Catalog=ZZBYDMobox;User ID=hhuser;Password=Am123123",
- "WcsApiAddres": "http://ip:prot/wcs-admin/api/",
- "NDCApiUrl": "http://[IP]:0000/api/order/",
- "TmDeviceIp": "192.168.1.144",
- "TmDevicePort": 502,
- "EmptyPalletBufferArea": "绌烘墭缂撳瓨鍖哄煙",
- "MesGetItemApi": "http://ip:prot/",
+ "SqlServer": "Data Source=192.168.1.144;Initial Catalog=YueLimobox;User ID=hhuser;Password=Am123123", //mobox鏁版嵁搴�+ "ApiAddres": "http://[IP]:8888/api/HangCha/",
+ "MesGetItemApi": "http://192.168.1.126:3305/mes-admin/api/ssd", //鑾峰彇mes鐗╂枡淇℃伅
+ "WcsApiAddres": "http://192.168.1.126:3305/wcs-admin/api/", //wcs鎺ュ彛
+ "NDCApiUrl": "http://192.168.1.143:3305/api/order/", //hosttoagv
+ "TmDeviceIp": "192.168.1.126", //璁惧浜や簰ip
+ "TmDevicePort": 508, //璁惧浜や簰绔彛
"TableName": [
{
"name": "璐т綅琛�,
@@ -29,69 +29,100 @@
},
{
"name": "瀹瑰櫒鐗╂枡琛�,
- "code": "TN_Task_Action"
+ "code": "TN_CG_Detail"
+ },
+ {
+ "name": "浣滀笟琛�,
+ "code": "TN_Operation"
+ },
+ {
+ "name": "绔嬪簱鎶ヨ涓婃姤琛�,
+ "code": "TN_WcsWarningEntitys"
+ },
+ {
+ "name": "浣滀笟娴佺▼琛�,
+ "code": "TN_WorkFlow"
+ },
+ {
+ "name": "宸烽亾鍙敤琛�,
+ "code": "TN_RoadWayEnable"
+ },
+ {
+ "name": "绔嬪簱瀹夊叏璇锋眰璁板綍琛�,
+ "code": "TN_WcsSafety"
+ },
+ {
+ "name": "绔嬪簱閫氱煡纭琛�,
+ "code": "TN_WcsInform"
+ },
+ {
+ "name": "涓婁笅鏋惰褰�,
+ "code": "TN_OnOff_Shelves"
+ },
+ {
+ "name": "AGV鐘舵�淇℃伅琛�,
+ "code": "TN_S_AGV_CONDITIONEntitys"
+ },
+ {
+ "name": "AGV鎶ヨ瀵圭収琛�,
+ "code": "TN_S_AGV_TYPEEntitys"
+ },
+ {
+ "name": "AGV鎶ヨ淇℃伅琛�,
+ "code": "TN_AgvErrorReportEntitys"
+ },
+ {
+ "name": "绌烘墭鍑虹紦瀛樿〃",
+ "code": "TN_MesKtTask"
+ },
+ {
+ "name": "浠诲姟鎷︽埅琛�,
+ "code": "TN_ManualTaskSwitch"
}
],
"SafetyLocation": [
{
"name": "鎺ラ┏浣嶄氦浜�,
- "Area": [ "搴撳尯1", "搴撳尯2" ],
+ "Area": [ "JC", "JR" ],
"type": 1
},
{
- "name": "鑳庨潰鏈哄彴浜や簰",
- "Area": [ "搴撳尯1", "搴撳尯2" ],
+ "name": "鏈哄彴浜や簰",
+ "Area": [ "CSJ", "XB" ],
"type": 2
+ },
+ {
+ "name": "闂ㄤ氦浜�,
+ "Area": [ "XW", "GS" ],
+ "type": 3
}
],
+ "EmptyPalletBufferArea": "BCP-K", //绌烘墭缂撳瓨鍖� "TmDevice": [
{
"deviceName": "鑳庨潰鏈哄彴1婊℃墭閰嶇疆",
- "locCode": "JT1",
+ "locCode": "CSJ1-1-1-1",
"deviceType": 1,
"enable": 1,
- "beginAddr": 40022,
- "writeSafetyAddr": 40022,
- "writeSafetyAddr1": 40026,
- "readSafetyAddr": 40001,
- "readSafetyAddr1": 40004,
- "endAddr": 40024
+ "beginAddr": 22,
+ "writeSafetyAddr": 22,
+ "writeSafetyAddr1": 26,
+ "readSafetyAddr": 1,
+ "readSafetyAddr1": 4,
+ "endAddr": 24
},
{
"deviceName": "鑳庨潰鏈哄彴1绌烘墭閰嶇疆",
- "locCode": "JT1",
+ "locCode": "XB1-1-1-1",
"deviceType": 2,
"enable": 1,
- "beginAddr": 40021,
- "writeSafetyAddr": 40021,
- "writeSafetyAddr1": 40025,
- "readSafetyAddr": 40001,
- "readSafetyAddr1": 40005,
- "endAddr": 40023
- },
- {
- "deviceName": "鑳庨潰鏈哄彴2婊℃墭閰嶇疆",
- "locCode": "JT2",
- "deviceType": 1,
- "enable": 1,
- "beginAddr": 40029,
- "writeSafetyAddr": 40029,
- "writeSafetyAddr1": 40033,
- "readSafetyAddr": 40007,
- "readSafetyAddr1": 40010,
- "endAddr": 40031
- },
- {
- "deviceName": "鑳庨潰鏈哄彴2绌烘墭閰嶇疆",
- "locCode": "JT3",
- "deviceType": 2,
- "enable": 1,
- "beginAddr": 40028,
- "writeSafetyAddr": 40028,
- "writeSafetyAddr1": 40032,
- "readSafetyAddr": 40007,
- "readSafetyAddr1": 40011,
- "endAddr": 40030
+ "beginAddr": 21,
+ "writeSafetyAddr": 21,
+ "writeSafetyAddr1": 25,
+ "readSafetyAddr": 1,
+ "readSafetyAddr1": 5,
+ "endAddr": 23
}
]
+
}
\ No newline at end of file
diff --git a/core/TaskCore.cs b/core/TaskCore.cs
index c4fd023..3108067 100644
--- a/core/TaskCore.cs
+++ b/core/TaskCore.cs
@@ -11,6 +11,7 @@
using System.Reflection;
using System.Threading.Tasks;
using System.Web.Services.Description;
+using Top.Api;
using static HH.WCS.ZhongCeJinTan.api.ApiModel;
using static HH.WCS.ZhongCeJinTan.util.Settings;
@@ -65,9 +66,19 @@
TaskHelper.End(wmsTask);
break;
case 7:
- //agv鎵ц閫氱煡
- WcsTask.WcsCallback(wmsTask, model.state, model.forklift_no);
+ var wcsTask1 = TaskHelper.GetTaskByWorkNo(wmsTask.S_OP_CODE, "wcs");
+ if (wcsTask1!=null)
+ {
+ //agv鎵ц閫氱煡 wcs鍙栨秷
+ WcsTask.WcsCallback(wmsTask, model.state, model.forklift_no);
+ if (!TaskHelper.CheckActionRecordExist(wcsTask1.S_CODE, "6"))
+ {
+ TaskHelper.Fail(wcsTask1);
+ TaskProcess.OperateStatus(wcsTask1, 7);
+ }
+ }
+
TaskHelper.Fail(wmsTask);
TaskProcess.OperateStatus(wmsTask, 7);
diff --git a/dispatch/WcsTask.cs b/dispatch/WcsTask.cs
index 8ddd933..1ba6803 100644
--- a/dispatch/WcsTask.cs
+++ b/dispatch/WcsTask.cs
@@ -360,45 +360,55 @@
var endList2 = LocationHelper.GetAllLocList1(workFlow.ERRORAREA);
end1 = LocationHelper.FindEndcolByLoc(endList2, workFlow.ERRORAREA);
LogHelper.Info($"ZcWcsInWorkArea涓�浠诲姟鍏ュ紓甯稿簱鍖虹粓鐐逛俊鎭� + JsonConvert.SerializeObject(end1), "Wcs涓嬪彂浠诲姟");
+ if (end1 == null)
+ {
+ LogHelper.Info($"ZcWcsInWorkArea浠诲姟涓嬪彂澶辫触锛岀粓鐐瑰簱鍖簕workFlow.ERRORAREA},娌℃壘鍒扮粓鐐�, "Wcs涓嬪彂浠诲姟");
+ throw new Exception($"缁堢偣搴撳尯{workFlow.ERRORAREA},娌℃壘鍒扮粓鐐�);
+ }
}
else {
end1 = LocationHelper.FindEndcolByLoc(endList1, workFlow.ENDAREA);
LogHelper.Info($"ZcWcsInWorkArea涓�浠诲姟鍏ヤ笁灞傝揣鏋剁粓鐐逛俊鎭� + JsonConvert.SerializeObject(end1), "Wcs涓嬪彂浠诲姟");
+ if (end1 == null)
+ {
+ LogHelper.Info($"ZcWcsInWorkArea浠诲姟涓嬪彂澶辫触锛岀粓鐐瑰簱鍖簕workFlow.ENDAREA},娌℃壘鍒扮粓鐐�, "Wcs涓嬪彂浠诲姟");
+ throw new Exception($"缁堢偣搴撳尯{workFlow.ENDAREA},娌℃壘鍒扮粓鐐�);
+ }
}
LogHelper.Info($"ZcWcsInWorkArea浠诲姟涓嬪彂缁堢偣淇℃伅" + JsonConvert.SerializeObject(end1), "Wcs涓嬪彂浠诲姟");
- if (end1 == null)
- {
- LogHelper.Info($"ZcWcsInWorkArea浠诲姟涓嬪彂澶辫触锛岀粓鐐瑰簱鍖簕workFlow.ENDAREA},娌℃壘鍒扮粓鐐�, "Wcs涓嬪彂浠诲姟");
- throw new Exception($"缁堢偣搴撳尯{workFlow.ENDAREA},娌℃壘鍒扮粓鐐�);
- }
- //娣诲姞鎵樼洏鐗╂枡鍏宠仈琛�
+
+
+
+ //娣诲姞鎵樼洏 寮傚父鎵樼洏涓嶆坊鍔�+ if (!(model.code == "1" || model.contNo == "99")) {
+
+ //娣诲姞鎵樼洏鐗╂枡鍏宠仈琛�+
CntrItemRel rel = new CntrItemRel();
-
+
rel.S_CNTR_CODE = model.contNo;
rel.PRODUCTIONDATE = DateTime.Parse(item.wrkdatetime);
rel.S_ITEM_CODE = item.recipe;
rel.F_SUM_QTY = item.zl;
rel.TurnCardNum = item.tmh;
rel.facnm = item.facnm;
- rel.cdrub= item.cdrub;
+ rel.cdrub = item.cdrub;
rel.mchid = item.mchid;
rel.wdate = item.wdate;
- rel.wsht = item.wsht;
- rel.strbat = item.strbat;
+ rel.wsht = item.wsht;
+ rel.strbat = item.strbat;
rel.endbat = item.endbat;
- rel.planno = item.planno;
- rel.stage = item.stage;
+ rel.planno = item.planno;
+ rel.stage = item.stage;
rel.grd = item.grd;
-
+
ContainerHelper.CreateCntrItem(rel);
- //娣诲姞鎵樼洏 寮傚父鎵樼洏涓嶆坊鍔�- if (!(model.code == "1" || model.contNo == "99")) {
Container cntr1 = new Container();
cntr1.S_CODE = model.contNo;
cntr1.C_ENABLE = "Y";
@@ -437,7 +447,13 @@
//浼樺厛绾� N_PRIORITY = 1,
//宸ヨ绫诲瀷
- TOOLSTYPE = ""
+ TOOLSTYPE = "",
+ //璧风偣搴撳尯鍚嶇О
+ S_START_AREA_NAME = start1.S_AREA_Name,
+ //缁堢偣搴撳尯鍚嶇О
+ S_END_AREA_NAME= end1.S_AREA_Name,
+ //鎺ラ┏浣嶅簱鍖哄悕绉�+ CONNECTION_AREA = ""
};
//鍒涘缓浣滀笟
@@ -525,7 +541,13 @@
//浼樺厛绾� N_PRIORITY = 1,
//宸ヨ绫诲瀷
- TOOLSTYPE = ""
+ TOOLSTYPE = "" ,
+ //璧风偣搴撳尯鍚嶇О
+ S_START_AREA_NAME = start.S_AREA_Name,
+ //缁堢偣搴撳尯鍚嶇О
+ S_END_AREA_NAME = end.S_AREA_Name,
+ //鎺ラ┏浣嶅簱鍖哄悕绉�+ CONNECTION_AREA = ""
};
//鍒涘缓浣滀笟
@@ -946,13 +968,13 @@
Meshod = "AgvRequest";
break;
case 1104:
- Type = "5";
+ Type = "2";
bit = mst.S_END_LOC;
Meshod = "Complete";
break;
case 7:
- Type = "2";
- bit = "";
+ Type = "5";
+ bit = mst.S_END_LOC;
Meshod = "AgvRequestCancel";
break;
}
diff --git a/process/TaskProcess.cs b/process/TaskProcess.cs
index 34cc6df..3ffb5cc 100644
--- a/process/TaskProcess.cs
+++ b/process/TaskProcess.cs
@@ -139,7 +139,7 @@
DeviceProcess.Door(mst, forkliftNo, state);
}
else if (state == 1002) {
- LogHelper.Info($"绛夊緟浜や簰锛屼换鍔″彿={mst.S_CODE}锛屽嵏璐т氦绠℃垚鍔燂紝淇敼鍙傛暟", "瀹夊叏浜や簰");
+ LogHelper.Info($"绛夊緟浜や簰锛屼换鍔″彿={mst.S_CODE}", "瀹夊叏浜や簰");
//绛夊緟rfid鏍￠獙
var rfidFlag = TaskHelper.GetRfid(mst.S_CODE);
@@ -1648,8 +1648,8 @@
if (connection == "")
{
- LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟涓嬪彂瀵绘壘鎺ラ┏浣嶅け璐�, "Mes浠诲姟涓嬪彂");
- throw new Exception($"ZCSendTask鍏ュ簱浠诲姟涓嬪彂瀵绘壘鎺ラ┏浣嶅け璐�);
+ LogHelper.Info($"ZCSendTask鍑哄簱浠诲姟涓嬪彂瀵绘壘鎺ラ┏浣嶅け璐�, "Mes浠诲姟涓嬪彂");
+ throw new Exception($"ZCSendTask鍑哄簱浠诲姟涓嬪彂瀵绘壘鎺ラ┏浣嶅け璐�);
}
}
diff --git a/wms/LocationHelper.cs b/wms/LocationHelper.cs
index 3a438b9..80debd3 100644
--- a/wms/LocationHelper.cs
+++ b/wms/LocationHelper.cs
@@ -8,6 +8,7 @@
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
+using Top.Api;
using static HH.WCS.ZhongCeJinTan.util.Settings;
using static HH.WCS.ZhongCeJinTan.wms.WcsModel;
@@ -675,6 +676,8 @@
LogHelper.Info($"ZCSendTask鍑哄簱浠诲姟涓嬪彂璧风偣鎸夌敓浜ф椂闂存帓搴忕墿鏂欎俊鎭� + JsonConvert.SerializeObject(startItem), "Mes浠诲姟涓嬪彂");
if (startItem!=null)
{
+
+
var tp = db.Queryable<LocCntrRel>().Where(s => s.S_CNTR_CODE == startItem.S_CNTR_CODE).First();
start = LocationHelper.GetLocOne(tp.S_LOC_CODE);
LogHelper.Info($"ZCSendTask鍑哄簱浠诲姟涓嬪彂璧风偣璐т綅淇℃伅" + JsonConvert.SerializeObject(start), "Mes浠诲姟涓嬪彂");
diff --git a/wms/TaskHelper.cs b/wms/TaskHelper.cs
index 5dddfea..57a8127 100644
--- a/wms/TaskHelper.cs
+++ b/wms/TaskHelper.cs
@@ -243,6 +243,8 @@
{
var tasks = new List<Task>();
+
+
// 浠诲姟1
var task1 = new WMSTask()
{
@@ -278,6 +280,10 @@
N_PRIORITY = operation.N_PRIORITY,
//宸ヨ绫诲瀷
TOOLSTYPE = operation.TOOLSTYPE,
+
+
+
+
};
try
diff --git a/wms/WMSModel.cs b/wms/WMSModel.cs
index 5e44794..3f26360 100644
--- a/wms/WMSModel.cs
+++ b/wms/WMSModel.cs
@@ -20,6 +20,7 @@
public DateTime T_CREATE { get; set; } = DateTime.Now;
public DateTime T_MODIFY { get; set; } = DateTime.Now;
+
}
@@ -183,7 +184,10 @@
/// </summary>
[SugarColumn(IsPrimaryKey = true)]
public string S_LOC_CODE { get; set; }
-
+
+
+
+
/// <summary>
/// 瀹瑰櫒缂栫爜
/// </summary>
@@ -479,14 +483,14 @@
public string S_OP_DEF_NAME { get; set; }
/// <summary>
- /// 浠诲姟寮�鏃堕棿
+ /// 寮�鏃堕棿
/// </summary>
- public DateTime T_START_TIME { get; set; }
+ public DateTime? T_START_TIME { get; set; } = null;
/// <summary>
- /// 浠诲姟缁撴潫鏃堕棿
+ /// 缁撴潫鏃堕棿
/// </summary>
- public DateTime T_END_TIME { get; set; }
+ public DateTime? T_END_TIME { get; set; } = null;
/// <summary>
/// 瀹瑰櫒缂栫爜
@@ -655,12 +659,12 @@
/// <summary>
/// 寮�鏃堕棿
/// </summary>
- public DateTime T_START_TIME { get; set; }
+ public DateTime? T_START_TIME { get; set; } = null;
/// <summary>
/// 缁撴潫鏃堕棿
/// </summary>
- public DateTime T_END_TIME { get; set; }
+ public DateTime? T_END_TIME { get; set; } = null;
/// <summary>
/// 璋冨害绫诲瀷鍊�@@ -773,11 +777,14 @@
/// </summary>
public string S_WORKSHOP_NO { get; set; }
+
/// <summary>
/// 杞﹂棿鍚嶇О
/// </summary>
public string S_WORKSHOP_NAME { get; set; }
+
+
internal static string GetStateStr(int state)
{
//0绛夊緟 1宸叉帹閫� 2鎵ц 3瀹屾垚 4閿欒
--
Gitblit v1.9.1