From 526b70eecc5dac5aea91bfffbe0b98118f25827f Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期一, 23 六月 2025 09:01:01 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/ReceiveOrderController.cs | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/ReceiveOrderController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/ReceiveOrderController.cs"
index d1d1f4d..8dfca1b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/ReceiveOrderController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/ReceiveOrderController.cs"
@@ -1,4 +1,5 @@
-锘縰sing Microsoft.AspNetCore.Http;
+锘縰sing Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using WIDESEA_Core;
using WIDESEA_Core.BaseController;
@@ -7,6 +8,9 @@
namespace WIDESEA_WMSServer.Controllers.Inbound
{
+ /// <summary>
+ /// 鏀惰揣鍗�
+ /// </summary>
[Route("api/[controller]")]
[ApiController]
public class ReceiveOrderController : ApiBaseController<IReceiveOrderService, Dt_ReceiveOrder>
@@ -18,7 +22,7 @@
/// <summary>
/// 鏍规嵁鏀惰揣鍗曞垱寤哄叆搴撳崟
/// </summary>
- /// <param name="receiveOrderId"></param>
+ /// <param name="receiveOrderId">鏀惰揣鍗曠紪鍙�</param>
/// <returns></returns>
[HttpPost, HttpGet, Route("CreateInboundOrder")]
public WebResponseContent CreateInboundOrder(int receiveOrderId)
@@ -41,9 +45,21 @@
/// </summary>
/// <returns></returns>
[HttpPost, HttpGet, Route("GetReceiveOrders")]
- public WebResponseContent GetReceiveOrders([FromBody]SaveModel saveModel)
+ public WebResponseContent GetReceiveOrders([FromBody] SaveModel saveModel)
{
return Service.GetReceiveOrders(saveModel);
}
+
+ /// <summary>
+ /// 鏀惰揣 娴嬭瘯
+ /// </summary>
+ /// <param name="purchaseOrderId"></param>
+ /// <param name="lotNo"></param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("ReceiveAllOrder")]
+ public WebResponseContent ReceiveAllOrder(int purchaseOrderId, string lotNo)
+ {
+ return Service.ReceiveAllOrder(purchaseOrderId, lotNo);
+ }
}
}
--
Gitblit v1.9.3