From 8ae1a147aefadbb255edde088e7c12535c5f02d4 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期三, 08 十月 2025 20:35:51 +0800
Subject: [PATCH] 完善输送线和堆垛机任务处理逻辑在CommonConveyorLine_NewCW.cs`中添加版本注释和设备属性定义,增强设备连接状态检查与命令发送逻辑。 修改 CommonConveyorLine_GWJob.cs`的任务查询逻辑,确保在特定条件下不下发新任务。在CommonConveyorLine_NewCWJob.cs中实现请求入库和出库的处理逻辑,确保任务状态更新。在 RequestInbound.cs中添加出库任务和新任务的处理逻辑,增强异常处理。 在CommonStackerCrane_NewCWJob.cs中实现堆垛机任务完成事件的处理,确保状态更新和前端通知。新增设备型号修改相关常量和 DTO 类,更新服务接口和实现逻辑,确保设备型号修改请求的正确处理。修改 Dt_TaskService.cs中的任务处理逻辑,确保出库任务的库存判断和状态更新。
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/MCS/MCSController.cs | 39 +++++++++++++++++++++++++++++++++------
1 files changed, 33 insertions(+), 6 deletions(-)
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/MCS/MCSController.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/MCS/MCSController.cs
index acf1877..eee0b1a 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/MCS/MCSController.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/MCS/MCSController.cs
@@ -1,5 +1,7 @@
-锘縰sing Microsoft.AspNetCore.Http;
+锘縰sing AutoMapper.Configuration.Annotations;
+using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
+using WIDESEA_Core.BaseController;
using WIDESEA_DTO;
using WIDESEA_IStoragIntegrationServices;
@@ -10,28 +12,53 @@
public class MCSController : Controller
{
private readonly IMCSService _MCSService;
+ private readonly IHttpContextAccessor _httpContextAccessor;
- public MCSController(IMCSService MCSService) { _MCSService = MCSService; }
+ public MCSController(IMCSService MCSService, IHttpContextAccessor httpContextAccessor)
+ {
+ _httpContextAccessor = httpContextAccessor;
+ _MCSService = MCSService;
+ }
- [HttpPost("NotifyFinishTest")]
+ /// <summary>
+ /// 鍒嗗娴嬭瘯瀹屾垚閫氱煡
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost, Route("NotifyFinishTest"), AllowAnonymous]
public WebResponseContent NotifyFinishTest([FromBody] object input)
{
return _MCSService.NotifyFinishTest(input);
}
- [HttpPost("RequestChangeLocation")]
+ /// <summary>
+ /// 璇锋眰绉诲簱
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost, Route("RequestChangeLocation"), AllowAnonymous]
public WebResponseContent RequestChangeLocation([FromBody] object input)
{
return _MCSService.RequestChangeLocation(input);
}
- [HttpPost("ModifyAccessStatus")]
+ /// <summary>
+ /// 鍒嗗搴撲綅鍚屾
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost, Route("ModifyAccessStatus"), AllowAnonymous]
public WebResponseContent ModifyAccessStatus([FromBody] object input)
{
return _MCSService.ModifyAccessStatus(input);
}
- [HttpPost("RequestCellInfo")]
+ /// <summary>
+ /// 鍒嗗鑾峰彇搴撲綅鎵樼洏
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost, Route("RequestCellInfo"), AllowAnonymous]
public object RequsetCellInfo([FromBody] object input)
{
return _MCSService.RequsetCellInfo(input);
--
Gitblit v1.9.3