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

wangxinhui

昨天 526b70eecc5dac5aea91bfffbe0b98118f25827f

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

@@ -30,6 +30,29 @@
        }

        /// <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>
        /// WMS入平库
        /// </summary>
        /// <param name="warehouseId"></param>
        /// <param name="serNums"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("WMSInPinKu")]
        public WebResponseContent WMSInPinKu(int warehouseId, [FromBody] List<string> serNums)
        {
            return Service.WMSInPinKu(warehouseId, serNums);
        }
        /// <summary>
        /// å•ä¸ªç‰©æ–™ç ç»„盘
        /// </summary>
        /// <param name="inboundOrderId"></param>
@@ -42,13 +65,10 @@
            return Service.MaterielGroup(inboundOrderId, palletCode, serNum);
        }

        /// <summary>
        /// å¤šä¸ªç‰©æ–™ç ç»„盘
        /// </summary>
        /// <param name="inboundOrderId"></param>
        /// <param name="palletCode"></param>
        /// <param name="serNums"></param>
        /// <returns></returns>
        // <summary>
        // å¤šä¸ªç‰©æ–™ç ç»„盘
        // </summary>
        // <returns></returns>
        //[HttpPost, HttpGet, Route("MaterielGroup")]
        //public WebResponseContent MaterielGroup(int inboundOrderId, string palletCode, List<string> serNums)
        //{
@@ -64,18 +84,35 @@
        {
            return Service.MaterielGroup(saveModel);
        }

        /// <summary>
        /// å…¥åº“完成后回传ERP
        /// æ›´æ®å…¥åº“单号ID上传ERP
        /// </summary>
        /// <param name="id"></param>
        /// <param name="inboundOrderId">入库单号Id</param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("FeedbackInboundOrder")]
        public WebResponseContent FeedbackInboundOrder(int inboundOrderId)
        {
            return Service.FeedbackInboundOrder(inboundOrderId);
        }
        ///// <summary>
        ///// å…¥åº“完成后回传ERP
        ///// </summary>
        ///// <param name="id"></param>
        ///// <returns></returns>
        //[HttpPost, HttpGet, Route("FeedbackInboundOrder")]
        //public WebResponseContent FeedbackInboundOrder(int id)
        //{
        //    return Service.FeedbackInboundOrder(id);
        //}

        /// <summary>
        /// æ— å…¥åº“单组盘
        /// </summary>
        /// <param name="palletCode"></param>
        /// <param name="initiallife"></param>
        /// <param name="warehouseId"></param>
        /// <param name="serNums"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("ManualMaterielGroup")]
        public WebResponseContent MaterielGroup(string palletCode, int initiallife, int warehouseId, [FromBody] List<string> serNums)
        {