优化撤销组盘功能

heshaofeng

2026-01-06 b13d3d2c634df625dcaa74371f1d36a8376851b4

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

@@ -18,6 +18,7 @@
using WIDESEA_Core.Utilities;
using WIDESEA_DTO.Base;
using WIDESEA_DTO.Inbound;
using WIDESEA_DTO.Stock;
using WIDESEA_IBasicService;
using WIDESEA_IInboundService;
using WIDESEA_IRecordService;
@@ -680,20 +681,66 @@
            }
        }

        public WebResponseContent UndoPalletGroup(string palletCode, string barcode = "")
        /// <summary>
        /// æ’¤é”€ç»„盘（智能识别输入是托盘号或条码）
        /// </summary>
        /// <param name="code">托盘号或条码</param>
        /// <returns>操作结果</returns>
        public WebResponseContent UndoPalletGroup(string code)
        {

            if (string.IsNullOrWhiteSpace(palletCode))
            if (string.IsNullOrWhiteSpace(code))
            {
                return WebResponseContent.Instance.Error("托盘号不能为空");
                return WebResponseContent.Instance.Error("托盘号或条码不能为空");
            }


            try
            {
                _unitOfWorkManage.BeginTran();

                // 2. æŸ¥è¯¢æ‰˜ç›˜åº“存主记录（避免无数据抛异常）
                // æ™ºèƒ½è¯†åˆ«è¾“入类型
                string palletCode = null;
                string barcode = null;

                // 1. å…ˆå°è¯•æŒ‰æ‰˜ç›˜å·æŸ¥è¯¢
                var stockByPallet = _stockRepository.Db.Queryable<Dt_StockInfo>()
                    .Includes(o => o.Details)
                    .First(x => x.PalletCode == code
                        && (x.StockStatus == (int)StockStatusEmun.组盘暂存
                            || x.StockStatus == StockStatusEmun.入库确认.ObjToInt()));

                if (stockByPallet != null)
                {
                    // è¯†åˆ«ä¸ºæ‰˜ç›˜å·
                    palletCode = code;
                }
                else
                {
                    var detail = _stockDetailRepository.Db.Queryable<Dt_StockInfoDetail>().Where(d => d.Barcode == code).First();

                    if (detail != null)
                    {
                        var stockInfo = _stockRepository
                            .Db.Queryable<Dt_StockInfo>()
                            .Where(s => s.Id == detail.StockId&& (s.StockStatus == (int)StockStatusEmun.组盘暂存 || s.StockStatus == StockStatusEmun.入库确认.ObjToInt()))
                            .First();

                        if (stockInfo != null)
                        {
                            barcode = code;
                            palletCode = stockInfo.PalletCode;
                        }
                    }
                    else
                    {
                        _unitOfWorkManage.RollbackTran();
                        return WebResponseContent.Instance.Error($"未找到 {code} å¯¹åº”的托盘或条码记录");
                    }
                }

                // æ ¹æ®è¯†åˆ«ç»“果执行撤销逻辑
                if (!string.IsNullOrWhiteSpace(barcode))
                {
                    // ===== æ’¤é”€æŒ‡å®šæ¡ç  =====
                var stock = _stockRepository.Db.Queryable<Dt_StockInfo>()
                    .Includes(o => o.Details)
                    .First(x => x.PalletCode == palletCode
@@ -702,12 +749,10 @@

                if (stock == null)
                {
                        _unitOfWorkManage.RollbackTran();
                    return WebResponseContent.Instance.Error($"未找到托盘号{palletCode}对应的库存记录");
                }

                // 3. åœºæ™¯1：删除指定条码
                if (!string.IsNullOrWhiteSpace(barcode))
                {
                    var targetDetail = stock.Details?.FirstOrDefault(x => x.Barcode == barcode);
                    if (targetDetail == null)
                    {
@@ -716,21 +761,15 @@
                    }

                    ResetInboundOrderStatus(new List<string> { targetDetail.OrderNo }, new List<string> { targetDetail.Barcode });
                    // åˆ é™¤æŒ‡å®šæ˜Žç»†
                    _stockDetailRepository.DeleteData(targetDetail);


                    // é‡æ–°æŸ¥è¯¢å‰©ä½™æ˜Žç»†ï¼ˆä¿è¯æ•°æ®å‡†ç¡®æ€§ï¼‰
                    var remainingDetails = _stockDetailRepository.Db.Queryable<Dt_StockInfoDetail>()
                        .Where(x => x.StockId == stock.Id)
                        .ToList();

                    // å‰©ä½™æ˜Žç»†ä¸ºç©º â†’ åˆ é™¤ä¸»è¡¨ + é‡ç½®å…¥åº“单及明细状态
                    if (!remainingDetails.Any())
                    {
                        // é‡ç½®å…¥åº“单及明细状态
                        ResetInboundOrderStatus(stock.Details.Select(d => d.OrderNo).Distinct().ToList());

                        _stockRepository.DeleteData(stock);
                        _unitOfWorkManage.CommitTran();
                        return WebResponseContent.Instance.OK($"条码{barcode}撤销成功，托盘无剩余明细，已删除托盘并重置关联入库单状态");
@@ -739,8 +778,21 @@
                    _unitOfWorkManage.CommitTran();
                    return WebResponseContent.Instance.OK($"条码{barcode}撤销成功，托盘仍有剩余明细");
                }
                else
                {
                    // ===== æ’¤é”€æ•´ä¸ªæ‰˜ç›˜ =====
                    var stock = _stockRepository.Db.Queryable<Dt_StockInfo>()
                        .Includes(o => o.Details)
                        .First(x => x.PalletCode == palletCode
                            && (x.StockStatus == (int)StockStatusEmun.组盘暂存
                                || x.StockStatus == StockStatusEmun.入库确认.ObjToInt()));

                // åˆ é™¤æ•´æ‰˜ç›˜ï¼ˆæ— æ¡ç ä¼ å…¥ï¼‰
                    if (stock == null)
                    {
                        _unitOfWorkManage.RollbackTran();
                        return WebResponseContent.Instance.Error($"未找到托盘号 {palletCode} å¯¹åº”的库存记录");
                    }

                if (stock.Details == null || !stock.Details.Any())
                {
                    _stockRepository.DeleteData(stock);
@@ -748,7 +800,6 @@
                    return WebResponseContent.Instance.OK("托盘无明细记录，已直接删除托盘主数据");
                }

                // æœ‰æ˜Žç»† â†’ é‡ç½®å…¥åº“单及明细状态 + åˆ é™¤åº“å­˜
                var relatedOrderNos = stock.Details.Select(d => d.OrderNo).Distinct().ToList();
                if (!relatedOrderNos.Any())
                {
@@ -756,15 +807,13 @@
                    return WebResponseContent.Instance.Error("库存明细未关联任何入库单号，无法完成撤销");
                }

                // é‡ç½®å…¥åº“单主状态 + æ˜Žç»†çŠ¶æ€
                ResetInboundOrderStatus(relatedOrderNos, stock.Details.Select(d => d.Barcode).ToList());

                // 4.3 åˆ é™¤åº“存明细和主表
                _stockDetailRepository.DeleteData(stock.Details);
                _stockRepository.DeleteData(stock);

                _unitOfWorkManage.CommitTran();
                return WebResponseContent.Instance.OK("托盘撤销成功，已重置关联入库单及明细状态");
                }
            }
            catch (Exception ex)
            {
@@ -803,6 +852,10 @@
                {
                    detail.ReceiptQuantity = 0;
                    detail.OrderDetailStatus = 0;
                    if(inboundOrder.BusinessType == "11")
                    {
                        detail.WarehouseCode = "";
                    }
                    _inboundOrderDetailRepository.UpdateData(detail);
                }
            }