Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

hutongqing

2025-01-11 ecd1c9119991888c6ffeac9d1d228d7bce88deb9

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/ReceiveOrderController.cs

@@ -1,4 +1,5 @@
using Microsoft.AspNetCore.Http;
using 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>
@@ -15,10 +19,47 @@
        {
        }

        /// <summary>
        /// æ ¹æ®æ”¶è´§å•åˆ›å»ºå…¥åº“单
        /// </summary>
        /// <param name="receiveOrderId">收货单编号</param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("CreateInboundOrder")]
        public WebResponseContent CreateInboundOrder(int receiveOrderId)
        {
            return Service.CreateInboundOrder(receiveOrderId);
        }

        /// <summary>
        /// æ”¶è´§å®Œæˆå›žä¼ ERP
        /// </summary>
        /// <param name="orderId"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("FeedbackReceiveOrder")]
        public WebResponseContent FeedbackReceiveOrder(int orderId)
        {
            return Service.FeedbackReceiveOrder(orderId);
        }

        /// æŸ¥è¯¢æ”¶è´§å•ä¿¡æ¯
        /// </summary>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("GetReceiveOrders")]
        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);
        }
    }
}