修改人工入库完成和wcs小车问题

yanjinhui

2 天以前 5d756f53f07880dc8b7ba0bc9f060b9e94d4b25e

 н¨Îļþ¼Ð/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/SquareCabin/DeliveryOrderController.cs

@@ -5,6 +5,7 @@
using WIDESEA_Core.BaseController;
using WIDESEA_ISquareCabinServices;
using WIDESEA_Model.Models;
using static WIDESEA_DTO.SquareCabin.OrderDto;

namespace WIDESEA_WMSServer.Controllers
{
@@ -15,24 +16,41 @@
        public DeliveryOrderController(IDeliveryOrderServices service) : base(service)
        {
        }


        [HttpPost,Route("GetUpstreamOutOrder"),AllowAnonymous]
        public WebResponseContent GetUpstreamOutOrder()
        /// <summary>
        /// å®Œæˆå‡ºåº“单
        /// </summary>
        /// <param name="keys"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("FinishOutOrder"),AllowAnonymous]
        public WebResponseContent FinishOutOrder(int key)
        {
            return Service.GetUpstreamOutOrder();
            return Service.FinishOutOrder(key);
        }
        

        /// <summary>
        /// åˆ›å»ºç›˜ç‚¹ä»»åŠ¡
        /// </summary>
        /// <param name="keys"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("CreateCheckOrder")]
        public WebResponseContent CreateCheckOrder([FromBody] int[] keys)
        {
            return Service.CreateCheckOrder(keys);
        }


        /// æŸ¥è¯¢ç›˜ç‚¹å•ä¿¡æ¯
        /// </summary>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("GetPdDeliveryOrders")]
        public WebResponseContent GetPdDeliveryOrders([FromBody] SaveModel saveModel)
        [HttpPost, HttpGet, Route("GetCheckOrders")]
        public WebResponseContent GetCheckOrders([FromBody] SaveModel saveModel)
        {
            return Service.GetPdDeliveryOrders(saveModel);
            return Service.GetCheckOrders(saveModel);
        }

        /// æŸ¥è¯¢å•ä¿¡æ¯


        /// æŸ¥è¯¢å‡ºåº“单信息
        /// </summary>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("GetDeliveryOrders")]
@@ -41,38 +59,57 @@
            return Service.GetDeliveryOrders(saveModel);
        }

        /// æŸ¥è¯¢å•è¯¦æƒ…信息
        /// æŸ¥è¯¢å‡ºåº“/盘点单详情
        /// </summary>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("GetDeliveryOrderDetail")]
        public WebResponseContent GetDeliveryOrderDetail(int pageNo, string orderNo, bool isPick)
        {
            return Service.GetDeliveryOrderDetail(pageNo, orderNo,isPick);
            return Service.GetDeliveryOrderDetail(pageNo, orderNo, isPick);
        }
        /// <summary>
        /// å®Œæˆç›˜ç‚¹ä»»åŠ¡
        /// </summary>
        /// <param name="saveModel"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("CheckFinish")]
        public WebResponseContent CheckFinish([FromBody] SaveModel saveModel)
        {
            return Service.CheckFinish(saveModel);
        }
        /// <summary>
        /// å®Œæˆå‡ºåº“任务
        /// </summary>
        /// <param name="saveModel"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("OutFinish")]
        public WebResponseContent OutFinish([FromBody] SaveModel saveModel)
        {
            return Service.OutFinish(saveModel);
        }
        /// <summary>
        /// æŸ¥æ‰¾æœªå®Œæˆç›˜ç‚¹/出库任务
        /// </summary>
        /// <param name="saveModel"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("GetCheckOutTasks")]
        public WebResponseContent GetCheckOutTasks([FromBody] SaveModel saveModel)
        {
            return Service.GetCheckOutTasks(saveModel);
        }

        [HttpPost, HttpGet, Route("MatPicking")]
        public WebResponseContent MatPicking([FromBody] SaveModel saveModel)
        {
            return Service.MatPicking(saveModel);
        }

        [HttpPost, HttpGet, Route("FeedbackOut")]
        public WebResponseContent FeedbackOut([FromBody] SaveModel saveModel)
        {
            return Service.FeedbackOut(saveModel);
        }
      

        /// <summary>
        /// ç›˜ç‚¹å‡ºåº“接口
        /// å‡ºåº“测试
        /// </summary>
        /// <param name="externalOrderNo"></param>
        /// <param name="outorder"></param>
        /// <returns></returns>
        [HttpPost, Route("InventoryGood"), AllowAnonymous]
        public WebResponseContent InventoryGood(string batchNo, string goodsNo)
        [HttpPost, Route("CreateOutboundOrder"), AllowAnonymous]
        public WebResponseContent CreateOutboundOrder([FromBody]UpstramOutOrderInfo outorder)
        {
            return Service.InventoryGood(batchNo, goodsNo);
            return Service.CreateOutboundOrder(outorder);
        }

       
    }
}