From be484c84a25d1f6c769e7b5e958048d745942e55 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期二, 20 五月 2025 10:32:57 +0800
Subject: [PATCH] 优化出入库逻辑
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Interface/WCSInterfaceController.cs | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 53 insertions(+), 3 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Interface/WCSInterfaceController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Interface/WCSInterfaceController.cs"
index c81c761..b23d75f 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Interface/WCSInterfaceController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Interface/WCSInterfaceController.cs"
@@ -2,6 +2,9 @@
using Microsoft.AspNetCore.Mvc;
using WIDESEA_Core;
using WIDESEA_IBasicService;
+using WIDESEA_ITaskInfoService;
+using WIDESEA_Model.Models;
+using WIDESEAWCS_DTO.WCSInfo;
namespace WIDESEA_WMSServer.Controllers
{
@@ -10,14 +13,61 @@
public class WCSInterfaceController : Controller
{
private readonly ILocationInfoService _locationInfoService;
- public WCSInterfaceController(ILocationInfoService locationInfoService)
+ private readonly ITaskService _taskService;
+ public WCSInterfaceController(ILocationInfoService locationInfoService, ITaskService taskService)
{
_locationInfoService = locationInfoService;
+ _taskService = taskService;
}
+ /// <summary>
+ /// 鑾峰彇绌挎杞︽斁浣嶇疆
+ /// </summary>
+ /// <param name="position"></param>
+ /// <returns></returns>
[HttpPost, Route("GetPosition")]
- public WebResponseContent GetPosition(string position)
+ public WebResponseContent GetPosition(string position, string position1)
{
- return _locationInfoService.GetPosition(position);
+ return _locationInfoService.GetPosition(position, position1);
+ }
+ /// <summary>
+ /// 淇敼浠诲姟鐘舵��
+ /// </summary>
+ /// <param name="task"></param>
+ /// <returns></returns>
+ [HttpPost, Route("UpdateTaskStatus")]
+ public WebResponseContent UpdateTaskStatus([FromBody] WMSTaskDTO task)
+ {
+ return _taskService.UpdateTaskStatus(task);
+ }
+ /// <summary>
+ /// 杈撻�佺嚎鐢宠鍏ュ簱
+ /// </summary>
+ /// <param name="task"></param>
+ /// <returns></returns>
+ [HttpPost, Route("ConveyorLineRequestInbound")]
+ public WebResponseContent ConveyorLineRequestInbound([FromBody] ConveyorLineDTO lineDTO)
+ {
+ return _taskService.ConveyorLineRequestInbound(lineDTO);
+ }
+ /// <summary>
+ /// 鍫嗗灈鏈虹敵璇峰叆搴�
+ /// </summary>
+ /// <param name="task"></param>
+ /// <returns></returns>
+ [HttpPost, Route("StackerCraneRequestInbound")]
+ public WebResponseContent StackerCraneRequestInbound([FromBody] ConveyorLineDTO lineDTO)
+ {
+ return _taskService.StackerCraneRequestInbound(lineDTO);
+ }
+ /// <summary>
+ /// AGV鍙栨秷浠诲姟
+ /// </summary>
+ /// <param name="task"></param>
+ /// <returns></returns>
+ [HttpPost, Route("CancelTask")]
+ public WebResponseContent CancelTask([FromBody] WMSTaskDTO task)
+ {
+ return _taskService.CancelTask(task);
}
}
}
--
Gitblit v1.9.3