From b67787b031e357c60565d3e1aa8b829706e520e2 Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期五, 11 七月 2025 17:30:56 +0800
Subject: [PATCH] Mes接口修改
---
wms/TaskHelper.cs | 63 ++
core/Monitor.cs | 31 +
.vs/HH.WCS.ZhongCeJinTan/v17/DocumentLayout.backup.json | 230 ++++++------
dispatch/WcsTask.cs | 304 +++++++++-------
.vs/HH.WCS.ZhongCeJinTan/v17/DocumentLayout.json | 252 +++++++------
api/ApiModel.cs | 68 +++
process/TaskProcess.cs | 89 +++-
api/WmsController.cs | 19
8 files changed, 616 insertions(+), 440 deletions(-)
diff --git a/.vs/HH.WCS.ZhongCeJinTan/v17/DocumentLayout.backup.json b/.vs/HH.WCS.ZhongCeJinTan/v17/DocumentLayout.backup.json
index f39f249..2824cf1 100644
--- a/.vs/HH.WCS.ZhongCeJinTan/v17/DocumentLayout.backup.json
+++ b/.vs/HH.WCS.ZhongCeJinTan/v17/DocumentLayout.backup.json
@@ -3,8 +3,16 @@
"WorkspaceRootPath": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\",
"Documents": [
{
- "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|c:\\users\\29562\\source\\repos\\hh-0129_zhongcejintan\\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\\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\\wcscontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:api\\wcscontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\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\\core\\monitor.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
@@ -15,24 +23,24 @@
"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\\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\\deviceprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:process\\deviceprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
- "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\core\\taskcore.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:core\\taskcore.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\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\\api\\moboxcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:api\\moboxcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
- "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\wcscontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:api\\wcscontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\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\\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\\api\\apimodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:api\\apimodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\agvcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
@@ -63,16 +71,8 @@
"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\\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\\util\\httphelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:util\\httphelper.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\\util\\settings.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
@@ -118,7 +118,7 @@
"DocumentGroups": [
{
"DockedHeight": 387,
- "SelectedChildIndex": 2,
+ "SelectedChildIndex": 12,
"Children": [
{
"$type": "Bookmark",
@@ -126,127 +126,80 @@
},
{
"$type": "Bookmark",
+ "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}"
+ },
+ {
+ "$type": "Bookmark",
"Name": "ST:128:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
},
{
"$type": "Document",
- "DocumentIndex": 0,
- "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": "AgIAAOgDAAAAAAAAAAAIwAgEAAAuAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-13T09:19:48.409Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 3,
+ "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": "AgIAADEAAAAAAAAAAADgv08AAAAqAAAAAAAAAA==",
+ "ViewState": "AgIAADAAAAAAAAAAAAAYwE8AAAAmAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-12T09:36:08.931Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 6,
+ "DocumentIndex": 1,
"Title": "WcsController.cs",
"DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\WcsController.cs",
"RelativeDocumentMoniker": "api\\WcsController.cs",
"ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\WcsController.cs",
"RelativeToolTip": "api\\WcsController.cs",
- "ViewState": "AgIAAD0AAAAAAAAAAAAuwBwAAAAmAAAAAAAAAA==",
+ "ViewState": "AgIAAAUAAAAAAAAAAAAcwBwAAAAnAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-06-30T05:56:36.418Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 9,
- "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": "AgIAADcAAAAAAAAAAAAnwFcAAACwAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-29T07:39:06.007Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 10,
- "Title": "Startup.cs",
- "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\Startup.cs",
- "RelativeDocumentMoniker": "api\\Startup.cs",
- "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\Startup.cs",
- "RelativeToolTip": "api\\Startup.cs",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAAAkAAAAeAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-30T00:50:07.591Z"
- },
- {
- "$type": "Document",
- "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": "AgIAAAEAAAAAAAAAAAASwBoAAAAiAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-13T03:17:31.542Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 5,
+ "DocumentIndex": 7,
"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": "AgIAAAoAAAAAAAAAAAAlwC0AAAAqAAAAAAAAAA==",
+ "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\MoboxController.cs",
+ "RelativeToolTip": "api\\MoboxController.cs",
+ "ViewState": "AgIAAEQAAAAAAAAAAADgv28AAAAZAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-20T00:59:46.638Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 7,
+ "DocumentIndex": 6,
"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": "AgIAAM0DAAAAAAAAAAAIwOwDAAA/AAAAAAAAAA==",
+ "ViewState": "AgIAAM4DAAAAAAAAAADgv+QDAAAjAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-13T00:45:23.095Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 2,
+ "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": "AgIAAAkDAAAAAAAAAADwvxEDAAAVAAAAAAAAAA==",
+ "ViewState": "AgIAABsDAAAAAAAAAAAhwDEDAAAVAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-14T02:35:57.671Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 4,
+ "DocumentIndex": 8,
"Title": "TaskCore.cs",
"DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\core\\TaskCore.cs",
"RelativeDocumentMoniker": "core\\TaskCore.cs",
@@ -259,20 +212,20 @@
},
{
"$type": "Document",
- "DocumentIndex": 1,
+ "DocumentIndex": 3,
"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": "AgIAAKYAAAAAAAAAAAAkwMYAAABBAAAAAAAAAA==",
+ "ViewState": "AgIAALQAAAAAAAAAAADgv8MAAAArAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-14T02:11:55.478Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 12,
+ "DocumentIndex": 14,
"Title": "ContainerHelper.cs",
"DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\ContainerHelper.cs",
"RelativeDocumentMoniker": "wms\\ContainerHelper.cs",
@@ -284,7 +237,82 @@
},
{
"$type": "Document",
- "DocumentIndex": 14,
+ "DocumentIndex": 9,
+ "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": "AgIAAPQBAAAAAAAAAAAEwAcCAAAVAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-14T02:39:17.635Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 0,
+ "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": "AgIAAMICAAAAAAAAAAAhwN4CAABbAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-13T09:19:48.409Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 12,
+ "Title": "Startup.cs",
+ "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\Startup.cs",
+ "RelativeDocumentMoniker": "api\\Startup.cs",
+ "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\Startup.cs",
+ "RelativeToolTip": "api\\Startup.cs",
+ "ViewState": "AgIAAAAAAAAAAAAAAAAAAAkAAAAeAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-30T00:50:07.591Z"
+ },
+ {
+ "$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": "AgIAAJABAAAAAAAAAAAhwHkBAAAdAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-13T09:22:54.115Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 10,
+ "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": "AgIAAAEAAAAAAAAAAAASwBoAAAAiAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-13T03:17:31.542Z"
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 11,
+ "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": "AgIAADcAAAAAAAAAAAAnwFcAAACwAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-29T07:39:06.007Z"
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 16,
"Title": "WcsModel.cs",
"DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\WcsModel.cs",
"RelativeDocumentMoniker": "wms\\WcsModel.cs",
@@ -296,7 +324,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 11,
+ "DocumentIndex": 13,
"Title": "WMSModel.cs",
"DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\WMSModel.cs",
"RelativeDocumentMoniker": "wms\\WMSModel.cs",
@@ -308,7 +336,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 13,
+ "DocumentIndex": 15,
"Title": "LocationHelper.cs",
"DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\LocationHelper.cs",
"RelativeDocumentMoniker": "wms\\LocationHelper.cs",
@@ -320,19 +348,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 15,
- "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": "AgIAALEDAAAAAAAAAAASwLsDAAAIAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-14T02:39:17.635Z"
- },
- {
- "$type": "Document",
- "DocumentIndex": 16,
+ "DocumentIndex": 17,
"Title": "HttpHelper.cs",
"DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\util\\HttpHelper.cs",
"RelativeDocumentMoniker": "util\\HttpHelper.cs",
@@ -341,18 +357,6 @@
"ViewState": "AgIAAKMAAAAAAAAAAAAhwK0AAAAWAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-06-24T08:21:19.702Z"
- },
- {
- "$type": "Document",
- "DocumentIndex": 17,
- "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": "AgIAAJABAAAAAAAAAAAhwHkBAAAdAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-13T09:22:54.115Z"
},
{
"$type": "Document",
diff --git a/.vs/HH.WCS.ZhongCeJinTan/v17/DocumentLayout.json b/.vs/HH.WCS.ZhongCeJinTan/v17/DocumentLayout.json
index 26b0741..1f9e88f 100644
--- a/.vs/HH.WCS.ZhongCeJinTan/v17/DocumentLayout.json
+++ b/.vs/HH.WCS.ZhongCeJinTan/v17/DocumentLayout.json
@@ -3,36 +3,44 @@
"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\\api\\wcscontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:api\\wcscontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|c:\\users\\29562\\source\\repos\\hh-0129_zhongcejintan\\dispatch\\wcstask.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:dispatch\\wcstask.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\wmscontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:api\\wmscontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\moboxcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:api\\moboxcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\taskhelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:wms\\taskhelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\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\\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\\wcscontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:api\\wcscontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\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\\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\\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\\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\\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\\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\\api\\apimodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:api\\apimodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\agvcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
@@ -63,16 +71,8 @@
"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\\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\\util\\httphelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{8E589C0D-7D65-474D-8CED-E34E081926A1}|HH.WCS.ZhongCeJinTan.csproj|solutionrelative:util\\httphelper.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\\util\\settings.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
@@ -118,7 +118,7 @@
"DocumentGroups": [
{
"DockedHeight": 387,
- "SelectedChildIndex": 4,
+ "SelectedChildIndex": 7,
"Children": [
{
"$type": "Bookmark",
@@ -126,127 +126,80 @@
},
{
"$type": "Bookmark",
+ "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}"
+ },
+ {
+ "$type": "Bookmark",
"Name": "ST:128:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
},
{
"$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": "AgIAAPIEAAAAAAAAAAAIwAoFAAAqAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-13T09:19:48.409Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 2,
+ "DocumentIndex": 4,
"Title": "WmsController.cs",
"DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\WmsController.cs",
"RelativeDocumentMoniker": "api\\WmsController.cs",
"ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\WmsController.cs",
"RelativeToolTip": "api\\WmsController.cs",
- "ViewState": "AgIAADEAAAAAAAAAAADgv0kAAAAWAAAAAAAAAA==",
+ "ViewState": "AgIAADAAAAAAAAAAAAAYwE8AAAAmAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-12T09:36:08.931Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 0,
+ "DocumentIndex": 3,
"Title": "WcsController.cs",
"DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\WcsController.cs",
"RelativeDocumentMoniker": "api\\WcsController.cs",
"ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\WcsController.cs",
"RelativeToolTip": "api\\WcsController.cs",
- "ViewState": "AgIAACwAAAAAAAAAAAAqwEkAAAAmAAAAAAAAAA==",
+ "ViewState": "AgIAAAUAAAAAAAAAAAAcwBwAAAAnAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-06-30T05:56:36.418Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 9,
- "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": "AgIAADcAAAAAAAAAAAAnwFcAAACwAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-29T07:39:06.007Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 10,
- "Title": "Startup.cs",
- "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\Startup.cs",
- "RelativeDocumentMoniker": "api\\Startup.cs",
- "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\Startup.cs",
- "RelativeToolTip": "api\\Startup.cs",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAAAkAAAAeAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-30T00:50:07.591Z"
- },
- {
- "$type": "Document",
- "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": "AgIAAAEAAAAAAAAAAAASwBoAAAAiAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-13T03:17:31.542Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 3,
+ "DocumentIndex": 7,
"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": "AgIAAAQAAAAAAAAAAAAlwCYAAAAAAAAAAAAAAA==",
+ "ViewState": "AgIAAEQAAAAAAAAAAADgv28AAAAZAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-20T00:59:46.638Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 7,
+ "DocumentIndex": 6,
"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": "AgIAAM0DAAAAAAAAAAAIwOwDAAA/AAAAAAAAAA==",
+ "ViewState": "AgIAAM4DAAAAAAAAAADgv+QDAAAjAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-13T00:45:23.095Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 5,
+ "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": "AgIAAD8CAAAAAAAAAAAuwE0CAAA6AAAAAAAAAA==",
+ "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\TaskHelper.cs*",
+ "RelativeToolTip": "wms\\TaskHelper.cs*",
+ "ViewState": "AgIAAJMBAAAAAAAAAAAhwKsBAAAnAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-14T02:35:57.671Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 6,
+ "DocumentIndex": 8,
"Title": "TaskCore.cs",
"DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\core\\TaskCore.cs",
"RelativeDocumentMoniker": "core\\TaskCore.cs",
@@ -259,20 +212,20 @@
},
{
"$type": "Document",
- "DocumentIndex": 4,
+ "DocumentIndex": 1,
"Title": "Monitor.cs",
"DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\core\\Monitor.cs",
"RelativeDocumentMoniker": "core\\Monitor.cs",
- "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\core\\Monitor.cs",
- "RelativeToolTip": "core\\Monitor.cs",
- "ViewState": "AgIAALsAAAAAAAAAAAAmwN0AAAAoAAAAAAAAAA==",
+ "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\core\\Monitor.cs*",
+ "RelativeToolTip": "core\\Monitor.cs*",
+ "ViewState": "AgIAAIkAAAAAAAAAAADgv5wAAAA4AAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-14T02:11:55.478Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 12,
+ "DocumentIndex": 14,
"Title": "ContainerHelper.cs",
"DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\ContainerHelper.cs",
"RelativeDocumentMoniker": "wms\\ContainerHelper.cs",
@@ -284,7 +237,82 @@
},
{
"$type": "Document",
- "DocumentIndex": 14,
+ "DocumentIndex": 9,
+ "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": "AgIAAPQBAAAAAAAAAAAEwAcCAAAVAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-14T02:39:17.635Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 2,
+ "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": "AgIAAMUCAAAAAAAAAAAhwNwCAAA0AAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-13T09:19:48.409Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 12,
+ "Title": "Startup.cs",
+ "DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\Startup.cs",
+ "RelativeDocumentMoniker": "api\\Startup.cs",
+ "ToolTip": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\api\\Startup.cs",
+ "RelativeToolTip": "api\\Startup.cs",
+ "ViewState": "AgIAAAAAAAAAAAAAAAAAAAkAAAAeAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-30T00:50:07.591Z"
+ },
+ {
+ "$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": "AgIAAJABAAAAAAAAAAAhwHkBAAAdAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-13T09:22:54.115Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 10,
+ "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": "AgIAAAEAAAAAAAAAAAASwBoAAAAiAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-13T03:17:31.542Z"
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 11,
+ "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": "AgIAADcAAAAAAAAAAAAnwFcAAACwAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-29T07:39:06.007Z"
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 16,
"Title": "WcsModel.cs",
"DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\WcsModel.cs",
"RelativeDocumentMoniker": "wms\\WcsModel.cs",
@@ -296,7 +324,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 11,
+ "DocumentIndex": 13,
"Title": "WMSModel.cs",
"DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\WMSModel.cs",
"RelativeDocumentMoniker": "wms\\WMSModel.cs",
@@ -308,7 +336,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 13,
+ "DocumentIndex": 15,
"Title": "LocationHelper.cs",
"DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\wms\\LocationHelper.cs",
"RelativeDocumentMoniker": "wms\\LocationHelper.cs",
@@ -320,19 +348,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 15,
- "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": "AgIAALEDAAAAAAAAAAASwLsDAAAIAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-14T02:39:17.635Z"
- },
- {
- "$type": "Document",
- "DocumentIndex": 16,
+ "DocumentIndex": 17,
"Title": "HttpHelper.cs",
"DocumentMoniker": "C:\\Users\\29562\\source\\repos\\HH-0129_ZhongCeJinTan\\util\\HttpHelper.cs",
"RelativeDocumentMoniker": "util\\HttpHelper.cs",
@@ -341,18 +357,6 @@
"ViewState": "AgIAAKMAAAAAAAAAAAAhwK0AAAAWAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-06-24T08:21:19.702Z"
- },
- {
- "$type": "Document",
- "DocumentIndex": 17,
- "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": "AgIAAJABAAAAAAAAAAAhwHkBAAAdAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-13T09:22:54.115Z"
},
{
"$type": "Document",
diff --git a/api/ApiModel.cs b/api/ApiModel.cs
index dd181b8..70b2047 100644
--- a/api/ApiModel.cs
+++ b/api/ApiModel.cs
@@ -163,6 +163,58 @@
public int errCode { get; set; }
}
+ /// <summary>
+ /// 鏌ヨ搴撲綅璁板綍鎺ュ彛杩斿洖
+ /// </summary>
+ public class LocationRecordsResult
+ {
+ /// <summary>
+ /// 閿欒璇存槑锛屽綋success涓篎alse鏃讹紝errCode鏈夊�
+ /// </summary>
+ public string Msg { get; set; }
+ /// <summary>
+ /// 鎺ュ彛璋冪敤缁撴灉 true鎴愬姛 false澶辫触
+ /// </summary>
+ public bool Success { get; set; }
+ /// <summary>
+ /// 鎺ュ彛鍙嶉鐮�鏃犻敊璇负0
+ /// </summary>
+ public int Code { get; set; }
+
+ public List <LocationRecord> Data { get; set; }
+ }
+ public class LocationRecord
+ {
+ /// <summary>
+ /// 鎿嶄綔绫诲瀷 1鍏ュ簱 2鍑哄簱
+ /// </summary>
+ public string Task_type { get; set; }
+ /// <summary>
+ /// 鍛ㄨ浆鍗″彿
+ /// </summary>
+ public string TurnCardNum { get; set; }
+ /// <summary>
+ /// 宸ヨ缂栧彿
+ /// </summary>
+ public string TOOLS_NO { get; set; }
+ /// <summary>
+ /// 璧风偣搴撳尯缂栧彿
+ /// </summary>
+ public string Location_From { get; set; }
+ /// <summary>
+ /// 璧风偣璐т綅缂栫爜
+ /// </summary>
+ public string Location_FromNo { get; set; }
+ /// <summary>
+ /// 鐩殑搴撳尯缂栧彿
+ /// </summary>
+ public string Location_To { get; set; }
+ /// <summary>
+ /// 鐩殑璐т綅缂栫爜
+ /// </summary>
+ public string Location_ToNo { get; set; }
+
+ }
public class zcResult
{
@@ -400,6 +452,22 @@
public string task_no { get; set; }
}
+
+ /// <summary>
+ /// 搴撲綅鎿嶄綔璁板綍鍙傛暟
+ /// </summary>
+ public class LocationRecordsParme
+ {
+ /// <summary>
+ /// 鎿嶄綔寮�鏃堕棿
+ /// </summary>
+ public DateTime operatestarttime { get; set; }
+ /// <summary>
+ /// 鎿嶄綔缁撴潫鏃堕棿
+ /// </summary>
+ public DateTime operateendtime { get; set; }
+ }
+
/// <summary>
/// 淇敼鐗╂枡鍙傛暟
/// </summary>
diff --git a/api/WmsController.cs b/api/WmsController.cs
index d4e2264..c5c7daa 100644
--- a/api/WmsController.cs
+++ b/api/WmsController.cs
@@ -130,18 +130,19 @@
/// 搴撲綅鎿嶄綔璁板綍鎺ュ彛
/// </summary>
/// <returns></returns>
- //[HttpPost]
- //public Result LocationRecords(MesUdeItemParme model)
- //{
- // LogHelper.Info("MesUdeItem 鍙傛暟锛� + JsonConvert.SerializeObject(model), "鐗╂枡缁戝畾瑙ｇ粦");
- // var res = TaskProcess.MesUdeItem(model);
- // LogHelper.Info("MesUdeItem 杩斿洖锛� + JsonConvert.SerializeObject(res), "鐗╂枡缁戝畾瑙ｇ粦");
- // return res;
- //}
+ [HttpPost]
+ [Route("api/WmsApi/LocationRecords")]
+ public LocationRecordsResult LocationRecords(LocationRecordsParme model)
+ {
+ LogHelper.Info("LocationRecords 鍙傛暟锛� + JsonConvert.SerializeObject(model), "鐗╂枡缁戝畾瑙ｇ粦");
+ var res = TaskProcess.LocationRecords(model);
+ LogHelper.Info("LocationRecords 杩斿洖锛� + JsonConvert.SerializeObject(res), "鐗╂枡缁戝畾瑙ｇ粦");
+ return res;
+ }
-
+
}
}
diff --git a/core/Monitor.cs b/core/Monitor.cs
index b46a4a7..b4573f0 100644
--- a/core/Monitor.cs
+++ b/core/Monitor.cs
@@ -154,10 +154,10 @@
switch (model.state)
{
case 1:
+ TaskHelper.opMesTask(wmsTask, 1);
TaskHelper.Begin(wmsTask, model.forklift_no);
//鑳庨潰浜や簰
TaskHelper.TmSafety(wmsTask);
- TaskHelper.opMesTask(wmsTask,1);
break;
case 3:
TaskHelper.UpdateStatus(wmsTask, "寮�鍙栬揣");
@@ -189,10 +189,14 @@
LogHelper.Info($"浠诲姟{wmsTask.S_CODE}瀹屾垚锛屽垽鏂叆搴撲紭鍏堢骇", "鍏ュ簱浼樺厛绾�);
TaskProcess.inPri(wmsTask);
TaskHelper.End(wmsTask);
- TaskHelper.opMesTask(wmsTask, 2);
+
break;
case 7:
- var wcsTask1 = TaskHelper.GetTaskByWorkNo(wmsTask.S_OP_CODE, "wcs");
+ if (!LocationHelper.GetErroArea(wmsTask.S_END_AREA)) {
+ TaskHelper.opMesTask(wmsTask, 3);
+ }
+
+ var wcsTask1 = TaskHelper.GetTaskByWorkNo(wmsTask.S_OP_CODE, "wcs");
if (wcsTask1 != null)
{
//agv鎵ц閫氱煡 wcs鍙栨秷
@@ -210,16 +214,19 @@
ContainerHelper.delCntr(wmsTask.S_CNTR_CODE);
ContainerHelper.delCntrItem(wmsTask.S_CNTR_CODE);
}
-
- //鍑哄簱鍙栨秷鍒ゆ柇鎺ラ┏浣嶆槸鍚︽湁璐э紝鏈夎揣闇�瑙ｇ粦
- if (!WcsTask.WcsCvstate(wmsTask))
- {
- LogHelper.Info($"Wcs绔嬪簱鎺ラ┏浣嶆棤璐э紝瑙ｇ粦璐т綅:{wmsTask.S_START_LOC}", "绔嬪簱");
- TaskProcess.OperateStatus(wmsTask, 4);
- ContainerHelper.delCntr(wmsTask.S_CNTR_CODE);
- ContainerHelper.delCntrItem(wmsTask.S_CNTR_CODE);
+ else {
+ //鍑哄簱鍙栨秷鍒ゆ柇鎺ラ┏浣嶆槸鍚︽湁璐э紝鏈夎揣闇�瑙ｇ粦
+ if (!WcsTask.WcsCvstate(wmsTask))
+ {
+ LogHelper.Info($"Wcs绔嬪簱鎺ラ┏浣嶆棤璐э紝瑙ｇ粦璐т綅:{wmsTask.S_START_LOC}", "绔嬪簱");
+ TaskProcess.OperateStatus(wmsTask, 4);
+ ContainerHelper.delCntr(wmsTask.S_CNTR_CODE);
+ ContainerHelper.delCntrItem(wmsTask.S_CNTR_CODE);
+ }
}
- TaskHelper.opMesTask(wmsTask, 3);
+
+
+
break;
}
diff --git a/dispatch/WcsTask.cs b/dispatch/WcsTask.cs
index 0fdfb0d..d6c265a 100644
--- a/dispatch/WcsTask.cs
+++ b/dispatch/WcsTask.cs
@@ -41,79 +41,87 @@
string Traycode = mst.S_CNTR_CODE;
var isFu = "0";
- var cntr = ContainerHelper.GetCntr(Traycode);
-
- if (cntr!=null)
+ try
{
- if (cntr.N_DETAIL_COUNT>0)
+ var cntr = ContainerHelper.GetCntr(Traycode);
+
+ if (cntr != null)
{
- isFu = "1";
+ if (cntr.N_DETAIL_COUNT > 0)
+ {
+ isFu = "1";
+ }
}
- }
- var workFlow = TaskHelper.selectWorkFlowByType(mst.N_TYPE.ToString(), mst.TOOLSTYPE);
+ var workFlow = TaskHelper.selectWorkFlowByType(mst.N_TYPE.ToString(), mst.TOOLSTYPE);
-
- if (workFlow != null)
- {
- if (workFlow.INOROUT.Contains("鍏ュ簱"))
+
+ if (workFlow != null)
{
- Type = "1";
+ if (workFlow.INOROUT.Contains("鍏ュ簱"))
+ {
+ Type = "1";
+ }
+
+ if (workFlow.INOROUT.Contains("鍑哄簱"))
+ {
+ Type = "2";
+ var count = TaskHelper.GetConnectionTask(mst.S_END_LOC);
+ if (count >= 2)
+ {
+ return false;
+ }
+
+
+ }
}
- if (workFlow.INOROUT.Contains("鍑哄簱"))
+ if (mst.S_CNTR_CODE.Contains("KJZ"))
{
- Type = "2";
- var count = TaskHelper.GetConnectionTask(mst.S_END_LOC);
- if (count>=2)
+ TrayType = "KJZ";
+ }
+
+ var interact = new
+ {
+ requestPk = mst.S_CODE,//浠诲姟鍙�+ contNo = Traycode,//鎵樼洏鍙�+ contType = TrayType,//鎵樼洏绫诲瀷
+ trkType = Type,//浠诲姟绫诲瀷
+ trkPrty = mst.N_PRIORITY,//浠诲姟浼樺厛绾�+ frmPos = mst.S_START_LOC,//璧峰浣嶇疆
+ toPos = mst.S_END_LOC,//鐩殑鍦�+ isFull = isFu,//绌烘墭 婊℃墭
+ groupNo = Item?.S_ITEM_NAME,//鎼�缁勫彿
+ clientCode = "WMS",//鎿嶄綔浜�+ operationTime = DateTime.Now.ToString()//鎿嶄綔鏃堕棿
+ };
+ LogHelper.Info("Wcs绔嬪簱涓嬪彂浠诲姟 鍦板潃淇℃伅:" + baseUrl + "receive", "绔嬪簱涓嬪彂浠诲姟");
+ LogHelper.Info("Wcs绔嬪簱涓嬪彂浠诲姟 鍙傛暟淇℃伅:" + JsonConvert.SerializeObject(interact), "绔嬪簱涓嬪彂浠诲姟");
+ var result = apiHelper.Post(baseUrl + "receive", JsonConvert.SerializeObject(interact));
+ LogHelper.Info("Wcs绔嬪簱涓嬪彂浠诲姟 杩斿洖淇℃伅:" + JsonConvert.SerializeObject(result), "绔嬪簱涓嬪彂浠诲姟");
+ if (!string.IsNullOrEmpty(result))
+ {
+ var res = JsonConvert.DeserializeObject<WcsTaskReturn>(result);
+ if (res.code == "0")
+ {
+ TaskHelper.UpdateStatus(mst, "宸叉帹閫�);
+ return true;
+ }
+ else
{
return false;
}
-
-
- }
- }
-
- if (mst.S_CNTR_CODE.Contains("KJZ"))
- {
- TrayType = "KJZ";
- }
-
- var interact = new
- {
- requestPk = mst.S_CODE,//浠诲姟鍙�- contNo = Traycode,//鎵樼洏鍙�- contType = TrayType,//鎵樼洏绫诲瀷
- trkType = Type,//浠诲姟绫诲瀷
- trkPrty = mst.N_PRIORITY,//浠诲姟浼樺厛绾�- frmPos = mst.S_START_LOC,//璧峰浣嶇疆
- toPos = mst.S_END_LOC,//鐩殑鍦�- isFull = isFu,//绌烘墭 婊℃墭
- groupNo = Item?.S_ITEM_NAME,//鎼�缁勫彿
- clientCode = "WMS",//鎿嶄綔浜�- operationTime = DateTime.Now.ToString()//鎿嶄綔鏃堕棿
- };
- LogHelper.Info("Wcs绔嬪簱涓嬪彂浠诲姟 鍦板潃淇℃伅:" + baseUrl + "receive", "绔嬪簱涓嬪彂浠诲姟");
- LogHelper.Info("Wcs绔嬪簱涓嬪彂浠诲姟 鍙傛暟淇℃伅:" + JsonConvert.SerializeObject(interact), "绔嬪簱涓嬪彂浠诲姟");
- var result = apiHelper.Post(baseUrl + "receive", JsonConvert.SerializeObject(interact));
- LogHelper.Info("Wcs绔嬪簱涓嬪彂浠诲姟 杩斿洖淇℃伅:" + JsonConvert.SerializeObject(result), "绔嬪簱涓嬪彂浠诲姟");
- if (!string.IsNullOrEmpty(result))
- {
- var res = JsonConvert.DeserializeObject<WcsTaskReturn>(result);
- if (res.code == "0")
- {
- TaskHelper.UpdateStatus(mst, "宸叉帹閫�);
- return true;
}
else
{
+ LogHelper.Info("Wcs绔嬪簱涓嬪彂浠诲姟 杩斿洖淇℃伅涓虹┖", "绔嬪簱涓嬪彂浠诲姟");
return false;
}
}
- else
+ catch (Exception)
{
- LogHelper.Info("Wcs绔嬪簱涓嬪彂浠诲姟 杩斿洖淇℃伅涓虹┖", "绔嬪簱涓嬪彂浠诲姟");
- return false;
+
+ throw;
}
}
@@ -673,8 +681,7 @@
RfidChek.S_RESULT = "RFID鏍￠獙澶辫触";
if (WcsCancellTask(transportTask))
{
- ContainerHelper.delCntr(transportTask.S_CNTR_CODE);
- ContainerHelper.delCntrItem(transportTask.S_CNTR_CODE);
+
TaskHelper.Fail(transportTask);
TaskProcess.OperateStatus(transportTask, 7);
@@ -721,6 +728,11 @@
throw new Exception("淇敼浠诲姟琛ㄥけ璐�);
}
newDb.CommitTran();
+
+ var agvTask1 = TaskHelper.GetTaskByWorkNo(transportTask.S_OP_CODE, "agv");
+ TaskHelper.opMesTask(agvTask1, 3);
+ ContainerHelper.delCntr(transportTask.S_CNTR_CODE);
+ ContainerHelper.delCntrItem(transportTask.S_CNTR_CODE);
}
else {
LogHelper.Info($"RFID鏍￠獙澶辫触锛岄�鐭cs鍙栨秷浠诲姟澶辫触", "Wcs浠诲姟鎵ц閫氱煡");
@@ -989,100 +1001,112 @@
string bit = "";
var Meshod = "";
var newDb = new SqlHelper<object>().GetInstance();
- var tac = newDb.Queryable<WcsSafety>().Where(a => a.TaskNo == mst.S_CODE && a.Sign == state).ToList();
- if (tac.Count() > 0)
+
+ try
{
- LogHelper.Info("鏌ヨ鍒板畨鍏ㄨ姹備俊鍙疯褰曡〃宸茬粡瀛樺湪鏁版嵁,姝ゆ淇″彿涓嶄笅杈剧粰绔嬪簱", "agv鎵ц閫氱煡");
- return true;
- }
- switch (state)
- {
- case 1101:
- Type = "1";
- bit = mst.S_START_LOC;
- Meshod = "AgvRequest";
- break;
- case 1102:
- Type = "1";
- bit = mst.S_START_LOC;
- Meshod = "Complete";
- break;
- case 1103:
- Type = "2";
- bit = mst.S_END_LOC;
- Meshod = "AgvRequest";
- break;
- case 1104:
- Type = "2";
- bit = mst.S_END_LOC;
- Meshod = "Complete";
- break;
- case 7:
- Type = "5";
- if (mst.S_TYPE.Contains("鍑哄簱"))
- {
- bit = mst.S_START_LOC;
- }
- else {
- bit = mst.S_END_LOC;
- }
-
- //閫�簱鍙栨秷鍙慳gv璧风偣
- if (LocationHelper.GetErroArea(mst.S_END_AREA))
- {
- bit = mst.S_START_LOC;
- }
-
-
- Meshod = "AgvRequestCancel";
- break;
- }
-
-
-
-
- var interact = new
- {
- requestPk = mst.S_CODE,//浠诲姟鍙�- trkType = Type,//浠诲姟绫诲瀷
- method = Meshod,//API鍚嶇О
- stnNo = bit,//鐩殑鍦扮珯鍙板彿
- carNo = forkliftNo,// 杞﹀彿
- clientCode = "WMS",//鎿嶄綔浜�- operationTime = DateTime.Now.ToString()//鎿嶄綔鏃堕棿
- };
- LogHelper.Info("agv鎵ц閫氱煡 鍦板潃淇℃伅:" + baseUrl + "agvCallback", "agv鎵ц閫氱煡");
- LogHelper.Info("agv鎵ц閫氱煡 鍙傛暟淇℃伅:" + JsonConvert.SerializeObject(interact), "agv鎵ц閫氱煡");
- var result = apiHelper.Post(baseUrl + "agvCallback", JsonConvert.SerializeObject(interact));
- LogHelper.Info("agv鎵ц閫氱煡 杩斿洖淇℃伅:" + JsonConvert.SerializeObject(result), "agv鎵ц閫氱煡");
- if (!string.IsNullOrEmpty(result))
- {
- var res = JsonConvert.DeserializeObject<WcsTaskCallBack>(result);
- if (res.code == "0")
+ var tac = newDb.Queryable<WcsSafety>().Where(a => a.TaskNo == mst.S_CODE && a.Sign == state).ToList();
+ if (tac.Count() > 0)
{
- WcsSafety Sign = new WcsSafety();
- Sign.TaskNo = mst.S_CODE;
- Sign.Sign = state;
- newDb.BeginTran();
- var B = newDb.Insertable(Sign).ExecuteCommand();
- if (B == 0)
- {
- newDb.RollbackTran();
- }
- newDb.CommitTran();
- LogHelper.Info("agv鎵ц閫氱煡鎴愬姛:", "agv鎵ц閫氱煡");
+ LogHelper.Info("鏌ヨ鍒板畨鍏ㄨ姹備俊鍙疯褰曡〃宸茬粡瀛樺湪鏁版嵁,姝ゆ淇″彿涓嶄笅杈剧粰绔嬪簱", "agv鎵ц閫氱煡");
return true;
+ }
+ switch (state)
+ {
+ case 1101:
+ Type = "1";
+ bit = mst.S_START_LOC;
+ Meshod = "AgvRequest";
+ break;
+ case 1102:
+ Type = "1";
+ bit = mst.S_START_LOC;
+ Meshod = "Complete";
+ break;
+ case 1103:
+ Type = "2";
+ bit = mst.S_END_LOC;
+ Meshod = "AgvRequest";
+ break;
+ case 1104:
+ Type = "2";
+ bit = mst.S_END_LOC;
+ Meshod = "Complete";
+ break;
+ case 7:
+ Type = "5";
+ if (mst.S_TYPE.Contains("鍑哄簱"))
+ {
+ bit = mst.S_START_LOC;
+ }
+ else
+ {
+ bit = mst.S_END_LOC;
+ }
+
+ //閫�簱鍙栨秷鍙慳gv璧风偣
+ if (LocationHelper.GetErroArea(mst.S_END_AREA))
+ {
+ bit = mst.S_START_LOC;
+ }
+
+
+ Meshod = "AgvRequestCancel";
+ break;
+ }
+
+
+
+
+ var interact = new
+ {
+ requestPk = mst.S_CODE,//浠诲姟鍙�+ trkType = Type,//浠诲姟绫诲瀷
+ method = Meshod,//API鍚嶇О
+ stnNo = bit,//鐩殑鍦扮珯鍙板彿
+ carNo = forkliftNo,// 杞﹀彿
+ clientCode = "WMS",//鎿嶄綔浜�+ operationTime = DateTime.Now.ToString()//鎿嶄綔鏃堕棿
+ };
+ LogHelper.Info("agv鎵ц閫氱煡 鍦板潃淇℃伅:" + baseUrl + "agvCallback", "agv鎵ц閫氱煡");
+ LogHelper.Info("agv鎵ц閫氱煡 鍙傛暟淇℃伅:" + JsonConvert.SerializeObject(interact), "agv鎵ц閫氱煡");
+ var result = apiHelper.Post(baseUrl + "agvCallback", JsonConvert.SerializeObject(interact));
+ LogHelper.Info("agv鎵ц閫氱煡 杩斿洖淇℃伅:" + JsonConvert.SerializeObject(result), "agv鎵ц閫氱煡");
+ if (!string.IsNullOrEmpty(result))
+ {
+ var res = JsonConvert.DeserializeObject<WcsTaskCallBack>(result);
+ if (res.code == "0")
+ {
+ WcsSafety Sign = new WcsSafety();
+ Sign.TaskNo = mst.S_CODE;
+ Sign.Sign = state;
+ newDb.BeginTran();
+ var B = newDb.Insertable(Sign).ExecuteCommand();
+ if (B == 0)
+ {
+ newDb.RollbackTran();
+ }
+ newDb.CommitTran();
+ LogHelper.Info("agv鎵ц閫氱煡鎴愬姛:", "agv鎵ц閫氱煡");
+ return true;
+ }
+ else
+ {
+ return false;
+ }
}
else
{
+ LogHelper.Info("agv鎵ц閫氱煡鎴愬姛 杩斿洖淇℃伅涓虹┖", "agv鎵ц閫氱煡");
return false;
}
}
- else
+ catch (Exception)
{
- LogHelper.Info("agv鎵ц閫氱煡鎴愬姛 杩斿洖淇℃伅涓虹┖", "agv鎵ц閫氱煡");
- return false;
+
+ throw;
}
+
+
}
@@ -1351,7 +1375,7 @@
public string code { get; set; }
public string msg { get; set; }
public bool success { get; set; }
- public DataItem lastTime { get; set; }
+ public DateTime lastTime { get; set; }
}
/// <summary>
diff --git a/process/TaskProcess.cs b/process/TaskProcess.cs
index 83a4897..b3da7d6 100644
--- a/process/TaskProcess.cs
+++ b/process/TaskProcess.cs
@@ -638,6 +638,15 @@
return result;
}
+ internal static LocationRecordsResult LocationRecords(LocationRecordsParme model) {
+ var result = new LocationRecordsResult();
+ var db = new SqlHelper<object>().GetInstance();
+
+ return result;
+ }
+
+
+
internal static Result MesUdeItem(MesUdeItemParme model)
{
var result = new Result();
@@ -956,34 +965,22 @@
{
var task = TaskHelper.GetTaskByWorkNo(model.task_no, "agv");
- var wcsTask = TaskHelper.GetTaskByWorkNo(model.task_no,"wcs");
+ var wcsTask = TaskHelper.GetTaskByWorkNo(model.task_no, "wcs");
- if (task != null && wcsTask != null)
+ if (task != null)
{
+ LogHelper.Info($"cancelTask1鍙栨秷agv浠诲姟{task.S_CODE}锛�, "鍙栨秷");
if (task.S_B_STATE.Trim() == "鏈墽琛�)
{
//鏈墽琛岀洿鎺ヤ慨鏀圭姸鎬佷负鍙栨秷
- LogHelper.Info("cancelTask1鍙栨秷agv浠诲姟锛�, "鍙栨秷");
+ TaskHelper.opMesTask(task, 3);
TaskHelper.Fail(task);
TaskProcess.CacheBitCancelUpdate(task);
- if (task.S_TYPE.Contains("鍏ュ簱") || task.S_TYPE.Contains("鍥炲簱"))
- {
- ContainerHelper.delCntr(task.S_CNTR_CODE);
- ContainerHelper.delCntrItem(task.S_CNTR_CODE);
- }
- else {
- WcsTask.WcsCancellTask(wcsTask);
- }
-
-
- TaskHelper.Fail(wcsTask);
- TaskProcess.OperateStatus(wcsTask, 7);
result.errCode = 0;
result.errMsg = "鍙栨秷鎴愬姛";
result.success = true;
- return result;
}
- else if (task.S_B_STATE.Trim() != "鍙栨秷" && task.S_B_STATE.Trim() != "澶辫触")
+ else if (task.S_B_STATE.Trim() != "鍙栨秷" && task.S_B_STATE.Trim() != "澶辫触" && task.S_B_STATE.Trim() != "瀹屾垚")
{
var db = new SqlHelper<object>().GetInstance();
var qhflag = db.Queryable<WmsTaskAction>().Where(a => a.S_TASK_CODE == task.S_CODE && a.S_ACTION == "4").First();
@@ -997,22 +994,13 @@
result.success = false;
return result;
}
-
+ TaskHelper.opMesTask(task, 3);
//宸叉帹閫佷絾鏄病鏈夊畬鎴愭垨鑰呭彇娑堬紝閫氱煡hosttoagv
TaskHelper.Fail(task);
-
+
NDCApi.CancelOrder(task.S_CODE.Trim());
TaskProcess.CacheBitCancelUpdate(task);
- if (task.S_TYPE.Contains("鍏ュ簱") || task.S_TYPE.Contains("鍥炲簱"))
- {
- ContainerHelper.delCntr(task.S_CNTR_CODE);
- ContainerHelper.delCntrItem(task.S_CNTR_CODE);
- }
- else {
- WcsTask.WcsCancellTask(wcsTask);
- }
- TaskHelper.Fail(wcsTask);
- TaskProcess.OperateStatus(wcsTask, 7);
+
result.errCode = 0;
result.errMsg = "鍙栨秷鎴愬姛";
result.success = true;
@@ -1030,11 +1018,52 @@
result.errMsg = $"{model.task_no}浠诲姟涓嶅瓨鍦�;
result.success = false;
}
+
+ if (wcsTask != null)
+ {
+ LogHelper.Info($"cancelTask1鍙栨秷Wcs浠诲姟{wcsTask.S_CODE}", "鍙栨秷");
+ if (wcsTask.S_B_STATE.Trim() == "鏈墽琛�)
+ {
+ //鏈墽琛岀洿鎺ヤ慨鏀圭姸鎬佷负鍙栨秷
+ if (task.S_TYPE.Contains("鍏ュ簱") || task.S_TYPE.Contains("鍥炲簱"))
+ {
+ ContainerHelper.delCntr(task.S_CNTR_CODE);
+ ContainerHelper.delCntrItem(task.S_CNTR_CODE);
+ }
+ TaskHelper.Fail(wcsTask);
+ TaskProcess.OperateStatus(wcsTask, 7);
+ result.errCode = 0;
+ result.errMsg = "鍙栨秷鎴愬姛";
+ result.success = true;
+ return result;
+ }
+ else if (wcsTask.S_B_STATE.Trim() != "鍙栨秷" && wcsTask.S_B_STATE.Trim() != "澶辫触" && wcsTask.S_B_STATE.Trim() != "瀹屾垚")
+ {
+ var db = new SqlHelper<object>().GetInstance();
+ var qhflag = db.Queryable<WmsTaskAction>().Where(a => a.S_TASK_CODE == task.S_CODE && a.S_ACTION == "5").First();
+
+
+ if (qhflag != null)
+ {
+ LogHelper.Info($"璇ヤ换鍔task.S_CODE}宸茬粡鍙栬揣瀹屾垚", "鍙栨秷");
+ result.errCode = 1;
+ result.errMsg = "浠诲姟宸茬粡鍙栬揣瀹屾垚锛屼笉鍏佽鍙栨秷";
+ result.success = false;
+ return result;
+ }
+ WcsTask.WcsCancellTask(wcsTask);
+ TaskHelper.Fail(wcsTask);
+ TaskProcess.OperateStatus(wcsTask, 7);
+ result.errCode = 0;
+ result.errMsg = "鍙栨秷鎴愬姛";
+ result.success = true;
+ }
+ }
}
catch (Exception ex)
{
- LogHelper.Info("cancelTask1鍙栨秷浠诲姟寮傚父锛�+ex.Message, "鍙栨秷");
+ LogHelper.Info("cancelTask1鍙栨秷浠诲姟寮傚父锛� + ex.Message, "鍙栨秷");
result.errCode = 1;
result.errMsg = "鍙栨秷浠诲姟寮傚父";
return result;
diff --git a/wms/TaskHelper.cs b/wms/TaskHelper.cs
index ee18278..12578b6 100644
--- a/wms/TaskHelper.cs
+++ b/wms/TaskHelper.cs
@@ -425,7 +425,7 @@
LogHelper.Info($"浠诲姟{task1.S_CODE},{task2.S_CODE}鍒涘缓鎴愬姛", "浠诲姟");
var db = new SqlHelper<object>().GetInstance();
db.Updateable(operation).UpdateColumns(it => new { it.N_B_STATE, it.S_B_STATE }).ExecuteCommand();
-
+ LogHelper.Info($"鍥炴姤{task1.S_OP_CODE}", "鍥炴姤Mes浠诲姟");
TaskHelper.opMesTask(task1, 0);
}
else
@@ -597,16 +597,48 @@
var cntrItem = ContainerHelper.GetCntrItem(task.S_CNTR_CODE);
if (cntrItem == null)
{
- LogHelper.Info($"浠诲姟{task.S_CODE}娌℃煡鍒板鍣ㄧ墿鏂檣task.S_CNTR_CODE}", "涓婁笅鏋惰褰�);
+ LogHelper.Info($"浠诲姟{task.S_CODE}娌℃煡鍒板鍣ㄧ墿鏂檣task.S_CNTR_CODE}", "鍥炴姤Mes浠诲姟");
return false;
}
+
+ var work = TaskHelper.GetWmsWork(task.S_OP_CODE);
+
+ if (work == null) {
+ LogHelper.Info($"浠诲姟{task.S_CODE}娌℃煡鍒颁綔涓歿task.S_OP_CODE}", "鍥炴姤Mes浠诲姟");
+ return false;
+ }
+ var endArea = "";
+
+ if (LocationHelper.GetErroArea(task.S_END_AREA))
+ {
+ if (task.S_TYPE.Contains("鍑哄簱"))
+ {
+ endArea = task.S_END_LOC;
+ }
+ else {
+ endArea = task.S_END_AREA;
+ }
+
+
+ }
+ else {
+ if (task.S_TYPE.Contains("鍑哄簱"))
+ {
+ endArea = task.S_END_LOC;
+ }
+ else {
+ endArea = work.S_END_AREA;
+ }
+ }
+
+
var interact = new
{
taskNo = task.S_OP_CODE,//浠诲姟鍙� updater = "WMS",// 鎿嶄綔浜�濡俉MS/MES绛�- endStock = task.S_END_LOC,//缁堢偣
+ endStock = endArea,//缁堢偣
taskStatus = state,//0锛氬垵濮嬬姸鎬侊紝1锛氳繘琛屼腑锛�锛氬畬鎴愶紝3锛氫换鍔″彇娑� updateTime = DateTime.Now.ToString(),//鎿嶄綔鏃堕棿
TurnCardNum = cntrItem.TurnCardNum,//鍛ㄨ浆鍗″彿
@@ -798,6 +830,22 @@
LocationHelper.LockLoc(task.S_END_LOC, "鍑哄簱閿�, 2);
}
+ if (task.S_SCHEDULE_TYPE.Contains("agv"))
+ {
+
+ if (LocationHelper.GetErroArea(task.S_END_AREA))
+ {
+ 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();
+ }
+ else
+ {
+ TaskHelper.opMesTask(task, 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();
@@ -807,15 +855,6 @@
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 (LocationHelper.GetErroArea(task.S_END_AREA)) {
- 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();
- }
-
-
}
--
Gitblit v1.9.1