From 673b5a596f611099eaacc310f6e7def0e022daca Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期三, 29 四月 2026 11:00:55 +0800
Subject: [PATCH] 添加盘点模板和胶箱台账功能
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs | 96 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 88 insertions(+), 8 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 012dc97..70f0e54 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,4 +1,5 @@
-锘縰sing MailKit.Search;
+锘縰sing Magicodes.ExporterAndImporter.Excel.Utility;
+using MailKit.Search;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
@@ -9,6 +10,7 @@
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;
@@ -56,14 +58,21 @@
}
[HttpPost, Route("PalletOutboundTask"), AllowAnonymous, MethodParamsValidate]
- public async Task<WebResponseContent> PalletOutboundTask(string endStation, string palletCode = "")
+ public async Task<WebResponseContent> PalletOutboundTask(int num, int locationType, string? supplierCode = null)
{
-
- var result = await Service.PalletOutboundTask(endStation, palletCode);
-
- return result;
+ return await Service.PalletOutboundTask(num, locationType, supplierCode);
}
+ /// <summary>
+ /// 渚涘簲鍟嗗疄鏃舵悳绱�
+ /// </summary>
+ /// <param name="keyword"></param>
+ /// <returns></returns>
+ [HttpGet("SearchSupplierCode")]
+ public async Task<WebResponseContent> SearchSupplierCode(string keyword)
+ {
+ return await Service.SearchSupplierCode(keyword);
+ }
/// <summary>
/// 鐢熸垚鍑哄簱浠诲姟
@@ -83,10 +92,81 @@
/// <param name="stockSelectViews"></param>
/// <returns></returns>
[HttpPost, HttpGet, Route("GenerateOutboundTask"), AllowAnonymous]
- public WebResponseContent GenerateOutboundTask(int orderDetailId, [FromBody] List<StockSelectViewDTO> stockSelectViews)
+ public async Task<WebResponseContent> GenerateOutboundTask(int orderDetailId, string station, [FromBody] List<StockSelectViewDTO> stockSelectViews)
{
- return Service.GenerateOutboundTask(orderDetailId, 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);
+ }
+
+ [HttpPost("BatchOutboundByExcel")]
+ public async Task<WebResponseContent> BatchOutboundByExcel(IFormFile file, string outStation)
+ {
+ return await Service.BatchOutboundByExcel(file, outStation);
+ }
}
}
--
Gitblit v1.9.3