From d4d524ace9ec2befa6bcd9321384daf05c68d415 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <1247017146@qq.com>
Date: 星期二, 20 五月 2025 15:22:58 +0800
Subject: [PATCH] 1
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json | 9
项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.backup.json | 198 ++++++++++---------
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/AGV/AGVService.cs | 28 ++
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageSocketServices/SocketClientService.cs | 117 +++++++---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/AGV/IAGVService.cs | 1
项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.json | 212 +++++++++++----------
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/AGVController.cs | 6
项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.suo | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_IStorageSocketServices/ISocketClientServices.cs | 2
9 files changed, 335 insertions(+), 238 deletions(-)
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 6791e5f..15c6ad2 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 e751ec4..9617968 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"
@@ -7,36 +7,40 @@
"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\\db\\maindb.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{111BD7AA-9749-4506-9772-79F9EF14754C}|WIDESEA_Core\\WIDESEA_Core.csproj|solutionrelative:widesea_core\\db\\maindb.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\\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\\helper\\securityencdecrypthelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{111BD7AA-9749-4506-9772-79F9EF14754C}|WIDESEA_Core\\WIDESEA_Core.csproj|solutionrelative:widesea_core\\helper\\securityencdecrypthelper.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:{111BD7AA-9749-4506-9772-79F9EF14754C}|WIDESEA_Core\\WIDESEA_Core.csproj|e:\\get\\changwenjingzhi382-01\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_core\\db\\basedbconfig.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{111BD7AA-9749-4506-9772-79F9EF14754C}|WIDESEA_Core\\WIDESEA_Core.csproj|solutionrelative:widesea_core\\db\\basedbconfig.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\\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:{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:{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:{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:{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}",
+ "RelativeMoniker": "D:0:0:{00CE9885-9F24-4B6C-A7E8-0DE8C9ED7128}|WIDESEA_Model\\WIDESEA_Model.csproj|solutionrelative:widesea_model\\models\\basicinfo\\dt_stationmanager.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\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
@@ -53,64 +57,90 @@
"SelectedChildIndex": 9,
"Children": [
{
+ "$type": "Document",
+ "DocumentIndex": 2,
+ "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==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-20T04:05:03.73Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 3,
+ "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": "Bookmark",
"Name": "ST:128:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
},
{
"$type": "Document",
"DocumentIndex": 1,
- "Title": "MainDb.cs",
- "DocumentMoniker": "E:\\GET\\ChangWenJingZhi382-01\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_Core\\DB\\MainDb.cs",
- "RelativeDocumentMoniker": "WIDESEA_Core\\DB\\MainDb.cs",
- "ToolTip": "E:\\GET\\ChangWenJingZhi382-01\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_Core\\DB\\MainDb.cs",
- "RelativeToolTip": "WIDESEA_Core\\DB\\MainDb.cs",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAAA4AAABWAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-19T08:20:21.201Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 2,
- "Title": "SecurityEncDecryptHelper.cs",
- "DocumentMoniker": "E:\\GET\\ChangWenJingZhi382-01\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_Core\\Helper\\SecurityEncDecryptHelper.cs",
- "RelativeDocumentMoniker": "WIDESEA_Core\\Helper\\SecurityEncDecryptHelper.cs",
- "ToolTip": "E:\\GET\\ChangWenJingZhi382-01\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_Core\\Helper\\SecurityEncDecryptHelper.cs",
- "RelativeToolTip": "WIDESEA_Core\\Helper\\SecurityEncDecryptHelper.cs",
- "ViewState": "AgIAACUAAAAAAAAAAAAcwDoAAABhAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-19T08:19:36.175Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 4,
- "Title": "BaseDBConfig.cs",
- "DocumentMoniker": "E:\\GET\\ChangWenJingZhi382-01\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_Core\\DB\\BaseDBConfig.cs",
- "RelativeDocumentMoniker": "WIDESEA_Core\\DB\\BaseDBConfig.cs",
- "ToolTip": "E:\\GET\\ChangWenJingZhi382-01\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_Core\\DB\\BaseDBConfig.cs",
- "RelativeToolTip": "WIDESEA_Core\\DB\\BaseDBConfig.cs",
- "ViewState": "AgIAAC4AAAAAAAAAAAAlwDwAAAANAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-19T08:07:18.643Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 5,
"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": "AgIAAAAAAAAAAAAAAAAAAAYAAAAVAAAAAAAAAA==",
+ "ViewState": "AgIAAAAAAAAAAAAAAADwvx0AAAAlAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-19T07:57:44.725Z",
+ "WhenOpened": "2025-05-20T03:22:02.771Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 5,
+ "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==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-13T03:16:57.774Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 4,
+ "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==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-15T16:55:46.733Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 9,
+ "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",
+ "ToolTip": "E:\\GET\\ChangWenJingZhi382-01\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_Model\\Models\\BasicInfo\\Dt_StationManager.cs",
+ "RelativeToolTip": "WIDESEA_Model\\Models\\BasicInfo\\Dt_StationManager.cs",
+ "ViewState": "AgIAAAAAAAAAAAAAAAAAAEgAAAAsAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-19T09:42:31.372Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 10,
"Title": "Program.cs",
"DocumentMoniker": "E:\\GET\\ChangWenJingZhi382-01\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\Program.cs",
"RelativeDocumentMoniker": "WIDESEA_WMSServer\\Program.cs",
@@ -122,41 +152,16 @@
},
{
"$type": "Document",
- "DocumentIndex": 6,
- "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": "AgIAABkEAAAAAAAAAAAmwNMCAAAYAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-13T03:16:57.774Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
"DocumentIndex": 7,
- "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": "AgIAACIBAAAAAAAAAAArwMcAAAAQAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-15T16:55:46.733Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 8,
"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": "AgIAAA4AAAAAAAAAAAAAwBwAAAA2AAAAAAAAAA==",
+ "ViewState": "AgIAADEAAAAAAAAAAADgv0EAAAAcAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-19T03:15:03.848Z"
+ "WhenOpened": "2025-05-19T03:15:03.848Z",
+ "EditorCaption": ""
},
{
"$type": "Document",
@@ -166,22 +171,35 @@
"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": "AgIAAAAAAAAAAAAAAADwvwoAAAAmAAAAAAAAAA==",
+ "ViewState": "AgIAAAAAAAAAAAAAAAAAAAwAAAAWAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|",
"WhenOpened": "2025-05-15T14:12:25.002Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 3,
- "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": "AgIAACEAAAAAAAAAAAAlwCEAAAAUAAAAAAAAAA==",
+ "DocumentIndex": 8,
+ "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==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-19T08:09:07.202Z",
+ "WhenOpened": "2025-05-20T01:53:31.09Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 6,
+ "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==",
+ "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/.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 d60094a..f015243 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,44 +3,44 @@
"WorkspaceRootPath": "E:\\GET\\ChangWenJingZhi382-01\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\",
"Documents": [
{
- "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:{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\\db\\maindb.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{111BD7AA-9749-4506-9772-79F9EF14754C}|WIDESEA_Core\\WIDESEA_Core.csproj|solutionrelative:widesea_core\\db\\maindb.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\\helper\\securityencdecrypthelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{111BD7AA-9749-4506-9772-79F9EF14754C}|WIDESEA_Core\\WIDESEA_Core.csproj|solutionrelative:widesea_core\\helper\\securityencdecrypthelper.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:{111BD7AA-9749-4506-9772-79F9EF14754C}|WIDESEA_Core\\WIDESEA_Core.csproj|e:\\get\\changwenjingzhi382-01\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_core\\db\\basedbconfig.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{111BD7AA-9749-4506-9772-79F9EF14754C}|WIDESEA_Core\\WIDESEA_Core.csproj|solutionrelative:widesea_core\\db\\basedbconfig.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\\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:{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:{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:{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:{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:{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:{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}",
+ "RelativeMoniker": "D:0:0:{00CE9885-9F24-4B6C-A7E8-0DE8C9ED7128}|WIDESEA_Model\\WIDESEA_Model.csproj|solutionrelative:widesea_model\\models\\basicinfo\\dt_stationmanager.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\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
@@ -54,7 +54,7 @@
"DocumentGroups": [
{
"DockedWidth": 200,
- "SelectedChildIndex": 1,
+ "SelectedChildIndex": 5,
"Children": [
{
"$type": "Bookmark",
@@ -62,64 +62,81 @@
},
{
"$type": "Document",
- "DocumentIndex": 0,
+ "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": "AgIAAAwAAAAAAAAAAAAAACoAAAApAAAAAAAAAA==",
+ "ViewState": "AgIAABkAAAAAAAAAAAAEwCsAAAA1AAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-19T08:24:18.179Z",
+ "WhenOpened": "2025-05-20T04:05:03.73Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 2,
- "Title": "MainDb.cs",
- "DocumentMoniker": "E:\\GET\\ChangWenJingZhi382-01\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_Core\\DB\\MainDb.cs",
- "RelativeDocumentMoniker": "WIDESEA_Core\\DB\\MainDb.cs",
- "ToolTip": "E:\\GET\\ChangWenJingZhi382-01\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_Core\\DB\\MainDb.cs",
- "RelativeToolTip": "WIDESEA_Core\\DB\\MainDb.cs",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAAA4AAABWAAAAAAAAAA==",
+ "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-19T08:20:21.201Z"
+ "WhenOpened": "2025-05-20T03:48:31.21Z",
+ "EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 3,
- "Title": "SecurityEncDecryptHelper.cs",
- "DocumentMoniker": "E:\\GET\\ChangWenJingZhi382-01\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_Core\\Helper\\SecurityEncDecryptHelper.cs",
- "RelativeDocumentMoniker": "WIDESEA_Core\\Helper\\SecurityEncDecryptHelper.cs",
- "ToolTip": "E:\\GET\\ChangWenJingZhi382-01\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_Core\\Helper\\SecurityEncDecryptHelper.cs",
- "RelativeToolTip": "WIDESEA_Core\\Helper\\SecurityEncDecryptHelper.cs",
- "ViewState": "AgIAACUAAAAAAAAAAAAcwDoAAABhAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-19T08:19:36.175Z"
- },
- {
- "$type": "Document",
- "DocumentIndex": 5,
- "Title": "BaseDBConfig.cs",
- "DocumentMoniker": "E:\\GET\\ChangWenJingZhi382-01\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_Core\\DB\\BaseDBConfig.cs",
- "RelativeDocumentMoniker": "WIDESEA_Core\\DB\\BaseDBConfig.cs",
- "ToolTip": "E:\\GET\\ChangWenJingZhi382-01\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_Core\\DB\\BaseDBConfig.cs",
- "RelativeToolTip": "WIDESEA_Core\\DB\\BaseDBConfig.cs",
- "ViewState": "AgIAAC4AAAAAAAAAAAAlwDwAAAANAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-19T08:07:18.643Z"
- },
- {
- "$type": "Document",
- "DocumentIndex": 6,
"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": "AgIAAAAAAAAAAAAAAAAAAAYAAAAVAAAAAAAAAA==",
+ "ViewState": "AgIAAAAAAAAAAAAAAADwvx0AAAAlAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-19T07:57:44.725Z"
+ "WhenOpened": "2025-05-20T03:22:02.771Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "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": "AgIAAFQEAAAAAAAAAAAMwGQEAABPAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-13T03:16:57.774Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "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": "AgIAADABAAAAAAAAAADwv1ABAAA9AAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-15T16:55:46.733Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 9,
+ "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",
+ "ToolTip": "E:\\GET\\ChangWenJingZhi382-01\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_Model\\Models\\BasicInfo\\Dt_StationManager.cs",
+ "RelativeToolTip": "WIDESEA_Model\\Models\\BasicInfo\\Dt_StationManager.cs",
+ "ViewState": "AgIAAAAAAAAAAAAAAAAAAEgAAAAsAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-05-19T09:42:31.372Z",
+ "EditorCaption": ""
},
{
"$type": "Document",
@@ -136,63 +153,54 @@
{
"$type": "Document",
"DocumentIndex": 7,
- "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": "AgIAABkEAAAAAAAAAAAmwNMCAAAYAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-13T03:16:57.774Z"
- },
- {
- "$type": "Document",
- "DocumentIndex": 8,
- "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": "AgIAACIBAAAAAAAAAAArwMcAAAAQAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-15T16:55:46.733Z"
- },
- {
- "$type": "Document",
- "DocumentIndex": 9,
"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": "AgIAAA4AAAAAAAAAAAAAwBwAAAA2AAAAAAAAAA==",
+ "ViewState": "AgIAADEAAAAAAAAAAADgv0EAAAAcAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-19T03:15:03.848Z"
+ "WhenOpened": "2025-05-19T03:15:03.848Z",
+ "EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 1,
+ "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": "AgIAAAAAAAAAAAAAAADwvwoAAAAmAAAAAAAAAA==",
+ "ViewState": "AgIAAAAAAAAAAAAAAAAAABEAAABVAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|",
"WhenOpened": "2025-05-15T14:12:25.002Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 4,
- "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": "AgIAACEAAAAAAAAAAAAlwCEAAAAUAAAAAAAAAA==",
+ "DocumentIndex": 8,
+ "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==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-05-19T08:09:07.202Z"
+ "WhenOpened": "2025-05-20T01:53:31.09Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 6,
+ "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==",
+ "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 dc6a01d..ef72f30 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,5 +17,6 @@
//public WebResponseContent PallteLoadOrUnLoad(string Message, string PallteCode);
WebResponseContent DeviceErrorResponse(string Message,int TaskNum);
+ //WebResponseContent Add();
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageSocketServices/ISocketClientServices.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageSocketServices/ISocketClientServices.cs"
index 6866d9c..9f32bed 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageSocketServices/ISocketClientServices.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageSocketServices/ISocketClientServices.cs"
@@ -218,5 +218,7 @@
WebResponseContent CompleteInboundTask(Dt_Task task);
WebResponseContent CompleteRelocationboundTask(Dt_Task task);
+ public string InsertHyphenEveryTwoChars(string input);
+
}
}
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 f533dc7..ed96e28 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"
@@ -73,7 +73,7 @@
var taskStation = BaseDal.QueryFirst(x => x.SourceAddress == item.stationName || x.TargetAddress == item.stationName);
outStationStatus.Add(new OutStationStatus()
{
- StationName = item.stationName,
+ StationName = item.HostName,
StationEnable = station.StationEnable == "1" ? "0" : "1",
IsDistributionTask = taskStation == null ? "0" : "1",
Spare1 = "00"
@@ -161,12 +161,12 @@
switch (Status.AutoStatus)
{
case "MaintenanceMode":
- //杩愯
+ //鎵嬪姩
_Socket.DeviceAutoStatusReport("1");
Thread.Sleep(500);
break;
case "ControlMode":
- //鍏虫満
+ //鑷姩
_Socket.DeviceAutoStatusReport("0");
Thread.Sleep(500);
break;
@@ -319,6 +319,28 @@
return content.Error(ex.Message);
}
}
+ //public WebResponseContent Add()
+ //{
+ // try
+ // {
+ // var x = BaseDal.GetTaskNo().Result;
+
+ // 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);
+ // }
+ //}
#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 898832d..55d993b 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"
@@ -1,35 +1,24 @@
锘縰sing LogLibrary.Log;
using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
-using MimeKit;
using Newtonsoft.Json;
-using OfficeOpenXml.FormulaParsing.Excel.Functions.DateTime;
-using Org.BouncyCastle.Tls;
-using System;
using System.Net;
using System.Net.Sockets;
using System.Reflection;
using System.Text;
using WIDESEA_Common;
using WIDESEA_Core;
-using WIDESEA_Core.BaseServices;
using WIDESEA_Core.Enums;
using WIDESEA_Core.Helper;
-using WIDESEA_Core.Middlewares;
using WIDESEA_DTO.AGV;
using WIDESEA_DTO;
-using WIDESEA_IServices;
using WIDESEA_IStorageBasicRepository;
using WIDESEA_IStorageSocketServices;
using WIDESEA_IStorageTaskRepository;
-using WIDESEA_IStorageTaskServices;
using WIDESEA_Model.Models.AGV;
using WIDESEA_Model.Models;
using WIDESEAWCS_BasicInfoRepository;
-//using static MailKit.Telemetry;
using WIDESEAWCS_Model.Models;
-using static Microsoft.EntityFrameworkCore.DbLoggerCategory.Database;
using WIDESEA_Core.BaseRepository;
using AutoMapper;
using Mapster;
@@ -58,8 +47,8 @@
public SocketClientService(/*IDt_TaskService taskService*/IDt_TaskRepository TaskRepository, IDt_StationManagerRepository stationManagerRepository, ILogger<SocketClientService> logger)
{
//_taskService = taskService;
- BaseDal= TaskRepository;
- _stationManagerRepository= stationManagerRepository;
+ BaseDal = TaskRepository;
+ _stationManagerRepository = stationManagerRepository;
_logger = logger;
}
@@ -153,7 +142,7 @@
}
else
{
- LogFactory.GetLog("Socket鎺ユ敹鏁版嵁").Error(true, "鏃犳晥鎶ユ枃鏍煎紡");
+ LogFactory.GetLog("Socket鎺ユ敹鏁版嵁").Error(true, "鏃犳晥鎶ユ枃鏍煎紡");
}
}
catch
@@ -172,7 +161,7 @@
ReceiveCommandResponse(x);
break;
case "906":
- AGVJobStartOrEndResponse(x.Substring(21, 1),x.Substring(22,1));
+ AGVJobStartOrEndResponse(x.Substring(21, 1), x.Substring(22, 1));
break;
case "902":
DataReportResponse(x.Substring(21, 1));
@@ -249,7 +238,7 @@
int sum = 0;
try
{
- for (int i = 0; i < x.Length-2; i++)
+ for (int i = 0; i < x.Length - 2; i++)
{
sum += x[i];
}
@@ -626,12 +615,24 @@
{
//OK
case "0":
- //UpdateTaskLocation(parseMessage);
- InsertWMSTask(parseMessage);
- Thread.Sleep(500);
- //915
- JobReady("0");
- break;
+ var location = _locationRepository.QueryFirst(x => x.LocationCode == parseMessage.body.ToLocation);
+ if (location == null)
+ {
+ return;
+ }
+ if (location.LocationStatus == (int)LocationEnum.Free)
+ {
+ InsertWMSTask(parseMessage);
+ Thread.Sleep(500);
+ //915
+ JobReady("0");
+ return;
+ }
+ else
+ {
+ //todo璐т綅鏈夎揣閲嶅鍏ュ簱
+ return;
+ }
//NG
case "1":
break;
@@ -696,7 +697,7 @@
{
JobStartOrEnd("E", task.SourceAddress, task.TargetAddress, "O", task.PalletCode);
}
- CompleteInboundTask(task);
+ CompleteInboundTask(task);
break;
case (int)TaskOutboundTypeEnum.Outbound:
//鍑哄簱
@@ -742,15 +743,29 @@
{
//OK
case "0":
- var task = InsertWMSTask(parseMessage);
- BaseDal.AddData(task);
- InsertAGVTask(task);
- Thread.Sleep(500);
- //915
- JobReady("0");
- Thread.Sleep(500);
- //104
- DeviceReceiveJobResponse("0");
+ var location = _locationRepository.QueryFirst(x => x.LocationCode == parseMessage.body.ToLocation);
+ if (location == null)
+ {
+ return;
+ }
+ if (location.LocationStatus == (int)LocationEnum.InStock)
+ {
+ var task = InsertWMSTask(parseMessage);
+ BaseDal.AddData(task);
+ InsertAGVTask(task);
+ Thread.Sleep(500);
+ //915
+ JobReady("0");
+ Thread.Sleep(500);
+ //104
+ DeviceReceiveJobResponse("0");
+ }
+ else
+ {
+ //todo璐т綅鏃犺揣绌哄嚭搴�
+ return;
+ }
+
break;
default:
break;
@@ -792,7 +807,7 @@
var taskStation = BaseDal.QueryFirst(x => x.SourceAddress == item.stationName || x.TargetAddress == item.stationName);
outStationStatus.Add(new OutStationStatus()
{
- StationName = item.stationName,
+ StationName = item.HostName,
StationEnable = station.StationEnable == "1" ? "0" : "1",
IsDistributionTask = taskStation == null ? "0" : "1",
Spare1 = "00"
@@ -875,11 +890,13 @@
/// </summary>
public void DeviceStatusReportRequest()
{
+ AGVStatusRespone status = GetAGVStatus();
+
HOSTAGVStatus AgvStatus = new HOSTAGVStatus()
{
- RuntimeStatus = "R",
- AutoStatus = "1",
- Ready = "1"
+ RuntimeStatus = CapitalizeFirstLetter(status.RuntimeStatus),
+ AutoStatus = status.AutoStatus == "MaintenanceMode" ? "1" : "0",
+ Ready = status.AutoStatus == "MaintenanceMode" ? "0" : "1",
};
string axis = "000000";
DeviceStatusReportResponse(AgvStatus, axis, axis);
@@ -1117,8 +1134,8 @@
{
d_task_type = task.TaskType == (int)TaskTypeEnum.Inbound ? 1 : 2,
d_floor = 1,
- d_involed1 = task.SourceAddress,
- d_involed2 = task.TargetAddress,
+ d_involed1 = InsertHyphenEveryTwoChars(task.SourceAddress),
+ d_involed2 = InsertHyphenEveryTwoChars(task.TargetAddress),
d_involed5 = task.TaskNum,
};
@@ -1156,7 +1173,7 @@
public StationStatus GetStationStatus(string stationName)
{
- string urlnew = url + "/ilns/strl/getStat";
+ string urlnew = url + "/ilns/strl/getState";
var result = HttpsClient.PostAsync(urlnew, JsonConvert.DeserializeObject<Dictionary<string, object>>(new { strlName = stationName }.ToJson())).Result;
return JsonConvert.DeserializeObject<StationStatus>(result.ToString());
}
@@ -1170,7 +1187,29 @@
char firstChar = s[0];
return char.ToUpper(firstChar).ToString();
}
+ public string InsertHyphenEveryTwoChars(string input)
+ {
+ if (string.IsNullOrEmpty(input))
+ {
+ return input;
+ }
+ StringBuilder result = new StringBuilder();
+
+ for (int i = 0; i < input.Length; i += 2)
+ {
+ // 娣诲姞涓や釜瀛楃
+ result.Append(input.Substring(i, 2));
+
+ // 濡傛灉涓嶆槸鏈�鍚庝袱涓瓧绗︼紝娣诲姞涓�涓繛瀛楃
+ if (i + 2 < input.Length)
+ {
+ result.Append('-');
+ }
+ }
+
+ return result.ToString();
+ }
#region 澶栭儴鎺ュ彛鏂规硶
public WebResponseContent CompleteInboundTask(Dt_Task task)
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 8940f04..af192ac 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"
@@ -65,5 +65,11 @@
{
return _service.DeviceErrorResponse(Message,TaskNum);
}
+
+ //[HttpGet, HttpPost, Route("Add"), AllowAnonymous]
+ //public WebResponseContent Add()
+ //{
+ // return _service.Add();
+ //}
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json"
index 7010500..1647845 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json"
@@ -9,12 +9,13 @@
"urls": "http://*:5000",
"MainDB": "DB_WIDESEA", //褰撳墠椤圭洰鐨勪富搴擄紝鎵�瀵瑰簲鐨勮繛鎺ュ瓧绗︿覆鐨凟nabled蹇呴』涓簍ruedata
"ConnectionStringsEncryption": false,
- "DBType": "MySql",
+ //"DBType": "MySql",
+ "DBType": "SqlServer",
//杩炴帴瀛楃涓�
//"ConnectionString": "HTI6FB1H05Krd07mNm9yBCNhofW6edA5zLs9TY~MNthRYW3kn0qKbMIsGp~3yyPDF1YZUCPBQx8U0Jfk4PH~ajNFXVIwlH85M3F~v_qKYQ3CeAz3q1mLVDn8O5uWt1~3Ut2V3KRkEwYHvW2oMDN~QIDXPxDgXN0R2oTIhc9dNu7QNaLEknblqmHhjaNSSpERdDVZIgHnMKejU_SL49tralBkZmDNi0hmkbL~837j1NWe37u9fJKmv91QPb~16JsuI9uu0EvNZ06g6PuZfOSAeFH9GMMIZiketdcJG3tHelo=",
"ConnectionString": "Data Source=127.0.0.1;Initial Catalog=WIDESEA_WMSLG;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
- //"ConnectionStringAGV": "Data Source=127.0.0.1;Initial Catalog=WIDESEA_WCSDB;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
- "ConnectionStringAGV": "Server=127.0.0.1;Database=makerwit382;Uid=root;Pwd=makerwitc;",
+ //"ConnectionStringAGV": "Server=127.0.0.1;Database=makerwit382;Uid=root;Pwd=makerwitc;",
+ "ConnectionStringAGV": "Server=127.0.0.1;Database=makerwit382;Uid=root;Pwd=P@ssw0rd;",
//璺ㄥ煙
"Cors": {
"PolicyName": "CorsIpAccess", //绛栫暐鍚嶇О
@@ -45,5 +46,5 @@
"IP": "127.0.0.1",
"Port": "1314"
},
- "AGVIP": "127.0.0.1:8080"
+ "AGVIP": "127.0.0.1:8370"
}
--
Gitblit v1.9.3