From 426848306ad9233db96e4b3fc68a881c15f0b0b0 Mon Sep 17 00:00:00 2001 From: huanghongfeng <huanghongfeng@hnkhzn.com> Date: 星期五, 22 十一月 2024 13:43:53 +0800 Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/JianShanLiKu --- 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs | 39 +++++++++++++++++++++++++++++---------- 1 files changed, 29 insertions(+), 10 deletions(-) diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs" index 2845e7f..7644186 100644 --- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs" +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs" @@ -64,28 +64,47 @@ return Service.GenerateInventoryInformation(generate); } - [HttpPost, Route("ManualOutbound"), AllowAnonymous] + [HttpPost, Route("ManualOutbound"), AllowAnonymous] public WebResponseContent ManualOutbound([FromBody] SaveModel saveModel) { return Service.ManualOutbound(saveModel); } - - [HttpGet, Route("Empty_outbound"), AllowAnonymous] - public WebResponseContent Empty_outbound(string SourceAddress) + [HttpPost, Route("ManualOutbound2"), AllowAnonymous] + public WebResponseContent ManualOutbound2([FromBody] SaveModel saveModel) { - return Service.Empty_outbound(SourceAddress); + return Service.ManualOutbound2(saveModel); + } + [HttpPost, Route("ManualOutboundDeleteinventory"), AllowAnonymous] + public WebResponseContent ManualOutboundDeleteinventory([FromBody] SaveModel saveModel) + { + return Service.ManualOutboundDeleteinventory(saveModel); + } + [HttpPost, Route("Empty_outbound"), AllowAnonymous] + public WebResponseContent Empty_outbound([FromBody] GenerateInv generate) + { + return Service.Empty_outbound(generate); } [HttpPost, Route("Queryinventory"), AllowAnonymous] - public WebResponseContent Queryinventory(string palletCode) + public WebResponseContent Queryinventory([FromBody] GenerateInv generate) { - return Service.Queryinventory(palletCode); + return Service.Queryinventory(generate); } - [HttpGet, Route("RelocationTaskCompleted"), AllowAnonymous] - public WebResponseContent RelocationTaskCompleted(string PalletCode, string SourceAddress, string TargetAddress) + [HttpPost, Route("RelocationTaskCompleted"), AllowAnonymous] + public WebResponseContent RelocationTaskCompleted([FromBody] GenerateInv2 generate) { - return Service.RelocationTaskCompleted(PalletCode, SourceAddress, TargetAddress); + return Service.RelocationTaskCompleted(generate); } + [HttpPost, Route("Rawmaterialout"), AllowAnonymous] + public WebResponseContent Rawmaterialout([FromBody]GenerateInv3 generate) + { + return Service.Rawmaterialout(generate); + } + [HttpGet, Route("Cancelinventory"), AllowAnonymous] + public WebResponseContent Cancelinventory(int taskNum) + { + return Service.Cancelinventory(taskNum); + } } } -- Gitblit v1.9.3