From c570f80289bd9b04f02b861f2a91d47b3e1aec72 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <1247017146@qq.com>
Date: 星期三, 21 五月 2025 09:16:13 +0800
Subject: [PATCH] 1
---
项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.backup.json | 48 ++++----
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/AGV/AGVService.cs | 122 ++++++++++++++++---
项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2 | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageSocketServices/SocketClientService.cs | 25 +++
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/AGV/IAGVService.cs | 6
项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.json | 106 ++++++-----------
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/AGVController.cs | 27 +++
项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.suo | 0
8 files changed, 210 insertions(+), 124 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2"
index 039151f..d9b5140 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.suo" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.suo"
index 15c6ad2..a7edf7d 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.suo"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.suo"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.backup.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.backup.json"
index 9617968..f015243 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.backup.json"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.backup.json"
@@ -3,6 +3,14 @@
"WorkspaceRootPath": "E:\\GET\\ChangWenJingZhi382-01\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\",
"Documents": [
{
+ "AbsoluteMoniker": "D:0:0:{55326F38-372A-4606-B7FB-8C01BBAEC4FC}|WIDESEA_StoragIntegrationServices\\WIDESEA_StoragIntegrationServices.csproj|e:\\get\\changwenjingzhi382-01\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_storagintegrationservices\\agv\\agvservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{55326F38-372A-4606-B7FB-8C01BBAEC4FC}|WIDESEA_StoragIntegrationServices\\WIDESEA_StoragIntegrationServices.csproj|solutionrelative:widesea_storagintegrationservices\\agv\\agvservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{C67B91CF-6901-4381-956D-46665B153D28}|WIDESEA_StorageSocketServices\\WIDESEA_StorageSocketServices.csproj|e:\\get\\changwenjingzhi382-01\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_storagesocketservices\\socketclientservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{C67B91CF-6901-4381-956D-46665B153D28}|WIDESEA_StorageSocketServices\\WIDESEA_StorageSocketServices.csproj|solutionrelative:widesea_storagesocketservices\\socketclientservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
"AbsoluteMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|e:\\get\\changwenjingzhi382-01\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_wmsserver\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}",
"RelativeMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|solutionrelative:widesea_wmsserver\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}"
},
@@ -17,14 +25,6 @@
{
"AbsoluteMoniker": "D:0:0:{111BD7AA-9749-4506-9772-79F9EF14754C}|WIDESEA_Core\\WIDESEA_Core.csproj|e:\\get\\changwenjingzhi382-01\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_core\\seed\\dbcontext.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{111BD7AA-9749-4506-9772-79F9EF14754C}|WIDESEA_Core\\WIDESEA_Core.csproj|solutionrelative:widesea_core\\seed\\dbcontext.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{55326F38-372A-4606-B7FB-8C01BBAEC4FC}|WIDESEA_StoragIntegrationServices\\WIDESEA_StoragIntegrationServices.csproj|e:\\get\\changwenjingzhi382-01\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_storagintegrationservices\\agv\\agvservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{55326F38-372A-4606-B7FB-8C01BBAEC4FC}|WIDESEA_StoragIntegrationServices\\WIDESEA_StoragIntegrationServices.csproj|solutionrelative:widesea_storagintegrationservices\\agv\\agvservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{C67B91CF-6901-4381-956D-46665B153D28}|WIDESEA_StorageSocketServices\\WIDESEA_StorageSocketServices.csproj|e:\\get\\changwenjingzhi382-01\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_storagesocketservices\\socketclientservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{C67B91CF-6901-4381-956D-46665B153D28}|WIDESEA_StorageSocketServices\\WIDESEA_StorageSocketServices.csproj|solutionrelative:widesea_storagesocketservices\\socketclientservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{9912BD12-4CF7-4A91-8203-47C9C125004C}|WIDESEA_StorageTaskServices\\WIDESEA_StorageTaskServices.csproj|e:\\get\\changwenjingzhi382-01\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_storagetaskservices\\aspnetcoreschedule.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
@@ -54,11 +54,15 @@
"DocumentGroups": [
{
"DockedWidth": 200,
- "SelectedChildIndex": 9,
+ "SelectedChildIndex": 5,
"Children": [
{
+ "$type": "Bookmark",
+ "Name": "ST:128:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
+ },
+ {
"$type": "Document",
- "DocumentIndex": 2,
+ "DocumentIndex": 4,
"Title": "SqlsugarSetup.cs",
"DocumentMoniker": "E:\\GET\\ChangWenJingZhi382-01\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_Core\\Extensions\\SqlsugarSetup.cs",
"RelativeDocumentMoniker": "WIDESEA_Core\\Extensions\\SqlsugarSetup.cs",
@@ -71,7 +75,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 3,
+ "DocumentIndex": 5,
"Title": "DBContext.cs",
"DocumentMoniker": "E:\\GET\\ChangWenJingZhi382-01\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_Core\\Seed\\DBContext.cs",
"RelativeDocumentMoniker": "WIDESEA_Core\\Seed\\DBContext.cs",
@@ -83,12 +87,8 @@
"EditorCaption": ""
},
{
- "$type": "Bookmark",
- "Name": "ST:128:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
- },
- {
"$type": "Document",
- "DocumentIndex": 1,
+ "DocumentIndex": 3,
"Title": "SqlSugarHelper.cs",
"DocumentMoniker": "E:\\GET\\ChangWenJingZhi382-01\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_Core\\Helper\\SqlSugarHelper.cs",
"RelativeDocumentMoniker": "WIDESEA_Core\\Helper\\SqlSugarHelper.cs",
@@ -101,26 +101,26 @@
},
{
"$type": "Document",
- "DocumentIndex": 5,
+ "DocumentIndex": 1,
"Title": "SocketClientService.cs",
"DocumentMoniker": "E:\\GET\\ChangWenJingZhi382-01\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StorageSocketServices\\SocketClientService.cs",
"RelativeDocumentMoniker": "WIDESEA_StorageSocketServices\\SocketClientService.cs",
"ToolTip": "E:\\GET\\ChangWenJingZhi382-01\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StorageSocketServices\\SocketClientService.cs",
"RelativeToolTip": "WIDESEA_StorageSocketServices\\SocketClientService.cs",
- "ViewState": "AgIAABEEAAAAAAAAAAD4vyIEAAAzAAAAAAAAAA==",
+ "ViewState": "AgIAAFQEAAAAAAAAAAAMwGQEAABPAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-13T03:16:57.774Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 4,
+ "DocumentIndex": 0,
"Title": "AGVService.cs",
"DocumentMoniker": "E:\\GET\\ChangWenJingZhi382-01\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StoragIntegrationServices\\AGV\\AGVService.cs",
"RelativeDocumentMoniker": "WIDESEA_StoragIntegrationServices\\AGV\\AGVService.cs",
- "ToolTip": "E:\\GET\\ChangWenJingZhi382-01\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StoragIntegrationServices\\AGV\\AGVService.cs",
- "RelativeToolTip": "WIDESEA_StoragIntegrationServices\\AGV\\AGVService.cs",
- "ViewState": "AgIAADEBAAAAAAAAAAAAAEgBAAAMAAAAAAAAAA==",
+ "ToolTip": "E:\\GET\\ChangWenJingZhi382-01\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StoragIntegrationServices\\AGV\\AGVService.cs*",
+ "RelativeToolTip": "WIDESEA_StoragIntegrationServices\\AGV\\AGVService.cs*",
+ "ViewState": "AgIAADABAAAAAAAAAADwv1ABAAA9AAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-15T16:55:46.733Z",
"EditorCaption": ""
@@ -165,13 +165,13 @@
},
{
"$type": "Document",
- "DocumentIndex": 0,
+ "DocumentIndex": 2,
"Title": "appsettings.json",
"DocumentMoniker": "E:\\GET\\ChangWenJingZhi382-01\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\appsettings.json",
"RelativeDocumentMoniker": "WIDESEA_WMSServer\\appsettings.json",
"ToolTip": "E:\\GET\\ChangWenJingZhi382-01\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\appsettings.json",
"RelativeToolTip": "WIDESEA_WMSServer\\appsettings.json",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAAAwAAAAWAAAAAAAAAA==",
+ "ViewState": "AgIAAAAAAAAAAAAAAAAAABEAAABVAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|",
"WhenOpened": "2025-05-15T14:12:25.002Z",
"EditorCaption": ""
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.json"
index f015243..b4cafde 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.json"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.json"
@@ -3,40 +3,32 @@
"WorkspaceRootPath": "E:\\GET\\ChangWenJingZhi382-01\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\",
"Documents": [
{
- "AbsoluteMoniker": "D:0:0:{55326F38-372A-4606-B7FB-8C01BBAEC4FC}|WIDESEA_StoragIntegrationServices\\WIDESEA_StoragIntegrationServices.csproj|e:\\get\\changwenjingzhi382-01\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_storagintegrationservices\\agv\\agvservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{55326F38-372A-4606-B7FB-8C01BBAEC4FC}|WIDESEA_StoragIntegrationServices\\WIDESEA_StoragIntegrationServices.csproj|solutionrelative:widesea_storagintegrationservices\\agv\\agvservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
"AbsoluteMoniker": "D:0:0:{C67B91CF-6901-4381-956D-46665B153D28}|WIDESEA_StorageSocketServices\\WIDESEA_StorageSocketServices.csproj|e:\\get\\changwenjingzhi382-01\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_storagesocketservices\\socketclientservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{C67B91CF-6901-4381-956D-46665B153D28}|WIDESEA_StorageSocketServices\\WIDESEA_StorageSocketServices.csproj|solutionrelative:widesea_storagesocketservices\\socketclientservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
- "AbsoluteMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|e:\\get\\changwenjingzhi382-01\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_wmsserver\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}",
- "RelativeMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|solutionrelative:widesea_wmsserver\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{111BD7AA-9749-4506-9772-79F9EF14754C}|WIDESEA_Core\\WIDESEA_Core.csproj|e:\\get\\changwenjingzhi382-01\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_core\\helper\\sqlsugarhelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{111BD7AA-9749-4506-9772-79F9EF14754C}|WIDESEA_Core\\WIDESEA_Core.csproj|solutionrelative:widesea_core\\helper\\sqlsugarhelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{111BD7AA-9749-4506-9772-79F9EF14754C}|WIDESEA_Core\\WIDESEA_Core.csproj|e:\\get\\changwenjingzhi382-01\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_core\\extensions\\sqlsugarsetup.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{111BD7AA-9749-4506-9772-79F9EF14754C}|WIDESEA_Core\\WIDESEA_Core.csproj|solutionrelative:widesea_core\\extensions\\sqlsugarsetup.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{111BD7AA-9749-4506-9772-79F9EF14754C}|WIDESEA_Core\\WIDESEA_Core.csproj|e:\\get\\changwenjingzhi382-01\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_core\\seed\\dbcontext.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{111BD7AA-9749-4506-9772-79F9EF14754C}|WIDESEA_Core\\WIDESEA_Core.csproj|solutionrelative:widesea_core\\seed\\dbcontext.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ "AbsoluteMoniker": "D:0:0:{55326F38-372A-4606-B7FB-8C01BBAEC4FC}|WIDESEA_StoragIntegrationServices\\WIDESEA_StoragIntegrationServices.csproj|e:\\get\\changwenjingzhi382-01\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_storagintegrationservices\\agv\\agvservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{55326F38-372A-4606-B7FB-8C01BBAEC4FC}|WIDESEA_StoragIntegrationServices\\WIDESEA_StoragIntegrationServices.csproj|solutionrelative:widesea_storagintegrationservices\\agv\\agvservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{9912BD12-4CF7-4A91-8203-47C9C125004C}|WIDESEA_StorageTaskServices\\WIDESEA_StorageTaskServices.csproj|e:\\get\\changwenjingzhi382-01\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_storagetaskservices\\aspnetcoreschedule.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{9912BD12-4CF7-4A91-8203-47C9C125004C}|WIDESEA_StorageTaskServices\\WIDESEA_StorageTaskServices.csproj|solutionrelative:widesea_storagetaskservices\\aspnetcoreschedule.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
- "AbsoluteMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|e:\\get\\changwenjingzhi382-01\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_wmsserver\\controllers\\agvcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|solutionrelative:widesea_wmsserver\\controllers\\agvcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ "AbsoluteMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|e:\\get\\changwenjingzhi382-01\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_wmsserver\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}",
+ "RelativeMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|solutionrelative:widesea_wmsserver\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{DDB9E57D-82F9-4759-B6D7-0FB021D30085}|WIDESEA_IStorageSocketServices\\WIDESEA_IStorageSocketServices.csproj|e:\\get\\changwenjingzhi382-01\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_istoragesocketservices\\isocketclientservices.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{DDB9E57D-82F9-4759-B6D7-0FB021D30085}|WIDESEA_IStorageSocketServices\\WIDESEA_IStorageSocketServices.csproj|solutionrelative:widesea_istoragesocketservices\\isocketclientservices.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{94D572FA-810E-4897-B673-AF988FD4019E}|WIDESEA_IStoragIntegrationServices\\WIDESEA_IStoragIntegrationServices.csproj|e:\\get\\changwenjingzhi382-01\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_istoragintegrationservices\\agv\\iagvservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{94D572FA-810E-4897-B673-AF988FD4019E}|WIDESEA_IStoragIntegrationServices\\WIDESEA_IStoragIntegrationServices.csproj|solutionrelative:widesea_istoragintegrationservices\\agv\\iagvservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|e:\\get\\changwenjingzhi382-01\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_wmsserver\\controllers\\agvcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|solutionrelative:widesea_wmsserver\\controllers\\agvcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{00CE9885-9F24-4B6C-A7E8-0DE8C9ED7128}|WIDESEA_Model\\WIDESEA_Model.csproj|e:\\get\\changwenjingzhi382-01\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_model\\models\\basicinfo\\dt_stationmanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
@@ -54,7 +46,7 @@
"DocumentGroups": [
{
"DockedWidth": 200,
- "SelectedChildIndex": 5,
+ "SelectedChildIndex": 2,
"Children": [
{
"$type": "Bookmark",
@@ -63,71 +55,45 @@
{
"$type": "Document",
"DocumentIndex": 4,
- "Title": "SqlsugarSetup.cs",
- "DocumentMoniker": "E:\\GET\\ChangWenJingZhi382-01\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_Core\\Extensions\\SqlsugarSetup.cs",
- "RelativeDocumentMoniker": "WIDESEA_Core\\Extensions\\SqlsugarSetup.cs",
- "ToolTip": "E:\\GET\\ChangWenJingZhi382-01\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_Core\\Extensions\\SqlsugarSetup.cs",
- "RelativeToolTip": "WIDESEA_Core\\Extensions\\SqlsugarSetup.cs",
- "ViewState": "AgIAABkAAAAAAAAAAAAEwCsAAAA1AAAAAAAAAA==",
+ "Title": "ISocketClientServices.cs",
+ "DocumentMoniker": "E:\\GET\\ChangWenJingZhi382-01\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_IStorageSocketServices\\ISocketClientServices.cs",
+ "RelativeDocumentMoniker": "WIDESEA_IStorageSocketServices\\ISocketClientServices.cs",
+ "ToolTip": "E:\\GET\\ChangWenJingZhi382-01\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_IStorageSocketServices\\ISocketClientServices.cs",
+ "RelativeToolTip": "WIDESEA_IStorageSocketServices\\ISocketClientServices.cs",
+ "ViewState": "AgIAAM0AAAAAAAAAAAAzwNwAAAA+AAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-20T04:05:03.73Z",
+ "WhenOpened": "2025-05-20T06:37:13.547Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 5,
- "Title": "DBContext.cs",
- "DocumentMoniker": "E:\\GET\\ChangWenJingZhi382-01\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_Core\\Seed\\DBContext.cs",
- "RelativeDocumentMoniker": "WIDESEA_Core\\Seed\\DBContext.cs",
- "ToolTip": "E:\\GET\\ChangWenJingZhi382-01\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_Core\\Seed\\DBContext.cs",
- "RelativeToolTip": "WIDESEA_Core\\Seed\\DBContext.cs",
- "ViewState": "AgIAAAwAAAAAAAAAAAAQwBkAAAAZAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-20T03:48:31.21Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 3,
- "Title": "SqlSugarHelper.cs",
- "DocumentMoniker": "E:\\GET\\ChangWenJingZhi382-01\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_Core\\Helper\\SqlSugarHelper.cs",
- "RelativeDocumentMoniker": "WIDESEA_Core\\Helper\\SqlSugarHelper.cs",
- "ToolTip": "E:\\GET\\ChangWenJingZhi382-01\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_Core\\Helper\\SqlSugarHelper.cs",
- "RelativeToolTip": "WIDESEA_Core\\Helper\\SqlSugarHelper.cs",
- "ViewState": "AgIAAAAAAAAAAAAAAADwvx0AAAAlAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-20T03:22:02.771Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 1,
+ "DocumentIndex": 0,
"Title": "SocketClientService.cs",
"DocumentMoniker": "E:\\GET\\ChangWenJingZhi382-01\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StorageSocketServices\\SocketClientService.cs",
"RelativeDocumentMoniker": "WIDESEA_StorageSocketServices\\SocketClientService.cs",
"ToolTip": "E:\\GET\\ChangWenJingZhi382-01\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StorageSocketServices\\SocketClientService.cs",
"RelativeToolTip": "WIDESEA_StorageSocketServices\\SocketClientService.cs",
- "ViewState": "AgIAAFQEAAAAAAAAAAAMwGQEAABPAAAAAAAAAA==",
+ "ViewState": "AgIAAJQEAAAAAAAAAAAAAKoEAAAcAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-13T03:16:57.774Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 0,
+ "DocumentIndex": 1,
"Title": "AGVService.cs",
"DocumentMoniker": "E:\\GET\\ChangWenJingZhi382-01\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StoragIntegrationServices\\AGV\\AGVService.cs",
"RelativeDocumentMoniker": "WIDESEA_StoragIntegrationServices\\AGV\\AGVService.cs",
- "ToolTip": "E:\\GET\\ChangWenJingZhi382-01\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StoragIntegrationServices\\AGV\\AGVService.cs*",
- "RelativeToolTip": "WIDESEA_StoragIntegrationServices\\AGV\\AGVService.cs*",
- "ViewState": "AgIAADABAAAAAAAAAADwv1ABAAA9AAAAAAAAAA==",
+ "ToolTip": "E:\\GET\\ChangWenJingZhi382-01\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StoragIntegrationServices\\AGV\\AGVService.cs",
+ "RelativeToolTip": "WIDESEA_StoragIntegrationServices\\AGV\\AGVService.cs",
+ "ViewState": "AgIAADUAAAAAAAAAAAAEwEcAAAAlAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-15T16:55:46.733Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 9,
+ "DocumentIndex": 7,
"Title": "Dt_StationManager.cs",
"DocumentMoniker": "E:\\GET\\ChangWenJingZhi382-01\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_Model\\Models\\BasicInfo\\Dt_StationManager.cs",
"RelativeDocumentMoniker": "WIDESEA_Model\\Models\\BasicInfo\\Dt_StationManager.cs",
@@ -140,7 +106,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 10,
+ "DocumentIndex": 8,
"Title": "Program.cs",
"DocumentMoniker": "E:\\GET\\ChangWenJingZhi382-01\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\Program.cs",
"RelativeDocumentMoniker": "WIDESEA_WMSServer\\Program.cs",
@@ -152,52 +118,52 @@
},
{
"$type": "Document",
- "DocumentIndex": 7,
+ "DocumentIndex": 6,
"Title": "AGVController.cs",
"DocumentMoniker": "E:\\GET\\ChangWenJingZhi382-01\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\Controllers\\AGVController.cs",
"RelativeDocumentMoniker": "WIDESEA_WMSServer\\Controllers\\AGVController.cs",
"ToolTip": "E:\\GET\\ChangWenJingZhi382-01\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\Controllers\\AGVController.cs",
"RelativeToolTip": "WIDESEA_WMSServer\\Controllers\\AGVController.cs",
- "ViewState": "AgIAADEAAAAAAAAAAADgv0EAAAAcAAAAAAAAAA==",
+ "ViewState": "AgIAADEAAAAAAAAAAADgv0gAAAALAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-19T03:15:03.848Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 2,
+ "DocumentIndex": 3,
"Title": "appsettings.json",
"DocumentMoniker": "E:\\GET\\ChangWenJingZhi382-01\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\appsettings.json",
"RelativeDocumentMoniker": "WIDESEA_WMSServer\\appsettings.json",
"ToolTip": "E:\\GET\\ChangWenJingZhi382-01\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\appsettings.json",
"RelativeToolTip": "WIDESEA_WMSServer\\appsettings.json",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAABEAAABVAAAAAAAAAA==",
+ "ViewState": "AgIAABUAAAAAAAAAAAAAADAAAAAaAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|",
"WhenOpened": "2025-05-15T14:12:25.002Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 8,
+ "DocumentIndex": 5,
"Title": "IAGVService.cs",
"DocumentMoniker": "E:\\GET\\ChangWenJingZhi382-01\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_IStoragIntegrationServices\\AGV\\IAGVService.cs",
"RelativeDocumentMoniker": "WIDESEA_IStoragIntegrationServices\\AGV\\IAGVService.cs",
"ToolTip": "E:\\GET\\ChangWenJingZhi382-01\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_IStoragIntegrationServices\\AGV\\IAGVService.cs",
"RelativeToolTip": "WIDESEA_IStoragIntegrationServices\\AGV\\IAGVService.cs",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAABMAAAAfAAAAAAAAAA==",
+ "ViewState": "AgIAAAAAAAAAAAAAAAAAABMAAAAjAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-20T01:53:31.09Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 6,
+ "DocumentIndex": 2,
"Title": "AspNetCoreSchedule.cs",
"DocumentMoniker": "E:\\GET\\ChangWenJingZhi382-01\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StorageTaskServices\\AspNetCoreSchedule.cs",
"RelativeDocumentMoniker": "WIDESEA_StorageTaskServices\\AspNetCoreSchedule.cs",
"ToolTip": "E:\\GET\\ChangWenJingZhi382-01\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StorageTaskServices\\AspNetCoreSchedule.cs",
"RelativeToolTip": "WIDESEA_StorageTaskServices\\AspNetCoreSchedule.cs",
- "ViewState": "AgIAAAQAAAAAAAAAAAAEwBYAAAAPAAAAAAAAAA==",
+ "ViewState": "AgIAABcAAAAAAAAAAAASwCsAAAAcAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-20T03:22:47.585Z",
"EditorCaption": ""
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/AGV/IAGVService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/AGV/IAGVService.cs"
index ef72f30..edcbd9f 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/AGV/IAGVService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/AGV/IAGVService.cs"
@@ -17,6 +17,10 @@
//public WebResponseContent PallteLoadOrUnLoad(string Message, string PallteCode);
WebResponseContent DeviceErrorResponse(string Message,int TaskNum);
- //WebResponseContent Add();
+ WebResponseContent RequestOutTask(string PalletCode, string SourceAddress, string TargetAddress);
+
+ WebResponseContent InTask(string PalletCode, string SourceAddress, string TargetAddress);
+ WebResponseContent GetAGVStatus();
+ WebResponseContent GetStationStatus(string StationName);
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/AGV/AGVService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/AGV/AGVService.cs"
index ed96e28..3c643e1 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/AGV/AGVService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/AGV/AGVService.cs"
@@ -319,30 +319,108 @@
return content.Error(ex.Message);
}
}
- //public WebResponseContent Add()
- //{
- // try
- // {
- // var x = BaseDal.GetTaskNo().Result;
+ public WebResponseContent RequestOutTask(string PalletCode, string SourceAddress, string TargetAddress)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ //var tasks = BaseDal.QueryFirst(x => x.PalletCode == PalletCode);
+ //if (tasks != null)
+ //{
+ // return content.Error("璇ユ墭鐩樺凡瀛樺湪浠诲姟");
+ //}
+ Dt_Task newTask = new Dt_Task()
+ {
+ TaskNum = BaseDal.GetTaskNo().Result,
+ SourceAddress = SourceAddress,
+ CurrentAddress = SourceAddress,
+ TargetAddress = TargetAddress,
+ NextAddress = TargetAddress,
+ Grade = 1,
+ PalletCode = PalletCode,
+ TaskType = (int)TaskOutboundTypeEnum.Outbound,
+ TaskState = (int)TaskOutStatusEnum.OutNew,
+ Dispatchertime = DateTime.Now,
+ SeqNo = Convert.ToInt32(1),
+ CommandID = Convert.ToInt32(101)
+ };
+ task_call task_Call = new task_call()
+ {
+ d_task_type = newTask.TaskType == (int)TaskTypeEnum.Inbound ? 1 : 2,
+ d_floor = 1,
+ d_involed1 = newTask.SourceAddress,
+ d_involed2 = newTask.TargetAddress,
+ d_involed5 = newTask.TaskNum,
+ };
+ SqlSugarHelper.DbAGV.Insertable(task_Call).ExecuteCommand();
+ return content.OK();
- // task_call task_Call = new task_call()
- // {
- // d_task_type = 1,
- // d_floor = 1,
- // d_involed1 = "480101",
- // d_involed2 = "B001::1",
- // d_involed5 = x,
- // };
- // var y=SqlSugarHelper.DbAGV.Insertable(task_Call).ExecuteCommand();
- // return WebResponseContent.Instance.OK(data: y);
- // }
- // catch (Exception ex)
- // {
- // return WebResponseContent.Instance.Error(ex.Message);
- // }
- //}
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ }
+ }
+
+ public WebResponseContent InTask(string PalletCode, string SourceAddress, string TargetAddress)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ Dt_Task newTask = new Dt_Task()
+ {
+ TaskNum = BaseDal.GetTaskNo().Result,
+ SourceAddress = SourceAddress,
+ TargetAddress = TargetAddress,
+ PalletCode = PalletCode,
+ TaskType = (int)TaskInboundTypeEnum.Inbound,
+ TaskState = (int)TaskInStatusEnum.InNew,
+ Dispatchertime = DateTime.Now,
+ SeqNo = Convert.ToInt32(1),
+ CommandID = Convert.ToInt32(101)
+ };
+ task_call task_Call = new task_call()
+ {
+ d_task_type = newTask.TaskType == (int)TaskTypeEnum.Inbound ? 1 : 2,
+ d_floor = 1,
+ d_involed1 = newTask.SourceAddress,
+ d_involed2 = newTask.TargetAddress,
+ d_involed5 = newTask.TaskNum,
+ };
+ SqlSugarHelper.DbAGV.Insertable(task_Call).ExecuteCommand();
+ return content.OK();
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ }
+ }
+ public WebResponseContent GetAGVStatus()
+ {
+ try
+ {
+ var x = _Socket.GetAGVStatus();
+ return WebResponseContent.Instance.OK(data: x);
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+ }
+ public WebResponseContent GetStationStatus(string StationName)
+ {
+ try
+ {
+ var x = _Socket.GetStationStatus(StationName);
+ return WebResponseContent.Instance.OK(data: x);
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+ }
#endregion 澶栭儴鎺ュ彛鏂规硶
-
+
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageSocketServices/SocketClientService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageSocketServices/SocketClientService.cs"
index 55d993b..43d6f4f 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageSocketServices/SocketClientService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageSocketServices/SocketClientService.cs"
@@ -22,6 +22,7 @@
using WIDESEA_Core.BaseRepository;
using AutoMapper;
using Mapster;
+using System.Threading.Tasks;
namespace WIDESEA_StorageSocketServices
{
@@ -1130,12 +1131,32 @@
/// <returns></returns>
private int InsertAGVTask(Dt_Task task)
{
+ string SourceAddress = string.Empty;
+ string TargetAddress = string.Empty;
+ if (task.TaskType == (int)TaskInboundTypeEnum.Inbound)
+ {
+ TargetAddress = InsertHyphenEveryTwoChars(task.TargetAddress);
+ }
+ else if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
+ {
+ SourceAddress = InsertHyphenEveryTwoChars(task.SourceAddress);
+ }
+ else if (task.TaskType == (int)TaskRelocationTypeEnum.Relocation)
+ {
+ TargetAddress = InsertHyphenEveryTwoChars(task.TargetAddress);
+ SourceAddress = InsertHyphenEveryTwoChars(task.SourceAddress);
+ }
+ else if (task.TaskType == (int)TaskStationTypeEnum.StationToStation)
+ {
+ TargetAddress = task.TargetAddress;
+ SourceAddress = task.SourceAddress;
+ }
task_call task_Call = new task_call()
{
d_task_type = task.TaskType == (int)TaskTypeEnum.Inbound ? 1 : 2,
d_floor = 1,
- d_involed1 = InsertHyphenEveryTwoChars(task.SourceAddress),
- d_involed2 = InsertHyphenEveryTwoChars(task.TargetAddress),
+ d_involed1 = SourceAddress,
+ d_involed2 = TargetAddress,
d_involed5 = task.TaskNum,
};
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/AGVController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/AGVController.cs"
index af192ac..0880976 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/AGVController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/AGVController.cs"
@@ -66,10 +66,27 @@
return _service.DeviceErrorResponse(Message,TaskNum);
}
- //[HttpGet, HttpPost, Route("Add"), AllowAnonymous]
- //public WebResponseContent Add()
- //{
- // return _service.Add();
- //}
+ [HttpGet, Route("RequestOutTask"), AllowAnonymous]
+ public WebResponseContent RequestOutTask(string PalletCode, string SourceAddress, string TargetAddress)
+ {
+ return _service.RequestOutTask(PalletCode, SourceAddress, TargetAddress);
+ }
+
+ [HttpGet, Route("InTask"), AllowAnonymous]
+ public WebResponseContent InTask(string PalletCode, string SourceAddress, string TargetAddress)
+ {
+ return _service.InTask(PalletCode, SourceAddress, TargetAddress);
+ }
+
+ [HttpGet, HttpPost, Route("GetAGVStatus"), AllowAnonymous]
+ public WebResponseContent GetAGVStatus()
+ {
+ return _service.GetAGVStatus();
+ }
+ [HttpGet, HttpPost, Route("GetStationStatus"), AllowAnonymous]
+ public WebResponseContent GetStationStatus(string StationName)
+ {
+ return _service.GetStationStatus(StationName);
+ }
}
}
--
Gitblit v1.9.3