提交

pan

2025-11-24 44e934d78d8906424b09c86e627a4974b93a1455

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

@@ -8,6 +8,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Text.Json;
using System.Threading.Tasks;
using WIDESEA_Common.CommonEnum;
using WIDESEA_Common.LocationEnum;
@@ -186,10 +187,10 @@
                    return WebResponseContent.Instance.Error(overPickingValidation.ErrorMessage);
                }

                //  æ‰§è¡Œåˆ†æ‹£é€»è¾‘
                // æ‰§è¡Œåˆ†æ‹£é€»è¾‘（只处理库存和锁定，不处理订单）
                var pickingResult = await ExecutePickingLogic(lockInfo, orderDetail, stockDetail, orderNo, palletCode, barcode, actualQty);

                // æ›´æ–°ç›¸å…³æ•°æ®
                // ç»Ÿä¸€æ›´æ–°è®¢å•æ•°æ®ï¼ˆæ‰€æœ‰åˆ†æ”¯éƒ½åœ¨è¿™é‡Œæ›´æ–°ï¼‰
                await UpdateOrderRelatedData(orderDetail.Id, pickingResult.ActualPickedQty, orderNo);

                // è®°å½•æ“ä½œåŽ†å²
@@ -206,6 +207,7 @@
                return WebResponseContent.Instance.Error($"拣选确认失败：{ex.Message}");
            }
        }

        /// <summary>
        /// å–消拣选
        /// </summary>
@@ -548,9 +550,11 @@

            return ValidationResult<bool>.Success(true);
        }


        private async Task<PickingResult> ExecutePickingLogic(
            Dt_OutStockLockInfo lockInfo, Dt_OutboundOrderDetail orderDetail, Dt_StockInfoDetail stockDetail,
            string orderNo, string palletCode, string barcode, decimal actualQty)
         Dt_OutStockLockInfo lockInfo, Dt_OutboundOrderDetail orderDetail, Dt_StockInfoDetail stockDetail,
         string orderNo, string palletCode, string barcode, decimal actualQty)
        {
            decimal stockQuantity = stockDetail.StockQuantity;
            var result = new PickingResult
@@ -564,21 +568,26 @@
            if (actualQty < stockQuantity)
            {
                await HandleSplitPacking(lockInfo, stockDetail, actualQty, stockQuantity, result);
                // æ‹†åŒ…场景返回实际拣选数量
                result.ActualPickedQty = actualQty;
            }
            else if (actualQty == stockQuantity)
            {
                await HandleFullPicking(lockInfo, stockDetail, actualQty, result);
                // æ•´åŒ…拣选返回实际拣选数量
                result.ActualPickedQty = actualQty;
            }
            else
            {
                await HandlePartialPicking(lockInfo, stockDetail, actualQty, stockQuantity, result);
                // éƒ¨åˆ†æ‹£é€‰è¿”回调整后的数量
                result.ActualPickedQty = result.ActualPickedQty; // å·²ç»åœ¨æ–¹æ³•å†…调整
            }

            return result;
        }

        private async Task HandleSplitPacking(Dt_OutStockLockInfo lockInfo, Dt_StockInfoDetail stockDetail,
            decimal actualQty, decimal stockQuantity, PickingResult result)
       decimal actualQty, decimal stockQuantity, PickingResult result)
        {
            decimal remainingStockQty = stockQuantity - actualQty;

@@ -587,10 +596,10 @@
            stockDetail.OutboundQuantity = remainingStockQty;
            await _stockInfoDetailService.Db.Updateable(stockDetail).ExecuteCommandAsync();

            //生成新条码
            // ç”Ÿæˆæ–°æ¡ç 
            string newBarcode = await GenerateNewBarcode();

            //创建新锁定信息
            // åˆ›å»ºæ–°é”å®šä¿¡æ¯
            var newLockInfo = await CreateSplitLockInfo(lockInfo, actualQty, newBarcode);

            // è®°å½•æ‹†åŒ…历史
@@ -607,11 +616,10 @@
            result.FinalBarcode = newBarcode;
            result.SplitResults.AddRange(CreateSplitResults(lockInfo, actualQty, remainingStockQty, newBarcode, stockDetail.Barcode));

            await UpdateOrderRelatedData(lockInfo.OrderDetailId, actualQty, lockInfo.OrderNo);
           

            _logger.LogInformation($"拆包分拣更新订单明细 - OrderDetailId: {lockInfo.OrderDetailId}, åˆ†æ‹£æ•°é‡: {actualQty}");
            _logger.LogInformation($"拆包分拣完成 - OrderDetailId: {lockInfo.OrderDetailId}, åˆ†æ‹£æ•°é‡: {actualQty}");
        }

        private async Task HandleFullPicking(Dt_OutStockLockInfo lockInfo, Dt_StockInfoDetail stockDetail,
            decimal actualQty, PickingResult result)
        {
@@ -1533,6 +1541,8 @@
                        .Where(x => x.OrderNo == orderNo)
                        .ExecuteCommandAsync();
                }

                _logger.LogError($"FeedbackOutbound成功 - OrderNo: {orderNo}, {JsonSerializer.Serialize(result)}");
            }
            catch (Exception ex)
            {