From f4c8d54b4313132863df8fb9f2c5087ea6ba44a6 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期四, 26 六月 2025 09:15:06 +0800
Subject: [PATCH] 1
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/AGVController.cs | 56 +++++++++++++++++---------------------------------------
1 files changed, 17 insertions(+), 39 deletions(-)
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 efda1b9..5511010 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"
@@ -2,6 +2,7 @@
using NewLife.Net;
using WIDESEA_DTO.AGV;
using WIDESEA_IStoragIntegrationServices;
+using WIDESEA_StorageSocketServices;
namespace WIDESEA_WMSServer.Controllers
{
@@ -27,9 +28,9 @@
/// <param name="SourceAddress"></param>
/// <returns></returns>
[HttpGet, HttpPost, Route("RequestInTask"), AllowAnonymous]
- public WebResponseContent RequestInTask(string PalletCode, string SourceAddress)
+ public WebResponseContent RequestInTask([FromBody] AGVDTO aGVDTO)
{
- return _service.RequestInTask(PalletCode, SourceAddress);
+ return _service.RequestInTask(aGVDTO);
}
/// <summary>
@@ -38,7 +39,7 @@
/// <param name="Status"></param>
/// <returns></returns>
[HttpGet, HttpPost, Route("ReceiveAGVRuntimeStatus"), AllowAnonymous]
- public WebResponseContent ReceiveAGVRuntimeStatus(AGVStatus Status)
+ public WebResponseContent ReceiveAGVRuntimeStatus([FromBody] AGVStatus Status)
{
return _service.ReceiveAGVRuntimeStatus(Status);
}
@@ -50,22 +51,10 @@
/// <param name="TaskNum"></param>
/// <returns></returns>
[HttpGet, HttpPost, Route("AGVStartOrEndJob"), AllowAnonymous]
- public WebResponseContent AGVStartOrEndJob(string Status, int TaskNum)
+ public WebResponseContent AGVStartOrEndJob([FromBody] AGVDTO aGVDTO)
{
- return _service.AGVStartOrEndJob(Status, TaskNum);
+ return _service.AGVStartOrEndJob(aGVDTO);
}
-
- ///// <summary>
- ///// AGV鍙栬揣鎴栨斁璐�
- ///// </summary>
- ///// <param name="Message"></param>
- ///// <param name="PallteCode"></param>
- ///// <returns></returns>
- //[HttpGet, Route("PallteLoadOrUnLoad"), AllowAnonymous]
- //public WebResponseContent PallteLoadOrUnLoad(string Message, string PallteCode)
- //{
- // return _taskService.PallteLoadOrUnLoad(Message,PallteCode);
- //}
/// <summary>
/// 璁惧鐘舵�佷笂鎶�
@@ -74,32 +63,21 @@
/// <param name="PallteCode"></param>
/// <returns></returns>
[HttpGet, HttpPost, Route("DeviceErrorResponse"), AllowAnonymous]
- public WebResponseContent DeviceErrorResponse(string Message, int TaskNum)
+ public WebResponseContent DeviceErrorResponse([FromBody] AGVDTO aGVDTO)
{
- return _service.DeviceErrorResponse(Message, TaskNum);
+ return _service.DeviceErrorResponse(aGVDTO);
}
- [HttpGet, HttpPost, Route("RequestOutTask"), AllowAnonymous]
- public WebResponseContent RequestOutTask(string PalletCode, string SourceAddress, string TargetAddress)
+ /// <summary>
+ /// 璁惧寮傚父涓婃姤
+ /// </summary>
+ /// <param name="Message"></param>
+ /// <param name="PallteCode"></param>
+ /// <returns></returns>
+ [HttpGet, HttpPost, Route("DeviceWarning"), AllowAnonymous]
+ public WebResponseContent DeviceWarning([FromBody] AGVDTO DTO)
{
- return _service.RequestOutTask(PalletCode, SourceAddress, TargetAddress);
- }
-
- [HttpGet, HttpPost, 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);
+ return _service.DeviceWarning(DTO);
}
}
}
--
Gitblit v1.9.3