From b2c070eaf8cc59b40d27bda904312d0c394a51f4 Mon Sep 17 00:00:00 2001
From: lss <Lss@HanInfo>
Date: 星期五, 20 六月 2025 17:23:37 +0800
Subject: [PATCH] 开发与优化
---
HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/MoboxController.cs | 95 ++----
HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/ApiModel.cs | 236 +++++++++++-------
HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/WmsController.cs | 34 +
HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/util/Settings.cs | 1
HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/.vs/HH.WCS.DaYang/v17/DocumentLayout.json | 268 +++++++++----------
HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/.vs/HH.WCS.DaYang/v17/DocumentLayout.backup.json | 62 ++--
HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/util/HttpHelper.cs | 60 +++
7 files changed, 408 insertions(+), 348 deletions(-)
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/.vs/HH.WCS.DaYang/v17/DocumentLayout.backup.json b/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/.vs/HH.WCS.DaYang/v17/DocumentLayout.backup.json
index fcab7d0..e6dc939 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/.vs/HH.WCS.DaYang/v17/DocumentLayout.backup.json
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/.vs/HH.WCS.DaYang/v17/DocumentLayout.backup.json
@@ -3,6 +3,10 @@
"WorkspaceRootPath": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\",
"Documents": [
{
+ "AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E12211}|HH.WCS.DaYang.csproj|D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\api\\wmscontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E12211}|HH.WCS.DaYang.csproj|solutionrelative:api\\wmscontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
"AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E12211}|HH.WCS.DaYang.csproj|D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\process\\taskprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E12211}|HH.WCS.DaYang.csproj|solutionrelative:process\\taskprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
@@ -45,10 +49,6 @@
{
"AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E12211}|HH.WCS.DaYang.csproj|D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\models\\equipmentstatus.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E12211}|HH.WCS.DaYang.csproj|solutionrelative:models\\equipmentstatus.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E12211}|HH.WCS.DaYang.csproj|D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\api\\wmscontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E12211}|HH.WCS.DaYang.csproj|solutionrelative:api\\wmscontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E12211}|HH.WCS.DaYang.csproj|D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\core\\wmscore.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
@@ -166,7 +166,7 @@
"DocumentGroups": [
{
"DockedWidth": 200,
- "SelectedChildIndex": 9,
+ "SelectedChildIndex": 13,
"Children": [
{
"$type": "Bookmark",
@@ -182,7 +182,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 4,
+ "DocumentIndex": 5,
"Title": "ApiHelper.cs",
"DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\api\\ApiHelper.cs",
"RelativeDocumentMoniker": "api\\ApiHelper.cs",
@@ -195,7 +195,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 1,
+ "DocumentIndex": 2,
"Title": "ApiModel.cs",
"DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\api\\ApiModel.cs",
"RelativeDocumentMoniker": "api\\ApiModel.cs",
@@ -208,7 +208,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 2,
+ "DocumentIndex": 3,
"Title": "MoboxController.cs",
"DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\api\\MoboxController.cs",
"RelativeDocumentMoniker": "api\\MoboxController.cs",
@@ -221,7 +221,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 7,
+ "DocumentIndex": 8,
"Title": "LocationHelper.cs",
"DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\wms\\LocationHelper.cs",
"RelativeDocumentMoniker": "wms\\LocationHelper.cs",
@@ -234,20 +234,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 10,
- "Title": "EquipmentStatus.cs",
- "DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\models\\EquipmentStatus.cs",
- "RelativeDocumentMoniker": "models\\EquipmentStatus.cs",
- "ToolTip": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\models\\EquipmentStatus.cs",
- "RelativeToolTip": "models\\EquipmentStatus.cs",
- "ViewState": "AgIAAAAAAAAAAAAAAAAuwBYAAAAAAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-16T02:58:10.368Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 3,
+ "DocumentIndex": 4,
"Title": "HttpHelper.cs",
"DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\util\\HttpHelper.cs",
"RelativeDocumentMoniker": "util\\HttpHelper.cs",
@@ -260,20 +247,20 @@
},
{
"$type": "Document",
- "DocumentIndex": 0,
+ "DocumentIndex": 1,
"Title": "TaskProcess.cs",
"DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\process\\TaskProcess.cs",
"RelativeDocumentMoniker": "process\\TaskProcess.cs",
"ToolTip": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\process\\TaskProcess.cs",
"RelativeToolTip": "process\\TaskProcess.cs",
- "ViewState": "AgIAAGkAAAAAAAAAAAAvwIAAAABZAAAAAAAAAA==",
+ "ViewState": "AgIAAHgAAAAAAAAAAADgv5EAAAARAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-09T08:03:13.942Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 9,
+ "DocumentIndex": 10,
"Title": "WCSTask.cs",
"DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\models\\WCSTask.cs",
"RelativeDocumentMoniker": "models\\WCSTask.cs",
@@ -286,7 +273,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 8,
+ "DocumentIndex": 9,
"Title": "WMSHelper.cs",
"DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\wms\\WMSHelper.cs",
"RelativeDocumentMoniker": "wms\\WMSHelper.cs",
@@ -299,7 +286,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 6,
+ "DocumentIndex": 7,
"Title": "config.json",
"DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\config\\config.json",
"RelativeDocumentMoniker": "config\\config.json",
@@ -312,7 +299,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 5,
+ "DocumentIndex": 6,
"Title": "Settings.cs",
"DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\util\\Settings.cs",
"RelativeDocumentMoniker": "util\\Settings.cs",
@@ -325,19 +312,32 @@
},
{
"$type": "Document",
- "DocumentIndex": 11,
+ "DocumentIndex": 0,
"Title": "WmsController.cs",
"DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\api\\WmsController.cs",
"RelativeDocumentMoniker": "api\\WmsController.cs",
"ToolTip": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\api\\WmsController.cs",
"RelativeToolTip": "api\\WmsController.cs",
- "ViewState": "AgIAABQAAAAAAAAAAAAmwCoAAAAxAAAAAAAAAA==",
+ "ViewState": "AgIAABQAAAAAAAAAAAAmwCcAAAAJAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-08T05:55:30.305Z",
"EditorCaption": ""
},
{
"$type": "Document",
+ "DocumentIndex": 11,
+ "Title": "EquipmentStatus.cs",
+ "DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\models\\EquipmentStatus.cs",
+ "RelativeDocumentMoniker": "models\\EquipmentStatus.cs",
+ "ToolTip": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\models\\EquipmentStatus.cs",
+ "RelativeToolTip": "models\\EquipmentStatus.cs",
+ "ViewState": "AgIAAAAAAAAAAAAAAAAuwBYAAAAAAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-16T02:58:10.368Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
"DocumentIndex": 12,
"Title": "WMSCore.cs",
"DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\core\\WMSCore.cs",
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/.vs/HH.WCS.DaYang/v17/DocumentLayout.json b/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/.vs/HH.WCS.DaYang/v17/DocumentLayout.json
index f1acfa6..e551f94 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/.vs/HH.WCS.DaYang/v17/DocumentLayout.json
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/.vs/HH.WCS.DaYang/v17/DocumentLayout.json
@@ -3,8 +3,8 @@
"WorkspaceRootPath": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\",
"Documents": [
{
- "AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E12211}|HH.WCS.DaYang.csproj|D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\process\\taskprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E12211}|HH.WCS.DaYang.csproj|solutionrelative:process\\taskprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ "AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E12211}|HH.WCS.DaYang.csproj|d:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\hh-0166_luoyangdayangcailiao\\hh.wcs.mobox3\\hh.wcs.mobox3.dayang\\api\\wmscontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E12211}|HH.WCS.DaYang.csproj|solutionrelative:api\\wmscontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E12211}|HH.WCS.DaYang.csproj|D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\api\\apimodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
@@ -15,11 +15,19 @@
"RelativeMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E12211}|HH.WCS.DaYang.csproj|solutionrelative:api\\moboxcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
+ "AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E12211}|HH.WCS.DaYang.csproj|D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\api\\debugcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E12211}|HH.WCS.DaYang.csproj|solutionrelative:api\\debugcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E12211}|HH.WCS.DaYang.csproj|D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\process\\taskprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E12211}|HH.WCS.DaYang.csproj|solutionrelative:process\\taskprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
"AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E12211}|HH.WCS.DaYang.csproj|D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\util\\httphelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E12211}|HH.WCS.DaYang.csproj|solutionrelative:util\\httphelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
- "AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E12211}|HH.WCS.DaYang.csproj|d:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\hh-0166_luoyangdayangcailiao\\hh.wcs.mobox3\\hh.wcs.mobox3.dayang\\api\\apihelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E12211}|HH.WCS.DaYang.csproj|D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\api\\apihelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E12211}|HH.WCS.DaYang.csproj|solutionrelative:api\\apihelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
@@ -47,16 +55,8 @@
"RelativeMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E12211}|HH.WCS.DaYang.csproj|solutionrelative:models\\equipmentstatus.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
- "AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E12211}|HH.WCS.DaYang.csproj|D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\api\\wmscontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E12211}|HH.WCS.DaYang.csproj|solutionrelative:api\\wmscontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
"AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E12211}|HH.WCS.DaYang.csproj|D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\core\\wmscore.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E12211}|HH.WCS.DaYang.csproj|solutionrelative:core\\wmscore.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E12211}|HH.WCS.DaYang.csproj|D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\api\\debugcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E12211}|HH.WCS.DaYang.csproj|solutionrelative:api\\debugcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{EBE15A59-A43A-43BE-8B4B-A6EC42E12211}|HH.WCS.DaYang.csproj|D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\models\\location.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
@@ -177,23 +177,6 @@
"Name": "ST:0:0:{3ae79031-e1bc-11d0-8f78-00a0c9110057}"
},
{
- "$type": "Bookmark",
- "Name": "ST:130:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
- },
- {
- "$type": "Document",
- "DocumentIndex": 4,
- "Title": "ApiHelper.cs",
- "DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\api\\ApiHelper.cs",
- "RelativeDocumentMoniker": "api\\ApiHelper.cs",
- "ToolTip": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\api\\ApiHelper.cs",
- "RelativeToolTip": "api\\ApiHelper.cs",
- "ViewState": "AgIAAGMBAAAAAAAAAAAhwI4BAAAYAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-08T08:36:43.371Z",
- "EditorCaption": ""
- },
- {
"$type": "Document",
"DocumentIndex": 1,
"Title": "ApiModel.cs",
@@ -201,9 +184,107 @@
"RelativeDocumentMoniker": "api\\ApiModel.cs",
"ToolTip": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\api\\ApiModel.cs",
"RelativeToolTip": "api\\ApiModel.cs",
- "ViewState": "AgIAAAoBAAAAAAAAAAAnwHkBAAAZAAAAAAAAAA==",
+ "ViewState": "AgIAACsBAAAAAAAAAAAqwGIBAAAtAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-09T00:31:28.399Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 5,
+ "Title": "HttpHelper.cs",
+ "DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\util\\HttpHelper.cs",
+ "RelativeDocumentMoniker": "util\\HttpHelper.cs",
+ "ToolTip": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\util\\HttpHelper.cs",
+ "RelativeToolTip": "util\\HttpHelper.cs",
+ "ViewState": "AgIAAOsAAAAAAAAAAAAnwIkBAAAVAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-09T08:38:26.927Z"
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 4,
+ "Title": "TaskProcess.cs",
+ "DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\process\\TaskProcess.cs",
+ "RelativeDocumentMoniker": "process\\TaskProcess.cs",
+ "ToolTip": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\process\\TaskProcess.cs",
+ "RelativeToolTip": "process\\TaskProcess.cs",
+ "ViewState": "AgIAAHgAAAAAAAAAAADgv5EAAAARAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-09T08:03:13.942Z"
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 11,
+ "Title": "WCSTask.cs",
+ "DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\models\\WCSTask.cs",
+ "RelativeDocumentMoniker": "models\\WCSTask.cs",
+ "ToolTip": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\models\\WCSTask.cs",
+ "RelativeToolTip": "models\\WCSTask.cs",
+ "ViewState": "AgIAAAwAAAAAAAAAAAAvwCEAAAALAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-15T02:12:50.826Z"
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 10,
+ "Title": "WMSHelper.cs",
+ "DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\wms\\WMSHelper.cs",
+ "RelativeDocumentMoniker": "wms\\WMSHelper.cs",
+ "ToolTip": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\wms\\WMSHelper.cs",
+ "RelativeToolTip": "wms\\WMSHelper.cs",
+ "ViewState": "AgIAABoAAAAAAAAAAADgvy8AAAAmAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-07T05:40:07.919Z"
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 8,
+ "Title": "config.json",
+ "DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\config\\config.json",
+ "RelativeDocumentMoniker": "config\\config.json",
+ "ToolTip": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\config\\config.json",
+ "RelativeToolTip": "config\\config.json",
+ "ViewState": "AgIAAAAAAAAAAAAAAAAAABAAAAALAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|",
+ "WhenOpened": "2025-05-09T08:35:18.336Z"
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 7,
+ "Title": "Settings.cs",
+ "DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\util\\Settings.cs",
+ "RelativeDocumentMoniker": "util\\Settings.cs",
+ "ToolTip": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\util\\Settings.cs",
+ "RelativeToolTip": "util\\Settings.cs",
+ "ViewState": "AgIAAHYAAAAAAAAAAAAvwIoAAAAZAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-09T08:36:01.752Z"
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 0,
+ "Title": "WmsController.cs",
+ "DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\api\\WmsController.cs",
+ "RelativeDocumentMoniker": "api\\WmsController.cs",
+ "ToolTip": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\api\\WmsController.cs",
+ "RelativeToolTip": "api\\WmsController.cs",
+ "ViewState": "AgIAAD8AAAAAAAAAAAAQwFoAAAAWAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-08T05:55:30.305Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 3,
+ "Title": "DebugController.cs",
+ "DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\api\\DebugController.cs",
+ "RelativeDocumentMoniker": "api\\DebugController.cs",
+ "ToolTip": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\api\\DebugController.cs",
+ "RelativeToolTip": "api\\DebugController.cs",
+ "ViewState": "AgIAAAAAAAAAAAAAAADwvwAAAAAAAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-09T02:48:59.771Z",
"EditorCaption": ""
},
{
@@ -214,14 +295,14 @@
"RelativeDocumentMoniker": "api\\MoboxController.cs",
"ToolTip": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\api\\MoboxController.cs",
"RelativeToolTip": "api\\MoboxController.cs",
- "ViewState": "AgIAAFkAAAAAAAAAAAAvwGwAAAAcAAAAAAAAAA==",
+ "ViewState": "AgIAAGwAAAAAAAAAAAAAAGwAAAAcAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-09T02:48:58.834Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 7,
+ "DocumentIndex": 9,
"Title": "LocationHelper.cs",
"DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\wms\\LocationHelper.cs",
"RelativeDocumentMoniker": "wms\\LocationHelper.cs",
@@ -229,12 +310,23 @@
"RelativeToolTip": "wms\\LocationHelper.cs",
"ViewState": "AgIAAL0AAAAAAAAAAAAEwFAAAAAXAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-09T03:03:17.345Z",
- "EditorCaption": ""
+ "WhenOpened": "2025-05-09T03:03:17.345Z"
},
{
"$type": "Document",
- "DocumentIndex": 10,
+ "DocumentIndex": 6,
+ "Title": "ApiHelper.cs",
+ "DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\api\\ApiHelper.cs",
+ "RelativeDocumentMoniker": "api\\ApiHelper.cs",
+ "ToolTip": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\api\\ApiHelper.cs",
+ "RelativeToolTip": "api\\ApiHelper.cs",
+ "ViewState": "AgIAAGMBAAAAAAAAAAAhwI4BAAAYAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-08T08:36:43.371Z"
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 12,
"Title": "EquipmentStatus.cs",
"DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\models\\EquipmentStatus.cs",
"RelativeDocumentMoniker": "models\\EquipmentStatus.cs",
@@ -242,103 +334,11 @@
"RelativeToolTip": "models\\EquipmentStatus.cs",
"ViewState": "AgIAAAAAAAAAAAAAAAAuwBYAAAAAAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-16T02:58:10.368Z",
- "EditorCaption": ""
+ "WhenOpened": "2025-05-16T02:58:10.368Z"
},
{
"$type": "Document",
- "DocumentIndex": 3,
- "Title": "HttpHelper.cs",
- "DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\util\\HttpHelper.cs",
- "RelativeDocumentMoniker": "util\\HttpHelper.cs",
- "ToolTip": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\util\\HttpHelper.cs",
- "RelativeToolTip": "util\\HttpHelper.cs",
- "ViewState": "AgIAAOsAAAAAAAAAAAAnwIkBAAAVAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-09T08:38:26.927Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 0,
- "Title": "TaskProcess.cs",
- "DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\process\\TaskProcess.cs",
- "RelativeDocumentMoniker": "process\\TaskProcess.cs",
- "ToolTip": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\process\\TaskProcess.cs",
- "RelativeToolTip": "process\\TaskProcess.cs",
- "ViewState": "AgIAAHIAAAAAAAAAAADgv4oAAAAcAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-09T08:03:13.942Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 9,
- "Title": "WCSTask.cs",
- "DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\models\\WCSTask.cs",
- "RelativeDocumentMoniker": "models\\WCSTask.cs",
- "ToolTip": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\models\\WCSTask.cs",
- "RelativeToolTip": "models\\WCSTask.cs",
- "ViewState": "AgIAAAwAAAAAAAAAAAAvwCEAAAALAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-15T02:12:50.826Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 8,
- "Title": "WMSHelper.cs",
- "DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\wms\\WMSHelper.cs",
- "RelativeDocumentMoniker": "wms\\WMSHelper.cs",
- "ToolTip": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\wms\\WMSHelper.cs",
- "RelativeToolTip": "wms\\WMSHelper.cs",
- "ViewState": "AgIAABoAAAAAAAAAAADgvy8AAAAmAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-07T05:40:07.919Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 6,
- "Title": "config.json",
- "DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\config\\config.json",
- "RelativeDocumentMoniker": "config\\config.json",
- "ToolTip": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\config\\config.json",
- "RelativeToolTip": "config\\config.json",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAABAAAAALAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|",
- "WhenOpened": "2025-05-09T08:35:18.336Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 5,
- "Title": "Settings.cs",
- "DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\util\\Settings.cs",
- "RelativeDocumentMoniker": "util\\Settings.cs",
- "ToolTip": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\util\\Settings.cs",
- "RelativeToolTip": "util\\Settings.cs",
- "ViewState": "AgIAAHYAAAAAAAAAAAAvwIoAAAAZAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-09T08:36:01.752Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 11,
- "Title": "WmsController.cs",
- "DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\api\\WmsController.cs",
- "RelativeDocumentMoniker": "api\\WmsController.cs",
- "ToolTip": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\api\\WmsController.cs",
- "RelativeToolTip": "api\\WmsController.cs",
- "ViewState": "AgIAABQAAAAAAAAAAAAmwCoAAAAxAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-08T05:55:30.305Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 12,
+ "DocumentIndex": 13,
"Title": "WMSCore.cs",
"DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\core\\WMSCore.cs",
"RelativeDocumentMoniker": "core\\WMSCore.cs",
@@ -347,18 +347,6 @@
"ViewState": "AgIAAGIAAAAAAAAAAAAhwHgAAAA5AAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-09T07:21:54.953Z"
- },
- {
- "$type": "Document",
- "DocumentIndex": 13,
- "Title": "DebugController.cs",
- "DocumentMoniker": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\api\\DebugController.cs",
- "RelativeDocumentMoniker": "api\\DebugController.cs",
- "ToolTip": "D:\\01-\u6C49\u548C\u667A\u80FD\\009_\u6D1B\u9633\u5927\u6D0B\u539F\u6750\u6599\u5E93\\HH-0166_LuoYangDaYangCaiLiao\\HH.WCS.Mobox3\\HH.WCS.Mobox3.DaYang\\api\\DebugController.cs",
- "RelativeToolTip": "api\\DebugController.cs",
- "ViewState": "AgIAAAAAAAAAAAAAAADwvwAAAAAAAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-09T02:48:59.771Z"
},
{
"$type": "Document",
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/ApiModel.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/ApiModel.cs
index 5e49840..16d5a83 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/ApiModel.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/ApiModel.cs
@@ -210,56 +210,7 @@
#endregion
#region 澶ф磱绔嬪簱鎺ュ彛鎺ユ敹璇锋眰鍙傛暟
- /// <summary>
- /// 浠诲姟涓嬪彂
- /// </summary>
- public partial class TaskPushModel
- {
- /// <summary>
- /// 鎵樼洏鍙�- /// </summary>
- [JsonProperty("cntrNo", NullValueHandling = NullValueHandling.Ignore)]
- public string CntrNo { get; set; }
-
- /// <summary>
- /// 鎵樼洏绫诲瀷
- /// </summary>
- [JsonProperty("cntrType", NullValueHandling = NullValueHandling.Ignore)]
- public string CntrType { get; set; }
-
- [JsonProperty("extData", NullValueHandling = NullValueHandling.Ignore)]
- public string[] ExtData { get; set; }
-
- /// <summary>
- /// 璧风偣
- /// </summary>
- [JsonProperty("from", NullValueHandling = NullValueHandling.Ignore)]
- public string From { get; set; }
-
- /// <summary>
- /// 浠诲姟鍒嗙粍
- /// </summary>
- [JsonProperty("groupNo", NullValueHandling = NullValueHandling.Ignore)]
- public string GroupNo { get; set; }
-
- /// <summary>
- /// 浠诲姟鍙�- /// </summary>
- [JsonProperty("taskNo", NullValueHandling = NullValueHandling.Ignore)]
- public string TaskNo { get; set; }
-
- /// <summary>
- /// 浠诲姟绫诲瀷
- /// </summary>
- [JsonProperty("taskType", NullValueHandling = NullValueHandling.Ignore)]
- public string TaskType { get; set; }
-
- /// <summary>
- /// 缁堢偣
- /// </summary>
- [JsonProperty("to", NullValueHandling = NullValueHandling.Ignore)]
- public string To { get; set; }
- }
+
/// <summary>
/// 璁惧淇″彿鍙嶉
@@ -348,38 +299,33 @@
public string CntrNo { get; set; }
}
-
-
- #endregion
-
- #region 澶ф磱绔嬪簱鎺ュ彛鎺ユ敹杩斿洖鍙傛暟
/// <summary>
- /// 璁惧淇℃伅杩斿洖
+ /// 璁惧鎶ヨ涓婃姤
/// </summary>
- public partial class Results<T>
+ public partial class NotifyAlarmModel
{
- [JsonProperty("code")]
- public long Code { get; set; }
+ /// <summary>
+ /// 璁惧缂栧彿
+ /// </summary>
+ [JsonProperty("deviceNo")]
+ public string DeviceNo { get; set; }
- [JsonProperty("data")]
- public List<T> Data { get; set; }
+ /// <summary>
+ /// 閿欒鐮�+ /// </summary>
+ [JsonProperty("errCode")]
+ public string ErrCode { get; set; }
- [JsonProperty("msg")]
- public string Msg { get; set; }
+ /// <summary>
+ /// 閿欒淇℃伅
+ /// </summary>
+ [JsonProperty("errMsg")]
+ public string ErrMsg { get; set; }
}
+ #endregion
- public partial class Result<T>
- {
- [JsonProperty("code")]
- public int Code { get; set; }
-
- [JsonProperty("data")]
- public T Data { get; set; }
-
- [JsonProperty("msg")]
- public string Msg { get; set; }
- }
+ #region 澶ф磱绔嬪簱鎺ュ彛涓嬪彂鍙傛暟
/// <summary>
/// 璁惧淇℃伅
/// </summary>
@@ -415,6 +361,126 @@
[JsonProperty("workStatus")]
public int WorkStatus { get; set; }
}
+
+ /// <summary>
+ /// 浠诲姟涓嬪彂
+ /// </summary>
+ public partial class TaskPushModel
+ {
+ /// <summary>
+ /// 鎵樼洏鍙�+ /// </summary>
+ [JsonProperty("cntrNo", NullValueHandling = NullValueHandling.Ignore)]
+ public string CntrNo { get; set; }
+
+ /// <summary>
+ /// 鎵樼洏绫诲瀷
+ /// </summary>
+ [JsonProperty("cntrType", NullValueHandling = NullValueHandling.Ignore)]
+ public string CntrType { get; set; }
+
+ [JsonProperty("extData", NullValueHandling = NullValueHandling.Ignore)]
+ public string[] ExtData { get; set; }
+
+ /// <summary>
+ /// 璧风偣
+ /// </summary>
+ [JsonProperty("from", NullValueHandling = NullValueHandling.Ignore)]
+ public string From { get; set; }
+
+ /// <summary>
+ /// 浠诲姟鍒嗙粍
+ /// </summary>
+ [JsonProperty("groupNo", NullValueHandling = NullValueHandling.Ignore)]
+ public string GroupNo { get; set; }
+
+ /// <summary>
+ /// 浠诲姟鍙�+ /// </summary>
+ [JsonProperty("taskNo", NullValueHandling = NullValueHandling.Ignore)]
+ public string TaskNo { get; set; }
+
+ /// <summary>
+ /// 浠诲姟绫诲瀷
+ /// </summary>
+ [JsonProperty("taskType", NullValueHandling = NullValueHandling.Ignore)]
+ public string TaskType { get; set; }
+
+ /// <summary>
+ /// 缁堢偣
+ /// </summary>
+ [JsonProperty("to", NullValueHandling = NullValueHandling.Ignore)]
+ public string To { get; set; }
+ }
+
+ /// <summary>
+ /// 璁惧鐘舵�鍒囨崲
+ /// </summary>
+ public partial class ChangeStatusModel
+ {
+ /// <summary>
+ /// 璁惧缂栫爜
+ /// </summary>
+ [JsonProperty("deviceNo")]
+ public string DeviceNo { get; set; }
+
+ /// <summary>
+ /// 妯″紡绫诲瀷锛�锛氬彔鎵樻ā寮�2锛氭媶鎵樻ā寮�+ /// 鍙犳墭妯″紡锛屼笉闇�鎷嗗垎鎵樼洏鍒板叆搴撳彛銆�+ /// 鎷嗘墭妯″紡锛岄渶瑕佹媶鍒嗘墭鐩樺埌鍏ュ簱鍙�+ /// </summary>
+ [JsonProperty("Type")]
+ public string Type { get; set; }
+ }
+
+ /// <summary>
+ /// 淇敼浠诲姟浼樺厛绾�+ /// </summary>
+ public partial class ChangePriorityModel
+ {
+ /// <summary>
+ /// 浼樺厛绾�+ /// </summary>
+ [JsonProperty("priority")]
+ public int Priority { get; set; }
+
+ /// <summary>
+ /// 浠诲姟鍙�+ /// </summary>
+ [JsonProperty("taskNo")]
+ public string TaskNo { get; set; }
+ }
+ #endregion
+
+ #region 澶ф磱绔嬪簱鎺ュ彛鎺ユ敹杩斿洖鍙傛暟
+
+ /// <summary>
+ /// 璁惧淇℃伅杩斿洖
+ /// </summary>
+ public partial class Results<T>
+ {
+ [JsonProperty("code")]
+ public long Code { get; set; }
+
+ [JsonProperty("data")]
+ public List<T> Data { get; set; }
+
+ [JsonProperty("msg")]
+ public string Msg { get; set; }
+ }
+
+ public partial class Result<T>
+ {
+ [JsonProperty("code")]
+ public int Code { get; set; }
+
+ [JsonProperty("data")]
+ public T Data { get; set; }
+
+ [JsonProperty("msg")]
+ public string Msg { get; set; }
+ }
+
/// <summary>
/// 鐢宠缁堢偣
@@ -453,26 +519,10 @@
}
- /// <summary>
- /// 璁惧鐘舵�鍒囨崲
- /// </summary>
- public partial class ChangeStatusModel
- {
- /// <summary>
- /// 璁惧缂栫爜
- /// </summary>
- [JsonProperty("deviceNo")]
- public string DeviceNo { get; set; }
-
- /// <summary>
- /// 妯″紡绫诲瀷锛�锛氬彔鎵樻ā寮�2锛氭媶鎵樻ā寮�- /// 鍙犳墭妯″紡锛屼笉闇�鎷嗗垎鎵樼洏鍒板叆搴撳彛銆�- /// 鎷嗘墭妯″紡锛岄渶瑕佹媶鍒嗘墭鐩樺埌鍏ュ簱鍙�- /// </summary>
- [JsonProperty("Type")]
- public string Type { get; set; }
- }
+
#endregion
+
+
}
/// <summary>
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/MoboxController.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/MoboxController.cs
index e3061ad..7230bfc 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/MoboxController.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/MoboxController.cs
@@ -2,6 +2,7 @@
using HH.WCS.DaYang.process;
using HH.WCS.DaYang.util;
using HH.WCS.DaYang.wms;
+using Newtonsoft.Json;
using System.Collections.Generic;
using System.Web.Http;
using static HH.WCS.DaYang.api.ApiModel;
@@ -140,78 +141,44 @@
return result;
}
-
/// <summary>
- /// 鐮佺洏鏍￠獙
+ /// 淇敼浠诲姟浼樺厛绾� /// </summary>
/// <param name="model"></param>
/// <returns></returns>
- [HttpPost]
- public SimpleResult PalletSorting(PalletSorting model)
+ public SimpleResult changePriority(ChangePriorityModel model)
{
- return ApiHelper.PalletSorting(model);
- }
- /// <summary>
- /// 鐮佺洏鏍￠獙涓嶅甫涓婃灦(鍏ュ簱)鍗曞彿
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- [HttpPost]
- public SimpleResult PalletSorting1(PalletSorting1 model)
- {
- return ApiHelper.PalletSorting1(model);
- }
- /// <summary>
- /// pda鍏ュ簱鐢宠
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- public SimpleResult Instock(InstockInfo model)
- {
- return ApiHelper.Instock(model);
-
+
+ LogHelper.Info("changePriority 鎺ユ敹锛� + JsonConvert.SerializeObject(model), "API");
+ var result = new SimpleResult();
+ //鍒囨崲鍙犵洏鏈虹姸鎬侊紝鍘昏皟鐢╳cs鎺ュ彛
+ HttpHelper http = new HttpHelper();
+ var url = Settings.tableUrls.Find(a => a.id == 6);
+ if (url != null)
+ {
+ var changeResult = http.ChangePriority(model.TaskNo,model.Priority, url.url);
+ if (changeResult.Code == 200)
+ {
+ result.resultCode = 0;
+ result.resultMsg = "淇敼鎴愬姛";
+ }
+ else
+ {
+ result.resultCode = changeResult.Code;
+ result.resultMsg = "淇敼澶辫触锛� + result.resultMsg;
+ }
+ }
+ else
+ {
+ result.resultCode = 1;
+ result.resultMsg = "鏍规嵁閰嶇疆鏂囦欢鏈幏鍙栧埌淇敼浠诲姟浼樺厛绾ф帴鍙ｏ紝璇锋鏌ラ厤缃枃浠�;
+ }
+
+ LogHelper.Info("changePriority 杩斿洖锛� + JsonConvert.SerializeObject(result), "API");
+ return result;
}
- /// <summary>
- /// 鍙戣揣鍗曟墽琛�- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- [HttpPost]
- public SimpleResult ShippingOrderExecute(ShippingOrderCheck model)
- {
- return ApiHelper.ShippingOrderExecute(model);
- }
- /// <summary>
- /// 鍒嗘嫞鍗曟墽琛�- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- [HttpPost]
- public SimpleResult SortingOrderExecute(SortingOrderCheck model)
- {
- return ApiHelper.SortingOrderExecute(model);
- }
- /// <summary>
- /// 鍒嗘嫞缁撴灉纭锛堝墠绔嫤鎴暟閲忎笉鍙互瓒呰繃鍒嗘嫞鏄庣粏涓�F_QTY-F_ACC_SR_QTY鐨勬暟閲忥級
- /// </summary>
- /// <returns></returns>
- public SimpleResult SortingResultCheck(List<SortingResultCheck> models)
- {
- return ApiHelper.SortingResultCheck(models);
-
- }
-
- /// <summary>
- /// 鍒ゆ柇鏄惁鏄暣鎵樺垎鎷�- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- public SimpleResult CheckSortingWholeCntr(CheckSortingWholeCntr model)
- {
- return ApiHelper.CheckSortingWholeCntr(model);
- }
}
}
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/WmsController.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/WmsController.cs
index fe65111..908cd63 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/WmsController.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/WmsController.cs
@@ -25,9 +25,9 @@
public Result<Empty> CreateTask(CreateTaskModel model)
{
Result<Empty> result = new Result<Empty>();
- LogHelper.Info("CreateTask 鎺ユ敹锛� + JsonConvert.SerializeObject(model), "CreateTask");
+ LogHelper.Info("CreateTask 鎺ユ敹锛� + JsonConvert.SerializeObject(model), "API");
result = ApiHelper.createtask(model);
- LogHelper.Info("CreateTask 杩斿洖锛� + JsonConvert.SerializeObject(result), "CreateTask");
+ LogHelper.Info("CreateTask 杩斿洖锛� + JsonConvert.SerializeObject(result), "API");
return result;
}
@@ -39,9 +39,9 @@
public Result<Empty> notifyDeviceSignal(NotifyDeviceSignalModel model)
{
Result<Empty> result = new Result<Empty>();
- LogHelper.Info("notifyDeviceSignal 鎺ユ敹锛� + JsonConvert.SerializeObject(model), "EquipmentInfo");
+ LogHelper.Info("notifyDeviceSignal 鎺ユ敹锛� + JsonConvert.SerializeObject(model), "API");
result = ApiHelper.NotifyDeviceSignal(model);
- LogHelper.Info("notifyDeviceSignal 杩斿洖锛� + JsonConvert.SerializeObject(result), "EquipmentInfo");
+ LogHelper.Info("notifyDeviceSignal 杩斿洖锛� + JsonConvert.SerializeObject(result), "API");
return result;
}
@@ -52,9 +52,9 @@
/// <returns></returns>
public Result<Empty> notifyTaskStatus(NotifyTaskStatusModel model)
{
- LogHelper.Info("notifyTaskStatus 鎺ユ敹锛� + JsonConvert.SerializeObject(model), "EquipmentInfo");
+ LogHelper.Info("notifyTaskStatus 鎺ユ敹锛� + JsonConvert.SerializeObject(model), "API");
var result= WCSCore.NotifyTaskStatus(model);
- LogHelper.Info("notifyTaskStatus 杩斿洖锛� + JsonConvert.SerializeObject(result), "EquipmentInfo");
+ LogHelper.Info("notifyTaskStatus 杩斿洖锛� + JsonConvert.SerializeObject(result), "API");
return result;
}
@@ -66,9 +66,9 @@
public Result<Empty> getCntrInfo(GetCntrInfoModel model)
{
Result<Empty> result = new Result<Empty>();
- LogHelper.Info("getCntrInfo 鎺ユ敹锛� + JsonConvert.SerializeObject(model), "EquipmentInfo");
+ LogHelper.Info("getCntrInfo 鎺ユ敹锛� + JsonConvert.SerializeObject(model), "API");
result = ApiHelper.GetCntrInfo(model);
- LogHelper.Info("getCntrInfo 杩斿洖锛� + JsonConvert.SerializeObject(result), "EquipmentInfo");
+ LogHelper.Info("getCntrInfo 杩斿洖锛� + JsonConvert.SerializeObject(result), "API");
return result;
}
@@ -80,9 +80,23 @@
public Result<ReseltApplyDestModel> applyDest(ApplyDestModel model)
{
Result<ReseltApplyDestModel> result = new Result<ReseltApplyDestModel>();
- LogHelper.Info("applyDest 鎺ユ敹锛� + JsonConvert.SerializeObject(model), "EquipmentInfo");
+ LogHelper.Info("applyDest 鎺ユ敹锛� + JsonConvert.SerializeObject(model), "API");
result = ApiHelper.ApplyDest(model);
- LogHelper.Info("applyDest 杩斿洖锛� + JsonConvert.SerializeObject(result), "EquipmentInfo");
+ LogHelper.Info("applyDest 杩斿洖锛� + JsonConvert.SerializeObject(result), "API");
+ return result;
+ }
+
+ /// <summary>
+ /// 璁惧鎶ヨ涓婃姤
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public Result<Empty> notifyAlarm(NotifyAlarmModel model)
+ {
+ Result<Empty> result = new Result<Empty>();
+ LogHelper.Info("notifyAlarm 鎺ユ敹锛� + JsonConvert.SerializeObject(model), "API");
+ //result = ApiHelper.ApplyDest(model);
+ LogHelper.Info("notifyAlarm 杩斿洖锛� + JsonConvert.SerializeObject(result), "API");
return result;
}
}
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/util/HttpHelper.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/util/HttpHelper.cs
index 4bf9254..a855411 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/util/HttpHelper.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/util/HttpHelper.cs
@@ -362,24 +362,24 @@
{
string taskno=task.S_CODE;
string date = JsonConvert.SerializeObject(taskno);
- LogHelper.Info($"涓嬪彂浠诲姟锛氬湴鍧�{url}锛屽唴瀹癸細{date}");
+ LogHelper.Info($"浠诲姟鍙栨秷锛氬湴鍧�{url}锛屽唴瀹癸細{date}");
var r = WebPost(url, date);
- LogHelper.Info($"涓嬪彂浠诲姟锛氳繑鍥炲唴瀹癸細{r}");
+ LogHelper.Info($"浠诲姟鍙栨秷锛氳繑鍥炲唴瀹癸細{r}");
result = JsonConvert.DeserializeObject<Result<Empty>>(r);
if (result.Code == 200)
{
- LogHelper.Info($"涓嬪彂浠诲姟鎴愬姛");
+ LogHelper.Info($"浠诲姟鍙栨秷鎴愬姛");
}
else
{
- LogHelper.Info($"涓嬪彂浠诲姟澶辫触=>msg:{result.Msg}");
+ LogHelper.Info($"浠诲姟鍙栨秷澶辫触=>msg:{result.Msg}");
}
return result;
}
catch (Exception ex)
{
- LogHelper.Info($"涓嬪彂浠诲姟=>閿欒锛歟rror锛歿ex.Message}锛岃鍙�{ex.StackTrace}");
+ LogHelper.Info($"浠诲姟鍙栨秷=>閿欒锛歟rror锛歿ex.Message}锛岃鍙�{ex.StackTrace}");
return result;
}
@@ -402,24 +402,64 @@
changeStatusModel.Type = type;
changeStatusModel.DeviceNo = "2";
string date = JsonConvert.SerializeObject(changeStatusModel);
- LogHelper.Info($"涓嬪彂浠诲姟锛氬湴鍧�{url}锛屽唴瀹癸細{date}");
+ LogHelper.Info($"璁惧鐘舵�鍒囨崲锛氬湴鍧�{url}锛屽唴瀹癸細{date}");
var r = WebPost(url, date);
- LogHelper.Info($"涓嬪彂浠诲姟锛氳繑鍥炲唴瀹癸細{r}");
+ LogHelper.Info($"璁惧鐘舵�鍒囨崲锛氳繑鍥炲唴瀹癸細{r}");
result = JsonConvert.DeserializeObject<Result<Empty>>(r);
if (result.Code == 200)
{
- LogHelper.Info($"涓嬪彂浠诲姟鎴愬姛");
+ LogHelper.Info($"璁惧鐘舵�鍒囨崲鎴愬姛");
}
else
{
- LogHelper.Info($"涓嬪彂浠诲姟澶辫触=>msg:{result.Msg}");
+ LogHelper.Info($"璁惧鐘舵�鍒囨崲澶辫触=>msg:{result.Msg}");
}
return result;
}
catch (Exception ex)
{
- LogHelper.Info($"涓嬪彂浠诲姟=>閿欒锛歟rror锛歿ex.Message}锛岃鍙�{ex.StackTrace}");
+ LogHelper.Info($"璁惧鐘舵�鍒囨崲=>閿欒锛歟rror锛歿ex.Message}锛岃鍙�{ex.StackTrace}");
+ return result;
+ }
+
+ }
+
+ /// <summary>
+ /// 淇敼浠诲姟浼樺厛绾�+ /// </summary>
+ /// <param name="task"></param>
+ /// <param name="url"></param>
+ /// <returns></returns>
+ public Result<Empty> ChangePriority(string taskno,int priority, string url)
+ {
+ //杩斿洖淇℃伅
+ Result<Empty> result = new Result<Empty>();
+ try
+ {
+ ChangePriorityModel model = new ChangePriorityModel();
+
+ model.TaskNo = taskno;
+ model.Priority = priority;
+ string date = JsonConvert.SerializeObject(model);
+ LogHelper.Info($"淇敼浠诲姟浼樺厛绾э細鍦板潃:{url}锛屽唴瀹癸細{date}");
+ var r = WebPost(url, date);
+ LogHelper.Info($"淇敼浠诲姟浼樺厛绾э細杩斿洖鍐呭锛歿r}");
+ result = JsonConvert.DeserializeObject<Result<Empty>>(r);
+ if (result.Code == 200)
+ {
+ LogHelper.Info($"淇敼浠诲姟浼樺厛绾ф垚鍔�);
+ }
+ else
+ {
+ LogHelper.Info($"淇敼浠诲姟浼樺厛绾уけ璐�>msg:{result.Msg}");
+ }
+ return result;
+ }
+ catch (Exception ex)
+ {
+
+ LogHelper.Info($"淇敼浠诲姟浼樺厛绾�>閿欒锛歟rror锛歿ex.Message}锛岃鍙�{ex.StackTrace}");
return result;
}
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/util/Settings.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/util/Settings.cs
index fa2d18c..d3199bc 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/util/Settings.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/util/Settings.cs
@@ -137,6 +137,7 @@
/// 3 鑾峰彇璁惧鐘舵�
/// 4 淇敼浠诲姟浼樺厛绾� /// 5 鍙犵洏鏈虹姸鎬佸垏鎹�+ /// 6 淇敼浠诲姟浼樺厛绾� /// </summary>
public int id { get; set; }
public string url { get; set; }
--
Gitblit v1.9.1