From 51141e4955e3021058664bea526f16b368738b3a Mon Sep 17 00:00:00 2001
From: pengmn <pmn@HanInfo>
Date: 星期二, 24 六月 2025 18:20:26 +0800
Subject: [PATCH] test
---
HH.WCS.Mobox3.HangYang/wms/WMSHelper.cs | 4
.vs/HH.WCS.Mobox3/FileContentIndex/5490667d-a3ee-4994-9971-85ab266c629b.vsidx | 0
HH.WCS.Mobox3.HangYang/dispatch/HangAoHelper.cs | 216 +++++++++++++
HH.WCS.Mobox3.HangYang/api/WmsController.cs | 30 +
.vs/HH.WCS.Mobox3/v17/DocumentLayout.backup.json | 124 ++-----
/dev/null | 0
HH.WCS.Mobox3.HangYang/dispatch/HanAo.cs | 1
HH.WCS.Mobox3.HangYang/models/Wcsmodel.cs | 103 ++++++
.vs/HH.WCS.Mobox3/FileContentIndex/6824153d-8b71-4170-a49e-26273ac7c5db.vsidx | 0
HH.WCS.Mobox3.HangYang/process/TaskProcess.cs | 325 +++++++++++++++-----
HH.WCS.Mobox3.HangYang/HH.WCS.HangYang.csproj | 1
.vs/HH.WCS.Mobox3/v17/DocumentLayout.json | 124 ++-----
12 files changed, 665 insertions(+), 263 deletions(-)
diff --git a/.vs/HH.WCS.Mobox3/FileContentIndex/5490667d-a3ee-4994-9971-85ab266c629b.vsidx b/.vs/HH.WCS.Mobox3/FileContentIndex/5490667d-a3ee-4994-9971-85ab266c629b.vsidx
new file mode 100644
index 0000000..85e2922
--- /dev/null
+++ b/.vs/HH.WCS.Mobox3/FileContentIndex/5490667d-a3ee-4994-9971-85ab266c629b.vsidx
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3/FileContentIndex/6824153d-8b71-4170-a49e-26273ac7c5db.vsidx b/.vs/HH.WCS.Mobox3/FileContentIndex/6824153d-8b71-4170-a49e-26273ac7c5db.vsidx
new file mode 100644
index 0000000..2f239c9
--- /dev/null
+++ b/.vs/HH.WCS.Mobox3/FileContentIndex/6824153d-8b71-4170-a49e-26273ac7c5db.vsidx
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3/FileContentIndex/ba89a93a-72a3-49a1-92bb-902e38128e9f.vsidx b/.vs/HH.WCS.Mobox3/FileContentIndex/ba89a93a-72a3-49a1-92bb-902e38128e9f.vsidx
deleted file mode 100644
index f1558a9..0000000
--- a/.vs/HH.WCS.Mobox3/FileContentIndex/ba89a93a-72a3-49a1-92bb-902e38128e9f.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3/v17/DocumentLayout.backup.json b/.vs/HH.WCS.Mobox3/v17/DocumentLayout.backup.json
index 1c57d22..6f363ff 100644
--- a/.vs/HH.WCS.Mobox3/v17/DocumentLayout.backup.json
+++ b/.vs/HH.WCS.Mobox3/v17/DocumentLayout.backup.json
@@ -3,36 +3,28 @@
"WorkspaceRootPath": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\",
"Documents": [
{
- "AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\core\\wcscore.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|solutionrelative:hh.wcs.mobox3.hangyang\\core\\wcscore.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|solutionrelative:hh.wcs.mobox3.hangyang\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\api\\agvcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|solutionrelative:hh.wcs.mobox3.hangyang\\api\\agvcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ "AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\wms\\wmshelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|solutionrelative:hh.wcs.mobox3.hangyang\\wms\\wmshelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\process\\taskprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|solutionrelative:hh.wcs.mobox3.hangyang\\process\\taskprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
- "AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|d:\\\u6C49\u548C\u667A\u80FD\\git-mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\api\\wmscontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\api\\wmscontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|solutionrelative:hh.wcs.mobox3.hangyang\\api\\wmscontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
- "AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|d:\\\u6C49\u548C\u667A\u80FD\\git-mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\wms\\wmshelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|solutionrelative:hh.wcs.mobox3.hangyang\\wms\\wmshelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ "AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\api\\agvcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|solutionrelative:hh.wcs.mobox3.hangyang\\api\\agvcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|solutionrelative:hh.wcs.mobox3.hangyang\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\wms\\containerhelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|solutionrelative:hh.wcs.mobox3.hangyang\\wms\\containerhelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\models\\wms\\algorit.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|solutionrelative:hh.wcs.mobox3.hangyang\\models\\wms\\algorit.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\api\\moboxcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
@@ -45,10 +37,6 @@
{
"AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\util\\settings.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|solutionrelative:hh.wcs.mobox3.hangyang\\util\\settings.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\dispatch\\hanao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|solutionrelative:hh.wcs.mobox3.hangyang\\dispatch\\hanao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\dispatch\\ndc.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
@@ -66,21 +54,8 @@
"DocumentGroups": [
{
"DockedWidth": 200,
- "SelectedChildIndex": 8,
+ "SelectedChildIndex": 5,
"Children": [
- {
- "$type": "Document",
- "DocumentIndex": 5,
- "Title": "WMSHelper.cs",
- "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\wms\\WMSHelper.cs",
- "RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\wms\\WMSHelper.cs",
- "ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\wms\\WMSHelper.cs",
- "RelativeToolTip": "HH.WCS.Mobox3.HangYang\\wms\\WMSHelper.cs",
- "ViewState": "AgIAACMCAAAAAAAAAAAowLYCAAA5AAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-06-23T06:28:50.054Z",
- "EditorCaption": ""
- },
{
"$type": "Bookmark",
"Name": "ST:0:0:{eefa5220-e298-11d0-8f78-00a0c9110057}"
@@ -91,46 +66,59 @@
},
{
"$type": "Document",
- "DocumentIndex": 3,
+ "DocumentIndex": 1,
"Title": "TaskProcess.cs",
"DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\process\\TaskProcess.cs",
"RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\process\\TaskProcess.cs",
"ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\process\\TaskProcess.cs",
"RelativeToolTip": "HH.WCS.Mobox3.HangYang\\process\\TaskProcess.cs",
- "ViewState": "AgIAAGQBAAAAAAAAAAA+wEwCAAA9AAAAAAAAAA==",
+ "ViewState": "AgIAAMEGAAAAAAAAAAAuwMUGAAAgAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-19T00:42:44.641Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 2,
+ "DocumentIndex": 3,
"Title": "AgvController.cs",
"DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\api\\AgvController.cs",
"RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\api\\AgvController.cs",
"ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\api\\AgvController.cs",
"RelativeToolTip": "HH.WCS.Mobox3.HangYang\\api\\AgvController.cs",
- "ViewState": "AgIAAAsAAAAAAAAAAAAqwBoAAAAiAAAAAAAAAA==",
+ "ViewState": "AgIAAA4AAAAAAAAAAAAqwBoAAAAcAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-20T02:48:30.565Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 4,
+ "DocumentIndex": 2,
"Title": "WmsController.cs",
"DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\api\\WmsController.cs",
"RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\api\\WmsController.cs",
"ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\api\\WmsController.cs",
"RelativeToolTip": "HH.WCS.Mobox3.HangYang\\api\\WmsController.cs",
- "ViewState": "AgIAABMAAAAAAAAAAAAuwFMAAAA5AAAAAAAAAA==",
+ "ViewState": "AgIAAHcAAAAAAAAAAAAAwIEAAAArAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-19T00:41:35.255Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 6,
+ "DocumentIndex": 0,
+ "Title": "WMSHelper.cs",
+ "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\wms\\WMSHelper.cs",
+ "RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\wms\\WMSHelper.cs",
+ "ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\wms\\WMSHelper.cs \u2B24",
+ "RelativeToolTip": "HH.WCS.Mobox3.HangYang\\wms\\WMSHelper.cs \u2B24",
+ "ViewState": "AgIAAOoCAAAAAAAAAAAAAPYCAACIAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-06-23T06:28:50.054Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 5,
"Title": "ContainerHelper.cs",
"DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\wms\\ContainerHelper.cs",
"RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\wms\\ContainerHelper.cs",
@@ -138,12 +126,11 @@
"RelativeToolTip": "HH.WCS.Mobox3.HangYang\\wms\\ContainerHelper.cs",
"ViewState": "AgIAABUAAAAAAAAAAAAswFsAAAAnAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-29T06:18:44.151Z",
- "EditorCaption": ""
+ "WhenOpened": "2025-05-29T06:18:44.151Z"
},
{
"$type": "Document",
- "DocumentIndex": 1,
+ "DocumentIndex": 4,
"Title": "Program.cs",
"DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\Program.cs",
"RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\Program.cs",
@@ -156,44 +143,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 0,
- "Title": "WCSCore.cs",
- "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\core\\WCSCore.cs",
- "RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\core\\WCSCore.cs",
- "ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\core\\WCSCore.cs",
- "RelativeToolTip": "HH.WCS.Mobox3.HangYang\\core\\WCSCore.cs",
- "ViewState": "AgIAAF8AAAAAAAAAAAAuwGYAAAAIAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-27T10:24:13.523Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 7,
- "Title": "Algorit.cs",
- "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\models\\wms\\Algorit.cs",
- "RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\models\\wms\\Algorit.cs",
- "ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\models\\wms\\Algorit.cs",
- "RelativeToolTip": "HH.WCS.Mobox3.HangYang\\models\\wms\\Algorit.cs",
- "ViewState": "AgIAADEAAAAAAAAAAAAUwD0AAAAgAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-29T03:41:57.135Z"
- },
- {
- "$type": "Document",
- "DocumentIndex": 11,
- "Title": "HanAo.cs",
- "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\dispatch\\HanAo.cs",
- "RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\dispatch\\HanAo.cs",
- "ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\dispatch\\HanAo.cs",
- "RelativeToolTip": "HH.WCS.Mobox3.HangYang\\dispatch\\HanAo.cs",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAAAwAAAAIAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-29T01:59:48.374Z"
- },
- {
- "$type": "Document",
- "DocumentIndex": 8,
+ "DocumentIndex": 6,
"Title": "MoboxController.cs",
"DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\api\\MoboxController.cs",
"RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\api\\MoboxController.cs",
@@ -205,7 +155,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 9,
+ "DocumentIndex": 7,
"Title": "Container.cs",
"DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\models\\Container.cs",
"RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\models\\Container.cs",
@@ -217,7 +167,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 10,
+ "DocumentIndex": 8,
"Title": "Settings.cs",
"DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\util\\Settings.cs",
"RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\util\\Settings.cs",
@@ -229,7 +179,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 12,
+ "DocumentIndex": 9,
"Title": "NDC.cs",
"DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\dispatch\\NDC.cs",
"RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\dispatch\\NDC.cs",
@@ -241,7 +191,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 13,
+ "DocumentIndex": 10,
"Title": "HttpHelper.cs",
"DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\util\\HttpHelper.cs",
"RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\util\\HttpHelper.cs",
diff --git a/.vs/HH.WCS.Mobox3/v17/DocumentLayout.json b/.vs/HH.WCS.Mobox3/v17/DocumentLayout.json
index 1c57d22..4c43e6f 100644
--- a/.vs/HH.WCS.Mobox3/v17/DocumentLayout.json
+++ b/.vs/HH.WCS.Mobox3/v17/DocumentLayout.json
@@ -3,36 +3,28 @@
"WorkspaceRootPath": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\",
"Documents": [
{
- "AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\core\\wcscore.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|solutionrelative:hh.wcs.mobox3.hangyang\\core\\wcscore.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|solutionrelative:hh.wcs.mobox3.hangyang\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\api\\agvcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|solutionrelative:hh.wcs.mobox3.hangyang\\api\\agvcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ "AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\wms\\wmshelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|solutionrelative:hh.wcs.mobox3.hangyang\\wms\\wmshelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\process\\taskprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|solutionrelative:hh.wcs.mobox3.hangyang\\process\\taskprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
- "AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|d:\\\u6C49\u548C\u667A\u80FD\\git-mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\api\\wmscontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\api\\wmscontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|solutionrelative:hh.wcs.mobox3.hangyang\\api\\wmscontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
- "AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|d:\\\u6C49\u548C\u667A\u80FD\\git-mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\wms\\wmshelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|solutionrelative:hh.wcs.mobox3.hangyang\\wms\\wmshelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ "AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\api\\agvcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|solutionrelative:hh.wcs.mobox3.hangyang\\api\\agvcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|solutionrelative:hh.wcs.mobox3.hangyang\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\wms\\containerhelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|solutionrelative:hh.wcs.mobox3.hangyang\\wms\\containerhelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\models\\wms\\algorit.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|solutionrelative:hh.wcs.mobox3.hangyang\\models\\wms\\algorit.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\api\\moboxcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
@@ -45,10 +37,6 @@
{
"AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\util\\settings.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|solutionrelative:hh.wcs.mobox3.hangyang\\util\\settings.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\dispatch\\hanao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|solutionrelative:hh.wcs.mobox3.hangyang\\dispatch\\hanao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\dispatch\\ndc.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
@@ -66,21 +54,8 @@
"DocumentGroups": [
{
"DockedWidth": 200,
- "SelectedChildIndex": 8,
+ "SelectedChildIndex": 5,
"Children": [
- {
- "$type": "Document",
- "DocumentIndex": 5,
- "Title": "WMSHelper.cs",
- "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\wms\\WMSHelper.cs",
- "RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\wms\\WMSHelper.cs",
- "ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\wms\\WMSHelper.cs",
- "RelativeToolTip": "HH.WCS.Mobox3.HangYang\\wms\\WMSHelper.cs",
- "ViewState": "AgIAACMCAAAAAAAAAAAowLYCAAA5AAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-06-23T06:28:50.054Z",
- "EditorCaption": ""
- },
{
"$type": "Bookmark",
"Name": "ST:0:0:{eefa5220-e298-11d0-8f78-00a0c9110057}"
@@ -91,46 +66,59 @@
},
{
"$type": "Document",
- "DocumentIndex": 3,
+ "DocumentIndex": 1,
"Title": "TaskProcess.cs",
"DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\process\\TaskProcess.cs",
"RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\process\\TaskProcess.cs",
"ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\process\\TaskProcess.cs",
"RelativeToolTip": "HH.WCS.Mobox3.HangYang\\process\\TaskProcess.cs",
- "ViewState": "AgIAAGQBAAAAAAAAAAA+wEwCAAA9AAAAAAAAAA==",
+ "ViewState": "AgIAAMEGAAAAAAAAAAAuwMUGAAAgAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-19T00:42:44.641Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 2,
+ "DocumentIndex": 3,
"Title": "AgvController.cs",
"DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\api\\AgvController.cs",
"RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\api\\AgvController.cs",
"ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\api\\AgvController.cs",
"RelativeToolTip": "HH.WCS.Mobox3.HangYang\\api\\AgvController.cs",
- "ViewState": "AgIAAAsAAAAAAAAAAAAqwBoAAAAiAAAAAAAAAA==",
+ "ViewState": "AgIAAA4AAAAAAAAAAAAqwBoAAAAcAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-20T02:48:30.565Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 4,
+ "DocumentIndex": 2,
"Title": "WmsController.cs",
"DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\api\\WmsController.cs",
"RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\api\\WmsController.cs",
"ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\api\\WmsController.cs",
"RelativeToolTip": "HH.WCS.Mobox3.HangYang\\api\\WmsController.cs",
- "ViewState": "AgIAABMAAAAAAAAAAAAuwFMAAAA5AAAAAAAAAA==",
+ "ViewState": "AgIAAHcAAAAAAAAAAAAAwIEAAAArAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-19T00:41:35.255Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 6,
+ "DocumentIndex": 0,
+ "Title": "WMSHelper.cs",
+ "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\wms\\WMSHelper.cs",
+ "RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\wms\\WMSHelper.cs",
+ "ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\wms\\WMSHelper.cs",
+ "RelativeToolTip": "HH.WCS.Mobox3.HangYang\\wms\\WMSHelper.cs",
+ "ViewState": "AgIAAOoCAAAAAAAAAAAAAPYCAACIAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-06-23T06:28:50.054Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 5,
"Title": "ContainerHelper.cs",
"DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\wms\\ContainerHelper.cs",
"RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\wms\\ContainerHelper.cs",
@@ -138,12 +126,11 @@
"RelativeToolTip": "HH.WCS.Mobox3.HangYang\\wms\\ContainerHelper.cs",
"ViewState": "AgIAABUAAAAAAAAAAAAswFsAAAAnAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-29T06:18:44.151Z",
- "EditorCaption": ""
+ "WhenOpened": "2025-05-29T06:18:44.151Z"
},
{
"$type": "Document",
- "DocumentIndex": 1,
+ "DocumentIndex": 4,
"Title": "Program.cs",
"DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\Program.cs",
"RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\Program.cs",
@@ -156,44 +143,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 0,
- "Title": "WCSCore.cs",
- "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\core\\WCSCore.cs",
- "RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\core\\WCSCore.cs",
- "ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\core\\WCSCore.cs",
- "RelativeToolTip": "HH.WCS.Mobox3.HangYang\\core\\WCSCore.cs",
- "ViewState": "AgIAAF8AAAAAAAAAAAAuwGYAAAAIAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-27T10:24:13.523Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 7,
- "Title": "Algorit.cs",
- "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\models\\wms\\Algorit.cs",
- "RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\models\\wms\\Algorit.cs",
- "ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\models\\wms\\Algorit.cs",
- "RelativeToolTip": "HH.WCS.Mobox3.HangYang\\models\\wms\\Algorit.cs",
- "ViewState": "AgIAADEAAAAAAAAAAAAUwD0AAAAgAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-29T03:41:57.135Z"
- },
- {
- "$type": "Document",
- "DocumentIndex": 11,
- "Title": "HanAo.cs",
- "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\dispatch\\HanAo.cs",
- "RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\dispatch\\HanAo.cs",
- "ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\dispatch\\HanAo.cs",
- "RelativeToolTip": "HH.WCS.Mobox3.HangYang\\dispatch\\HanAo.cs",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAAAwAAAAIAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-29T01:59:48.374Z"
- },
- {
- "$type": "Document",
- "DocumentIndex": 8,
+ "DocumentIndex": 6,
"Title": "MoboxController.cs",
"DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\api\\MoboxController.cs",
"RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\api\\MoboxController.cs",
@@ -205,7 +155,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 9,
+ "DocumentIndex": 7,
"Title": "Container.cs",
"DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\models\\Container.cs",
"RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\models\\Container.cs",
@@ -217,7 +167,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 10,
+ "DocumentIndex": 8,
"Title": "Settings.cs",
"DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\util\\Settings.cs",
"RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\util\\Settings.cs",
@@ -229,7 +179,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 12,
+ "DocumentIndex": 9,
"Title": "NDC.cs",
"DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\dispatch\\NDC.cs",
"RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\dispatch\\NDC.cs",
@@ -241,7 +191,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 13,
+ "DocumentIndex": 10,
"Title": "HttpHelper.cs",
"DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\util\\HttpHelper.cs",
"RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\util\\HttpHelper.cs",
diff --git a/HH.WCS.Mobox3.HangYang/HH.WCS.HangYang.csproj b/HH.WCS.Mobox3.HangYang/HH.WCS.HangYang.csproj
index 61f000b..b84d172 100644
--- a/HH.WCS.Mobox3.HangYang/HH.WCS.HangYang.csproj
+++ b/HH.WCS.Mobox3.HangYang/HH.WCS.HangYang.csproj
@@ -200,6 +200,7 @@
<Compile Include="device\TcpServer.cs" />
<Compile Include="dispatch\GZRobot.cs" />
<Compile Include="dispatch\HanAo.cs" />
+ <Compile Include="dispatch\HangAoHelper.cs" />
<Compile Include="dispatch\NDC.cs" />
<Compile Include="core\Monitor.cs" />
<Compile Include="models\BaseModel.cs" />
diff --git a/HH.WCS.Mobox3.HangYang/api/WmsController.cs b/HH.WCS.Mobox3.HangYang/api/WmsController.cs
index 188bb23..c61ab8f 100644
--- a/HH.WCS.Mobox3.HangYang/api/WmsController.cs
+++ b/HH.WCS.Mobox3.HangYang/api/WmsController.cs
@@ -96,13 +96,41 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public async Task<Result> notifyDeviceSignal(List<Wcsmodel> model)
+ public async Task<WcsResult> notifyDeviceSignal(List<WcsModel> model)
{
LogHelper.Info("notifyDeviceSignal 鍙傛暟锛� + JsonConvert.SerializeObject(model), "WMSAPI");
var res = await TaskProcess.notifyDeviceSignal(model);
LogHelper.Info("notifyDeviceSignal 杩斿洖锛� + JsonConvert.SerializeObject(res), "WMSAPI");
return res;
}
+
+ /// <summary>
+ /// 鏉哀WCS璋冪敤浠诲姟鐘舵�鍙嶉
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public async Task<WcsResult> notifyTaskStatus(WcsTaskModel model)
+ {
+ LogHelper.Info("notifyTaskStatus 鍙傛暟锛� + JsonConvert.SerializeObject(model), "WMSAPI");
+ var res = await TaskProcess.notifyTaskStatus(model);
+ LogHelper.Info("notifyTaskStatus 杩斿洖锛� + JsonConvert.SerializeObject(res), "WMSAPI");
+ return res;
+ }
+
+ /// <summary>
+ /// 鏉哀WCS璋冪敤鐢宠缁堢偣
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public async Task<WcsResult> applyDest(WcsTaskEnd model)
+ {
+ LogHelper.Info("applyDest 鍙傛暟锛� + JsonConvert.SerializeObject(model), "WMSAPI");
+ var res = await TaskProcess.applyDest(model);
+ LogHelper.Info("applyDest 杩斿洖锛� + JsonConvert.SerializeObject(res), "WMSAPI");
+ return res;
+ }
#endregion
}
diff --git a/HH.WCS.Mobox3.HangYang/dispatch/HanAo.cs b/HH.WCS.Mobox3.HangYang/dispatch/HanAo.cs
index e0d5f71..b123723 100644
--- a/HH.WCS.Mobox3.HangYang/dispatch/HanAo.cs
+++ b/HH.WCS.Mobox3.HangYang/dispatch/HanAo.cs
@@ -82,6 +82,7 @@
}
+
public class TaskInfoModel {
/// <summary>
/// 璇锋眰pk
diff --git a/HH.WCS.Mobox3.HangYang/dispatch/HangAoHelper.cs b/HH.WCS.Mobox3.HangYang/dispatch/HangAoHelper.cs
new file mode 100644
index 0000000..7639225
--- /dev/null
+++ b/HH.WCS.Mobox3.HangYang/dispatch/HangAoHelper.cs
@@ -0,0 +1,216 @@
+锘縰sing HH.WCS.HangYang.util;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using static HH.WCS.HangYang.dispatch.HanAo;
+
+namespace HH.WCS.HangYang.LISTA.dispatch
+{
+ public class HangAoHelper
+ {
+ private static readonly HttpHelper apiHelper = new HttpHelper();
+ private static readonly string baseUrl = Settings.HASeverUrl;
+
+ /// <summary>
+ /// 鏉ゥ浠诲姟鍒涘缓
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public static bool CreateOrder(TaskInfoModel model)
+ {
+ var msg = "";
+ var result = true;
+ var request = JsonConvert.SerializeObject(model);
+ var response = apiHelper.Post(baseUrl + "/sendTask", request);
+ msg = $"[CreateOrder] request={request} response={response}";
+ Console.WriteLine(msg);
+ if (response != "")
+ {
+ try
+ {
+ var dataResult = JsonConvert.DeserializeObject<HAResult>(response);
+ if (dataResult.code == "0")
+ {
+ result = true;
+ }
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine(ex.Message);
+ }
+ }
+ else
+ {
+ msg = "[hanao-CreateOrder]鍒涘缓璁㈠崟澶辫触";
+ Console.WriteLine(msg);
+ }
+
+ LogHelper.Info(msg, "鏉ゥ");
+ return result;
+ }
+
+ /// <summary>
+ /// 鏉ゥ浠诲姟鍙栨秷
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public static bool CancelOrder(CancelModel model)
+ {
+ bool result = false;
+ string msg = "";
+ var request = JsonConvert.SerializeObject(model);
+ var response = apiHelper.Post(baseUrl + "/cancelTask", request);
+ msg = $"[CancelOrder] request={request};response={response}";
+ Console.WriteLine(msg);
+ if (response != "")
+ {
+ var dataResult = JsonConvert.DeserializeObject<HAResult>(response);
+ if (dataResult.code == "0")
+ {
+ result = true;
+ }
+ }
+ else
+ {
+ msg = "[hanao-CancelOrder]鍙栨秷璁㈠崟澶辫触";
+ Console.WriteLine(msg);
+ }
+ LogHelper.Info(msg, "鏉ゥ");
+ return result;
+ }
+
+ /// <summary>
+ /// 鏉ゥ璁惧鐘舵�鏌ヨ
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public static bool GetDeviceState(CancelModel model)
+ {
+ bool result = false;
+ string msg = "";
+ var request = JsonConvert.SerializeObject(model);
+ var response = apiHelper.Post(baseUrl + "/getDeviceStatus", request);
+ msg = $"[GetDeviceState] request={request};response={response}";
+ Console.WriteLine(msg);
+ if (response != "")
+ {
+ var dataResult = JsonConvert.DeserializeObject<HAResult>(response);
+ if (dataResult.code == "0")
+ {
+ result = true;
+ }
+ }
+ else
+ {
+ msg = "[GetDeviceState]鑾峰彇璁惧鐘舵�澶辫触";
+ Console.WriteLine(msg);
+ }
+ LogHelper.Info(msg, "鏉ゥ");
+ return result;
+ }
+
+ /// <summary>
+ /// 鍒涘缓浠诲姟鍙傛暟
+ /// </summary>
+ public class TaskInfoModel
+ {
+ /// <summary>
+ /// 浠诲姟鍙�+ /// </summary>
+ public string taskNo { get; set; }
+ /// <summary>
+ /// 浠诲姟缁�+ /// </summary>
+ public string groupNo { get; set; }
+ /// <summary>
+ /// 浼樺厛绾�+ /// </summary>
+ public string priority { get; set; }
+ /// <summary>
+ /// 浠诲姟绫诲瀷
+ /// </summary>
+ public string taskType { get; set; }
+ /// <summary>
+ /// 璧风偣
+ /// </summary>
+ public string from { get; set; }
+ /// <summary>
+ /// 缁堢偣
+ /// </summary>
+ public string to { get; set; }
+ /// <summary>
+ /// 宸烽亾鍙�+ /// </summary>
+ public string roadWay { get; set; }
+ /// <summary>
+ /// 瀹瑰櫒鍙�+ /// </summary>
+ public string cntrNo { get; set; }
+ /// <summary>
+ /// 瀹瑰櫒绫诲瀷
+ /// </summary>
+ public string cntrType { get; set; }
+ /// <summary>
+ /// 鎵╁睍淇℃伅锛屾牴鎹」鐩嚜瀹氫箟
+ /// </summary>
+ public string extData { get; set; }
+
+ }
+
+ /// <summary>
+ /// 鍙栨秷浠诲姟鍙傛暟
+ /// </summary>
+ public class CancelModel
+ {
+ /// <summary>
+ /// 浠诲姟鍙�+ /// </summary>
+ public string taskNo { get; set; }
+ }
+
+ /// <summary>
+ /// 鑾峰彇璁惧鐘舵�鍙傛暟
+ /// </summary>
+ public class DeviceInfoModel
+ {
+ /// <summary>
+ /// 璁惧鍙�+ /// </summary>
+ public string[] deviceNo { get; set; }
+ }
+
+ /// <summary>
+ /// 杩斿洖缁撴灉
+ /// </summary>
+ public class HAResult
+ {
+ /// <summary>
+ /// 缁撴灉鍊�+ /// </summary>
+ public string code { get; set; }
+ /// <summary>
+ /// 寮傚父鎻忚堪
+ /// </summary>
+ public string msg { get; set; }
+ /// <summary>
+ /// 鑾峰彇璁惧鐘舵�浣跨敤
+ /// </summary>
+ public List<DataModel> data { get; set; }
+ }
+
+ /// <summary>
+ /// 杩斿洖缁撴灉data
+ /// </summary>
+ public class DataModel
+ {
+ public string deviceNo { get; set; }
+ public string workStatus { get; set; }
+ public string photoStatus { get; set; }
+ public string manualStatus { get; set; }
+ }
+
+ }
+}
diff --git a/HH.WCS.Mobox3.HangYang/models/Wcsmodel.cs b/HH.WCS.Mobox3.HangYang/models/Wcsmodel.cs
index c2a0470..5fde51a 100644
--- a/HH.WCS.Mobox3.HangYang/models/Wcsmodel.cs
+++ b/HH.WCS.Mobox3.HangYang/models/Wcsmodel.cs
@@ -6,7 +6,10 @@
namespace HH.WCS.HangYang.LISTA.models
{
- public class Wcsmodel
+ /// <summary>
+ /// 璁惧鍥炴姤
+ /// </summary>
+ public class WcsModel
{
/// <summary>
/// 璐т綅鐮�@@ -17,5 +20,103 @@
/// 鎵樼洏鐮� /// </summary>
public string cntrNo { get; set; }
+
+ /// <summary>
+ /// 璇锋眰绫诲瀷
+ /// </summary>
+ public string signalType { get; set; }
+
+ }
+
+ /// <summary>
+ /// 浠诲姟鍥炴姤
+ /// </summary>
+ public class WcsTaskModel
+ {
+ /// <summary>
+ /// 浠诲姟鍙�+ /// </summary>
+ public string taskNo { get; set; }
+
+ /// <summary>
+ /// wcs鐨勫瓙浠诲姟鍙�+ /// </summary>
+ public string subTaskNo { get; set; }
+
+ /// <summary>
+ /// 浠诲姟鐘舵�
+ /// </summary>
+ public string status { get; set; }
+
+ /// <summary>
+ /// 璁惧鍙�+ /// </summary>
+ public string deviceNo { get; set; }
+
+ /// <summary>
+ /// 褰撳墠鎵樼洏浣嶇疆
+ /// </summary>
+ public string loc { get; set; }
+
+ }
+
+ /// <summary>
+ /// 鐢宠缁堢偣
+ /// </summary>
+ public class WcsTaskEnd
+ {
+ /// <summary>
+ /// 浠诲姟鍙�+ /// </summary>
+ public string taskNo { get; set; }
+
+ /// <summary>
+ /// 鐢宠绫诲瀷
+ /// </summary>
+ public string applyType { get; set; }
+
+ /// <summary>
+ /// 褰撳墠鎵樼洏鍙�+ /// </summary>
+ public string cntrNo { get; set; }
+
+ /// <summary>
+ /// 浠诲姟鐘舵�
+ /// </summary>
+ public string loc { get; set; }
+
+ }
+
+ public class WcsResult
+ {
+ /// <summary>
+ /// 缁撴灉鍊�+ /// </summary>
+ public int code { get; set; }
+ /// <summary>
+ /// 寮傚父鎻忚堪
+ /// </summary>
+ public string msg { get; set; }
+
+ public List<DataModel> data { get; set; }
+ }
+
+ /// <summary>
+ /// 杩斿洖缁撴灉data
+ /// </summary>
+ public class DataModel
+ {
+ /// <summary>
+ /// 浠诲姟鍙�+ /// </summary>
+ public string taskNo { get; set; }
+ /// <summary>
+ /// 鎵樼洏鍙�+ /// </summary>
+ public string cntrCode { get; set; }
+ /// <summary>
+ /// 缁堢偣
+ /// </summary>
+ public string end { get; set; }
}
}
diff --git a/HH.WCS.Mobox3.HangYang/process/TaskProcess.cs b/HH.WCS.Mobox3.HangYang/process/TaskProcess.cs
index 1ef67ec..8661a37 100644
--- a/HH.WCS.Mobox3.HangYang/process/TaskProcess.cs
+++ b/HH.WCS.Mobox3.HangYang/process/TaskProcess.cs
@@ -1667,6 +1667,246 @@
#endregion
+ #region WCS璋冪敤鎺ュ彛
+
+ /// <summary>
+ /// WCS璋冪敤璁惧淇″彿鍙嶉
+ /// </summary>
+ /// <param name="model">璇锋眰鍙傛暟</param>
+ /// <returns></returns>
+ public static async Task<WcsResult> notifyDeviceSignal(List<WcsModel> model)
+ {
+ WcsResult result = new WcsResult() { code = 1, };
+ try
+ {
+ foreach (var item in model)
+ {
+ if (string.IsNullOrEmpty(item.cntrNo))
+ {
+ result.msg = "鎵樼洏鍙蜂负绌猴紒";
+ return result;
+ }
+ var list = WMSHelper.GetWmsTaskList("绛夊緟", item.cntrNo);
+ if (list == null)
+ {
+ list = WMSHelper.GetWmsTaskList("鎵ц", item.cntrNo);
+ if (list != null && list.S_TYPE.Contains("鍥炲簱"))
+ {
+ list.S_END_AREA = "TPLKQ";
+ }
+ }
+ if (list == null)
+ {
+ result.msg = "鏈煡璇㈠埌鍦ㄧ瓑寰呬腑鐨勪綔涓氾紒";
+ return result;
+ }
+
+ var inbound = new Inbound()
+ {
+ areaCode = list.S_END_AREA
+ };
+ var wh = new Warehouse(inbound);
+ var stored = await wh.StoreItemAsync();
+ if (stored == null)
+ {
+ result.msg = "绔嬪簱鍖烘湭鏌ヨ鍒板彲鐢ㄨ揣浣嶏紒";
+ return result;
+ }
+
+ var startLoc = ContainerHelper.GetCntrLoc(list.S_CNTR_CODE);
+ if (startLoc == null)
+ {
+ result.msg = $"鏈煡璇㈠埌鎵樼洏{list.S_CNTR_CODE}鎵�湪鐨勮揣浣嶏紒";
+ return result;
+ }
+ var res = TaskProcess.HYCreateTransport(startLoc.S_LOC_CODE, stored.loationCode, list.S_B_STATE == "绛夊緟" ? "鏂欑鍏ュ簱" : "鎵樼洏鍏ュ簱", list.S_CNTR_CODE, list.S_CODE);
+ if (!res)
+ {
+ result.msg = "鍏ュ簱浠诲姟鍒涘缓澶辫触锛�;
+ return result;
+ }
+ WMSHelper.UpdateTaskStatus(list.S_CODE, 1);
+ ContainerHelper.UpdateCntrAbouts(list.S_CNTR_CODE, "");
+ }
+ result.code = 0;
+ return result;
+ }
+ catch (Exception ex)
+ {
+ result.code = 2;
+ result.msg = ex.Message;
+ var st = new System.Diagnostics.StackTrace(ex, true);
+ var frame = st.GetFrame(0); // 鑾峰彇绗竴涓爢鏍堝抚
+ if (frame != null)
+ {
+ LogHelper.Error($"notifyDeviceSignal璁惧淇″彿鍙嶉鍑虹幇閿欒锛侊紒", ex);
+ LogHelper.Error($"鏂囦欢鍚� {frame.GetFileName()}", ex);
+ LogHelper.Error($"琛屽彿: {frame.GetFileLineNumber()}", ex);
+ LogHelper.Error($"鍒楀彿: {frame.GetFileColumnNumber()}", ex);
+ }
+ return result;
+ }
+ }
+
+ /// <summary>
+ /// WCS璋冪敤浠诲姟鐘舵�鍙嶉
+ /// </summary>
+ /// <param name="model">璇锋眰鍙傛暟</param>
+ /// <returns></returns>
+ public static async Task<WcsResult> notifyTaskStatus(WcsTaskModel model)
+ {
+ WcsResult result = new WcsResult() { code = 1, };
+ try
+ {
+ if (model == null)
+ {
+ result.msg = "璇锋眰鍙傛暟涓虹┖";
+ return result;
+ }
+
+ var task = WCSHelper.GetTask(model.taskNo);
+ if (task == null)
+ {
+ result.msg = "鏈煡璇㈠埌浠诲姟鍙�;
+ return result;
+ }
+
+ // 鐘舵�涓庢搷浣滅殑鏄犲皠瀛楀吀
+ var stateActions = new Dictionary<int, Action>
+ {
+ [1] = () => WCSHelper.Begin(task),
+ [2] = () => HandleTaskCompletion(task),
+ [3] = () => WCSHelper.UpdateStatus(task, "寮�鍙栬揣"),
+ [4] = () => HandlePickCompletion(task),
+ [5] = () => WCSHelper.UpdateStatus(task, "寮�鍗歌揣"),
+ [6] = () => HandleUnloadCompletion(task),
+ [7] = () => HandleTaskFailure(task),
+ [8] = () => HandleTaskCompletion(task)
+ };
+ result.code = 0;
+ return result;
+ }
+ catch (Exception ex)
+ {
+ result.code = 2;
+ result.msg = ex.Message;
+ var st = new System.Diagnostics.StackTrace(ex, true);
+ var frame = st.GetFrame(0); // 鑾峰彇绗竴涓爢鏍堝抚
+ if (frame != null)
+ {
+ LogHelper.Error($"notifyTaskStatus浠诲姟鐘舵�鍙嶉鍑虹幇閿欒锛侊紒", ex);
+ LogHelper.Error($"鏂囦欢鍚� {frame.GetFileName()}", ex);
+ LogHelper.Error($"琛屽彿: {frame.GetFileLineNumber()}", ex);
+ LogHelper.Error($"鍒楀彿: {frame.GetFileColumnNumber()}", ex);
+ }
+ return result;
+ }
+ }
+
+ // 澶勭悊浠诲姟瀹屾垚閫昏緫
+ private static void HandleTaskCompletion(WCSTask task)
+ {
+ WCSHelper.End(task);
+
+ // 鏍规嵁浠诲姟绫诲瀷澶勭悊涓嶅悓鐨勫畬鎴愰�杈�+ if (Settings.CompleteTasks.taskType.Contains(task.S_TYPE))
+ {
+ WMSHelper.UpdateWmsTask(task, 2);
+ WMSHelper.UpdateDistributionCntrState(2, 3, task.S_CNTR_CODE);
+ }
+
+ if (new List<string> { "鏂欑鍏ュ簱", "鎵樼洏鍏ュ簱" }.Contains(task.S_TYPE))
+ {
+ ContainerHelper.UpdateCntrItem(task.S_CNTR_CODE);
+ }
+
+ // 澶勭悊鍖哄煙鍙樻洿
+ HandleAreaChange(task);
+ }
+
+ // 澶勭悊鍙栬揣瀹屾垚閫昏緫
+ private static void HandlePickCompletion(WCSTask task)
+ {
+ WCSHelper.UpdateStatus(task, "鍙栬揣瀹屾垚");
+ TaskProcess.OperateStatus(task, 4);
+ }
+
+ // 澶勭悊鍗歌揣瀹屾垚閫昏緫
+ private static void HandleUnloadCompletion(WCSTask task)
+ {
+ WCSHelper.UpdateStatus(task, "鍗歌揣瀹屾垚");
+ TaskProcess.OperateStatus(task, 6);
+ }
+
+ // 澶勭悊浠诲姟澶辫触閫昏緫
+ private static void HandleTaskFailure(WCSTask task)
+ {
+ TaskProcess.OperateStatus(task, 7);
+ WCSHelper.Fail(task);
+ }
+
+ // 澶勭悊鍖哄煙鍙樻洿閫昏緫
+ private static void HandleAreaChange(WCSTask task)
+ {
+ var areas = new List<string> { "TPLKQ", "LXLKQ" };
+ var area = new List<string> { "閰嶇洏鍑哄簱", "閰嶇洏缂撳瓨" };
+
+ if (areas.Contains(task.S_START_AREA) && !area.Contains(task.S_TYPE))
+ {
+ WMSHelper.DeleteChange(task);
+ }
+
+ if (areas.Contains(task.S_END_AREA))
+ {
+ WMSHelper.AddChange(task);
+ }
+ }
+
+ /// <summary>
+ /// WCS璋冪敤鐢宠缁堢偣
+ /// </summary>
+ /// <param name="model">璇锋眰鍙傛暟</param>
+ /// <returns></returns>
+ public static async Task<WcsResult> applyDest(WcsTaskEnd model)
+ {
+ WcsResult result = new WcsResult() { code = 1, };
+ try
+ {
+ if (model == null)
+ {
+ result.msg = "璇锋眰鍙傛暟涓虹┖";
+ return result;
+ }
+
+ var task = WCSHelper.GetTask(model.taskNo);
+ if (task == null)
+ {
+ result.msg = "鏈煡璇㈠埌浠诲姟鍙�;
+ return result;
+ }
+
+ result.code = 0;
+ result.data.Add(new DataModel { taskNo = task.S_CODE, cntrCode = task.S_CNTR_CODE, end = task.S_END_LOC });
+ return result;
+ }
+ catch (Exception ex)
+ {
+ result.code = 2;
+ result.msg = ex.Message;
+ var st = new System.Diagnostics.StackTrace(ex, true);
+ var frame = st.GetFrame(0); // 鑾峰彇绗竴涓爢鏍堝抚
+ if (frame != null)
+ {
+ LogHelper.Error($"applyDest鐢宠缁堢偣鍑虹幇閿欒锛侊紒", ex);
+ LogHelper.Error($"鏂囦欢鍚� {frame.GetFileName()}", ex);
+ LogHelper.Error($"琛屽彿: {frame.GetFileLineNumber()}", ex);
+ LogHelper.Error($"鍒楀彿: {frame.GetFileColumnNumber()}", ex);
+ }
+ return result;
+ }
+ }
+ #endregion
+
@@ -1689,10 +1929,6 @@
LogHelper.Error("CreateInTask鑾峰彇浣滀笟鍒涘缓鍏ュ簱浠诲姟鍑虹幇閿欒锛� + errorDetails, ex);
}
-
-
-
-
/// <summary>
/// 寰幆鍏ュ簱缂撳瓨鍖烘煡璇㈠悎鎵樺伐浣嶅拰鍏ュ簱鎺ラ┏浣嶆槸鍚︽湁绌鸿揣浣嶏紙鍒涘缓浠诲姟锛�@@ -1855,87 +2091,6 @@
return false;
}
- }
-
- /// <summary>
- /// WCS璋冪敤璁惧淇″彿鍙嶉
- /// </summary>
- /// <param name="model">璇锋眰鍙傛暟</param>
- /// <returns></returns>
- public static async Task<Result> notifyDeviceSignal(List<Wcsmodel> model)
- {
- Result result = new Result() { success = false, };
- try
- {
- foreach (var item in model)
- {
- if (string.IsNullOrEmpty(item.cntrNo))
- {
- result.errMsg = "鎵樼洏鍙蜂负绌猴紒";
- return result;
- }
- var list = WMSHelper.GetWmsTaskList("绛夊緟", item.cntrNo);
- if (list == null)
- {
- list = WMSHelper.GetWmsTaskList("鎵ц", item.cntrNo);
- if (list != null && list.S_TYPE.Contains("鍥炲簱"))
- {
- list.S_END_AREA = "TPLKQ";
- }
- }
- if (list == null)
- {
- result.errMsg = "鏈煡璇㈠埌鍦ㄧ瓑寰呬腑鐨勪綔涓氾紒";
- return result;
- }
-
- var inbound = new Inbound()
- {
- areaCode = list.S_END_AREA
- };
- var wh = new Warehouse(inbound);
- var stored = await wh.StoreItemAsync();
- if (stored == null)
- {
- result.errMsg = "绔嬪簱鍖烘湭鏌ヨ鍒板彲鐢ㄨ揣浣嶏紒";
- return result;
- }
-
- var startLoc = ContainerHelper.GetCntrLoc(list.S_CNTR_CODE);
- if (startLoc == null)
- {
- result.errMsg = $"鏈煡璇㈠埌鎵樼洏{list.S_CNTR_CODE}鎵�湪鐨勮揣浣嶏紒";
- return result;
- }
- var res = TaskProcess.HYCreateTransport(startLoc.S_LOC_CODE, stored.loationCode, list.S_B_STATE == "绛夊緟" ? "鏂欑鍏ュ簱" : "鎵樼洏鍏ュ簱", list.S_CNTR_CODE, list.S_CODE);
- if (!res)
- {
- result.errMsg = "鍏ュ簱浠诲姟鍒涘缓澶辫触锛�;
- return result;
- }
- WMSHelper.UpdateTaskStatus(list.S_CODE, 1);
- ContainerHelper.UpdateCntrAbouts(list.S_CNTR_CODE, "");
- }
-
-
- result.success = true;
- return result;
- }
- catch (Exception ex)
- {
- result.success = false;
- result.errMsg = ex.Message;
- var st = new System.Diagnostics.StackTrace(ex, true);
- var frame = st.GetFrame(0); // 鑾峰彇绗竴涓爢鏍堝抚
- if (frame != null)
- {
- LogHelper.Error($"notifyDeviceSignalWCS璋冪敤璁惧淇″彿鍙嶉鍑虹幇閿欒锛侊紒", ex);
- LogHelper.Error($"鏂囦欢鍚� {frame.GetFileName()}", ex);
- LogHelper.Error($"琛屽彿: {frame.GetFileLineNumber()}", ex);
- LogHelper.Error($"鍒楀彿: {frame.GetFileColumnNumber()}", ex);
- }
- return result;
- }
}
/// <summary>
diff --git a/HH.WCS.Mobox3.HangYang/wms/WMSHelper.cs b/HH.WCS.Mobox3.HangYang/wms/WMSHelper.cs
index be9dec9..117ce1e 100644
--- a/HH.WCS.Mobox3.HangYang/wms/WMSHelper.cs
+++ b/HH.WCS.Mobox3.HangYang/wms/WMSHelper.cs
@@ -707,7 +707,7 @@
{
foreach (var item in order.OrderDetail)
{
- db.Deleteable<InOrderDetail>().Where(it => it.S_ITEM_CODE.Trim() == item.S_ITEM_CODE && it.S_BS_NO == orderItem.S_BS_NO).ExecuteCommand();
+ db.Deleteable<InOrderDetail>().Where(it => it.S_ITEM_CODE.Trim() == item.S_ITEM_CODE && it.S_BS_NO == order.S_BS_NO).ExecuteCommand();
}
}
}
@@ -756,7 +756,7 @@
{
foreach (var item in order.OrderDetail)
{
- db.Deleteable<OutOrderDetail>().Where(it => it.S_ITEM_CODE.Trim() == item.S_ITEM_CODE && it.S_BS_NO == orderItem.S_BS_NO).ExecuteCommand();
+ db.Deleteable<OutOrderDetail>().Where(it => it.S_ITEM_CODE.Trim() == item.S_ITEM_CODE && it.S_BS_NO == order.S_BS_NO).ExecuteCommand();
}
}
}
--
Gitblit v1.9.1