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/InboundOrderController.cs

@@ -9,6 +9,9 @@

namespace WIDESEA_WMSServer.Controllers.Inbound
{
    /// <summary>
    /// å…¥åº“单
    /// </summary>
    [Route("api/InboundOrder")]
    [ApiController]
    public class InboundOrderController : ApiBaseController<IInboundOrderService, Dt_InboundOrder>
@@ -27,13 +30,25 @@
        }

        /// <summary>
        /// å…¥å¹³åº“
        /// </summary>
        /// <param name="orderNo"></param>
        /// <param name="warehouseId"></param>
        /// <param name="serNums"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("InPinKu")]
        public WebResponseContent InPinKu(string orderNo, int warehouseId, [FromBody] List<string> serNums)
        {
            return Service.InPinKu(orderNo, warehouseId, serNums);
        }
        /// <summary>
        /// å•ä¸ªç‰©æ–™ç ç»„盘
        /// </summary>
        /// <param name="inboundOrderId"></param>
        /// <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);
@@ -62,15 +77,29 @@
            return Service.MaterielGroup(saveModel);
        }

        ///// <summary>
        ///// å…¥åº“完成后回传ERP
        ///// </summary>
        ///// <param name="id"></param>
        ///// <returns></returns>
        //[HttpPost, HttpGet, Route("FeedbackInboundOrder")]
        //public WebResponseContent FeedbackInboundOrder(int id)
        //{
        //    return Service.FeedbackInboundOrder(id);
        //}

        /// <summary>
        /// å…¥åº“完成后回传ERP
        /// æ— å…¥åº“单组盘
        /// </summary>
        /// <param name="id"></param>
        /// <param name="palletCode"></param>
        /// <param name="initiallife"></param>
        /// <param name="warehouseId"></param>
        /// <param name="serNums"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("FeedbackInboundOrder"),AllowAnonymous]
        public WebResponseContent FeedbackInboundOrder(int 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);
        }
    }
}