From 696edbff3c8812e4b820f624d66a02ae6ddb1a06 Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期四, 16 四月 2026 13:40:18 +0800
Subject: [PATCH] Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu into htq20251215
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs | 131 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 130 insertions(+), 1 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs"
index dcc27d0..68dcacb 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs"
@@ -1,9 +1,15 @@
-锘縰sing Microsoft.AspNetCore.Authorization;
+锘縰sing MailKit.Search;
+using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
+using System.Diagnostics;
+using System.Threading.Tasks;
using WIDESEA_Common.CommonEnum;
+using WIDESEA_Common.TaskEnum;
using WIDESEA_Core;
+using WIDESEA_Core.Attributes;
using WIDESEA_Core.BaseController;
+using WIDESEA_DTO.Basic;
using WIDESEA_DTO.Stock;
using WIDESEA_DTO.Task;
using WIDESEA_ITaskInfoService;
@@ -22,5 +28,128 @@
{
}
+ [HttpPost, Route("AddTestTask"), AllowAnonymous, MethodParamsValidate]
+ public WebResponseContent AddTest(WMSTaskDTO wMSTaskDTO)
+ {
+ Dt_Task task = new Dt_Task
+ {
+ PalletCode = wMSTaskDTO.PalletCode,
+ PalletType = wMSTaskDTO.PalletType,
+ Roadway = "t",
+ TaskType = wMSTaskDTO.TaskType,
+ TaskStatus = wMSTaskDTO.TaskStatus,
+ SourceAddress = wMSTaskDTO.SourceAddress,
+ TargetAddress = wMSTaskDTO.TargetAddress,
+ CurrentAddress = "t",
+ NextAddress = "t",
+ WarehouseId = wMSTaskDTO.WarehouseId,
+ OrderNo = "testt",
+ Grade = wMSTaskDTO.Grade,
+ Dispatchertime = DateTime.Now,
+
+ };
+
+ Service.AddData(task);
+
+
+
+ return WebResponseContent.Instance.OK();
+ }
+
+ [HttpPost, Route("PalletOutboundTask"), AllowAnonymous, MethodParamsValidate]
+ public async Task<WebResponseContent> PalletOutboundTask(int num, int locationType)
+ {
+ return await Service.PalletOutboundTask(num, locationType);
+ }
+
+
+ /// <summary>
+ /// 鐢熸垚鍑哄簱浠诲姟
+ /// </summary>
+ /// <param name="keys"></param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("GenerateOutboundTasks"), AllowAnonymous]
+ public async Task<WebResponseContent> GenerateOutboundTasks([FromBody] GenerateOutboundTasksDto data)
+ {
+ return await Service.GenerateOutboundTasksAsync(data.taskIds, data.outboundPlatform);
+ }
+
+ /// <summary>
+ /// 鐢熸垚鍑哄簱浠诲姟
+ /// </summary>
+ /// <param name="orderDetailId"></param>
+ /// <param name="stockSelectViews"></param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("GenerateOutboundTask"), AllowAnonymous]
+ public async Task<WebResponseContent> GenerateOutboundTask(int orderDetailId, string station, [FromBody] List<StockSelectViewDTO> stockSelectViews)
+ {
+ return await Service.GenerateOutboundTask(orderDetailId, stockSelectViews, station);
+ }
+
+ /// <summary>
+ /// 鐢熸垚鍑哄簱浠诲姟
+ /// </summary>
+ /// <param name="orderDetailId"></param>
+ /// <param name="stockSelectViews"></param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("GenerateAllocatOutboundTask"), AllowAnonymous]
+ public async Task<WebResponseContent> GenerateAllocatOutboundTask(int orderDetailId, string station, [FromBody] List<StockSelectViewDTO> stockSelectViews)
+ {
+ return await Service.GenerateAllocatOutboundTask(orderDetailId, stockSelectViews,station);
+ }
+
+ /// <summary>
+ /// 鍒嗘壒鐢熸垚鍑哄簱浠诲姟
+ /// </summary>
+ /// <param name="data"></param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("GenerateOutboundBatchTasks"), AllowAnonymous]
+ public async Task<WebResponseContent> GenerateOutboundBatchTasks([FromBody] GenerateOutboundBatchTasksDto data)
+ {
+ return await Service.GenerateOutboundBatchTasksAsync(data.orderDetailId,data.batchQuantity, data.outboundPlatform);
+ }
+
+ /// <summary>
+ /// 鐩樼偣搴撳瓨鍑哄簱
+ /// </summary>
+ /// <param name="stockViews"></param>
+ /// <param name="outStation"></param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("TakeOutbound"), AllowAnonymous]
+ public async Task<WebResponseContent> TakeOutbound([FromBody] List<StockViewDTO> stockViews, string outStation)
+ {
+ return await Service.TakeOutbound(stockViews, outStation);
+ }
+
+ [HttpPost, HttpGet, Route("HandCompleteTask"), AllowAnonymous]
+ public async Task<WebResponseContent> HandCompleteTask(string TaskNum)
+ {
+ return await Service.HandCompleteTask(TaskNum);
+ }
+
+ [HttpPost, Route("TaskCancel"), AllowAnonymous]
+ public async Task<WebResponseContent> TaskCancel(List<int> taskCancel)
+ {
+ return await Service.TaskCancel(taskCancel);
+ }
+
+ /// <summary>
+ /// 鐩樼偣搴撳瓨鍑哄簱
+ /// </summary>
+ /// <param name="stockViews"></param>
+ /// <param name="outStation"></param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("AreaOutbound"), AllowAnonymous]
+ public async Task<WebResponseContent> AreaOutbound([FromBody] List<StockViewDTO> stockViews)
+ {
+ return await Service.AreaOutbound(stockViews);
+ }
+
+
+ [HttpPost, HttpGet, Route("CrossAreaOutbound"), AllowAnonymous]
+ public async Task<WebResponseContent> CrossAreaOutbound([FromBody] List<StockViewDTO> stockViews,int targetLocationType)
+ {
+ return await Service.CrossAreaOutbound(stockViews,targetLocationType);
+ }
}
}
--
Gitblit v1.9.3