From 46908c0f79e7aab8a3fa41bfdcd8390bbc3659f2 Mon Sep 17 00:00:00 2001
From: xiazhengtongxue <133085197+xiazhengtongxue@users.noreply.github.com>
Date: 星期日, 04 一月 2026 11:48:15 +0800
Subject: [PATCH] 完善前端二期播种墙初始化和任务完成按钮，后端定期删除日志
---
项目代码/WCSServices/WIDESEAWCS_Server/Controllers/Task/TaskController.cs | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_Server/Controllers/Task/TaskController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_Server/Controllers/Task/TaskController.cs"
index f34f16d..6f16b36 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_Server/Controllers/Task/TaskController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_Server/Controllers/Task/TaskController.cs"
@@ -3,6 +3,7 @@
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using System.Text;
+using WIDESEA_External.Model;
using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseController;
@@ -33,7 +34,7 @@
}
[HttpPost, Route("ReceiveTask"), AllowAnonymous]
- public WebResponseContent ReceiveWMSTask([FromBody] WMSTaskDTO taskDTO)
+ public WMSReceiveTaskContent ReceiveWMSTask([FromBody] WMSTaskDTO taskDTO)
{
return Service.ReceiveWMSTask(taskDTO);
}
@@ -81,11 +82,11 @@
byte[] bytesPick = commonConveyorLine.Communicator.Read("2", 5);
string PickBarCode = Encoding.UTF8.GetString(bytesPick).Replace("\0", "").Replace("\\0", "");
if (containerFlowDTO.ContainerCode != PickBarCode) throw new Exception($"浼犲叆鏂欑鐮亄containerFlowDTO.ContainerCode}锛岃緭閫佹枡绠辩爜{PickBarCode}鏁版嵁閿欒");
- if (containerFlowDTO.Direction == "100")
- {
- WebResponseContent responseContent = Service.ContainerFlow(containerFlowDTO, stationManger.StationDeviceCode, stationManger.PickStationCode);
- if (!responseContent.Status) throw new Exception(responseContent.Message);
- }
+ //if (containerFlowDTO.Direction == "100")
+ //{
+ // WebResponseContent responseContent = Service.ContainerFlow(containerFlowDTO, stationManger.StationDeviceCode, stationManger.PickStationCode);
+ // if (!responseContent.Status) throw new Exception(responseContent.Message);
+ //}
commonConveyorLine.Communicator.Write("22", (containerFlowDTO.Direction == "100" ? new byte[] { 1, 0 } : new byte[] { 2, 0 }));
}
else
@@ -115,7 +116,7 @@
/// <returns></returns>
[HttpPost, HttpGet, Route("InitLight"), AllowAnonymous]
public WebResponseContent InitLight()
- {
+ {
return Service.InitLight();
}
/// <summary>
@@ -164,12 +165,23 @@
/// <summary>
/// WMS浠诲姟鍙栨秷鍚屾
/// </summary>
- /// <param name="taskNum"></param>
+ /// <param name="taskCancels"></param>
/// <returns></returns>
[HttpPost, HttpGet, Route("CancelTask"), AllowAnonymous]
- public WebResponseContent CancelTask(List<TaskCancel> taskCancels)
+ public WebResponseContent CancelTask([FromBody] List<TaskCancel> taskCancels)
{
return WebResponseContent.Instance.Error();
}
+
+ /// <summary>
+ /// 鎶婁换鍔″紓甯�900淇敼涓篈GV鎵ц涓�300
+ /// </summary>
+ /// <param name="taskNum"></param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("ResetAllExceptionTask"), AllowAnonymous]
+ public WebResponseContent ResetAllExceptionTask(int taskNum)
+ {
+ return Service.ResetAllExceptionTask(taskNum);
+ }
}
}
--
Gitblit v1.9.3