Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxia...

pan

2025-11-16 cf83e0828b286b61b69a15005e6247d8b03f4cd8

 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutboundPickingController.cs

@@ -23,7 +23,7 @@
        /// <summary>
        /// èŽ·å–托盘的出库状态
        /// </summary>
        [HttpGet("GetPalletOutboundStatus")]
        [HttpPost("GetPalletOutboundStatus")]
        public async Task<WebResponseContent> GetPalletOutboundStatus(string palletCode)
        {
            return await Service.GetPalletOutboundStatus(palletCode);
@@ -32,7 +32,7 @@
        /// <summary>
        /// èŽ·å–托盘的锁定信息
        /// </summary>
        [HttpGet("GetPalletLockInfos")]
        [HttpPost("GetPalletLockInfos")]
        public async Task<WebResponseContent> GetPalletLockInfos(string palletCode)
        {
            var lockInfos = await _outStockLockInfoService.GetPalletLockInfos(palletCode);
@@ -41,17 +41,17 @@

 

        [HttpGet("unpicked-list")]
        public async Task<WebResponseContent> GetUnpickedList(string orderNo, string palletCode)
        [HttpPost("unpicked-list")]
        public async Task<WebResponseContent> GetUnpickedList([FromBody] ConfirmPickingDto dto)
        {
            var lists= await Service.GetUnpickedList(orderNo, palletCode);
            var lists= await Service.GetUnpickedList(dto.OrderNo, dto.PalletCode);
            return WebResponseContent.Instance.OK("", lists);
        }

        [HttpGet("picked-list")]
        public async Task<WebResponseContent> GetPickedList(string orderNo, string palletCode)
        [HttpPost("picked-list")]
        public async Task<WebResponseContent> GetPickedList([FromBody] ConfirmPickingDto dto)
        {
            var lists = await Service.GetPickedList(orderNo, palletCode);
            var lists = await Service.GetPickedList(dto.OrderNo, dto.PalletCode);
            return WebResponseContent.Instance.OK("", lists);
        }

@@ -61,11 +61,48 @@
            return await Service.ConfirmPicking(dto.OrderNo, dto.PalletCode, dto.Barcode);
        }

        [HttpGet("picking-summary")]
        public async Task<WebResponseContent> GetPickingSummary(string orderNo)
        [HttpPost("picking-summary")]
        public async Task<WebResponseContent> GetPickingSummary([FromBody] ConfirmPickingDto dto)
        {
            var data = await Service.GetPickingSummary(orderNo);
            var data = await Service.GetPickingSummary(dto);
            return WebResponseContent.Instance.OK("", data);
        }

        [HttpPost("split-package")]
        public async Task<WebResponseContent> SplitPackage([FromBody] SplitPackageDto dto)
        {
            return  await _splitPackageService.SplitPackage(dto);
          
        }

        [HttpPost("revert-split-package")]
        public async Task<WebResponseContent> RevertSplitPackage([FromBody] RevertSplitDto dto)
        {
           return  await _splitPackageService.RevertSplitPackage(dto.OriginalBarcode);
           
       
        }

        [HttpPost("split-package-info")]
        public async Task<WebResponseContent> GetSplitPackageInfo([FromBody] ConfirmPickingDto dto)
        {
          return  await _splitPackageService.GetSplitPackageInfo(dto.OrderNo, dto.PalletCode, dto.Barcode);
          
        }


        [HttpPost("return-to-stock")]
        public async Task<WebResponseContent> ReturnToStock( )
        {
            var data= "";
            return WebResponseContent.Instance.OK("", data);
        }

        [HttpPost("direct-outbound")]
        public async Task<WebResponseContent> DirectOutbound([FromBody] DirectOutboundRequest dto)
        {
           return await Service.DirectOutbound(dto);
 
        }

        ///// <summary>
@@ -84,14 +121,7 @@
        {
            return await Service.ValidateBarcode(barcode);
        }
        /// <summary>
        /// æ‹†åŒ…操作
        /// </summary>
        [HttpPost("SplitPackage")]
        public async Task<WebResponseContent> SplitPackage([FromBody] SplitPackageDto request)
        {
            return await _splitPackageService.SplitPackage(request);
        }
 

        ///// <summary>
        ///// ç›´æŽ¥å‡ºåº“
@@ -116,9 +146,9 @@
        /// æ’¤é”€æ‹£é€‰
        /// </summary>
        [HttpPost("CancelPicking")]
        public async Task<WebResponseContent> CancelPicking([FromBody] CancelPickingRequest request)
        public async Task<WebResponseContent> CancelPicking([FromBody] ConfirmPickingDto dto)
        {
            return await Service.CancelPicking(request);
            return await Service.CancelPicking(dto.OrderNo,dto.PalletCode,dto.Barcode);
        }
    }
}