From 59c8d02d2bc7c7d9651edbd755ad73e4e7843ed8 Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期四, 09 一月 2025 09:32:05 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs"
index 2aeafe8..5109a00 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs"
@@ -9,6 +9,9 @@
namespace WIDESEA_WMSServer.Controllers.Inbound
{
+ /// <summary>
+ /// 鍏ュ簱鍗�
+ /// </summary>
[Route("api/InboundOrder")]
[ApiController]
public class InboundOrderController : ApiBaseController<IInboundOrderService, Dt_InboundOrder>
@@ -33,7 +36,7 @@
/// <param name="palletCode"></param>
/// <param name="serNum"></param>
/// <returns></returns>
- [HttpPost, HttpGet, Route("MaterielGroupSingle"),AllowAnonymous]
+ [HttpPost, HttpGet, Route("MaterielGroupSingle")]
public WebResponseContent MaterielGroup(int inboundOrderId, string palletCode, string serNum)
{
return Service.MaterielGroup(inboundOrderId, palletCode, serNum);
@@ -67,10 +70,16 @@
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
- [HttpPost, HttpGet, Route("FeedbackInboundOrder"),AllowAnonymous]
- public WebResponseContent FeedbackInboundOrder(int id)
+ //[HttpPost, HttpGet, Route("FeedbackInboundOrder")]
+ //public WebResponseContent FeedbackInboundOrder(int id)
+ //{
+ // return Service.FeedbackInboundOrder(id);
+ //}
+
+ [HttpPost, HttpGet, Route("ManualMaterielGroup")]
+ public WebResponseContent MaterielGroup(string palletCode, int initiallife, int warehouseId, [FromBody] List<string> serNums)
{
- return Service.FeedbackInboundOrder(id);
+ return Service.MaterielGroup(palletCode, initiallife, warehouseId, serNums);
}
}
}
--
Gitblit v1.9.3