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

pan

6 天以前 5335e892470760a25db793d249c94d8aa32e8b0b

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

@@ -1,6 +1,7 @@
using AutoMapper;
using SqlSugar;
using System.Dynamic;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using WIDESEA_Common.CommonEnum;
using WIDESEA_Common.OrderEnum;
@@ -646,53 +647,141 @@
            }
        }

        public WebResponseContent UndoPalletGroup(string palletCode)
        public WebResponseContent UndoPalletGroup(string palletCode, string barcode = "")
        {
            
            if (string.IsNullOrWhiteSpace(palletCode))
            {
                return WebResponseContent.Instance.Error("托盘号不能为空");
            }
            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)
            {
                return WebResponseContent.Instance.Error($"未找到托盘号{palletCode}对应的库存记录");
            }

            if (stock.Details == null || !stock.Details.Any())
            
            try
            {
                _unitOfWorkManage.BeginTran(); 

                // 2. æŸ¥è¯¢æ‰˜ç›˜åº“存主记录（避免无数据抛异常）
                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)
                {
                    return WebResponseContent.Instance.Error($"未找到托盘号{palletCode}对应的库存记录");
                }

                // 3. åœºæ™¯1：删除指定条码
                if (!string.IsNullOrWhiteSpace(barcode))
                {
                    var targetDetail = stock.Details?.FirstOrDefault(x => x.Barcode == barcode);
                    if (targetDetail == null)
                    {
                        _unitOfWorkManage.RollbackTran();
                        return WebResponseContent.Instance.Error($"托盘{palletCode}下未找到条码{barcode}的明细记录");
                    }

                    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}撤销成功，托盘无剩余明细，已删除托盘并重置关联入库单状态");
                    }

                    _unitOfWorkManage.CommitTran();
                    return WebResponseContent.Instance.OK($"条码{barcode}撤销成功，托盘仍有剩余明细");
                }

                // åˆ é™¤æ•´æ‰˜ç›˜ï¼ˆæ— æ¡ç ä¼ å…¥ï¼‰
                if (stock.Details == null || !stock.Details.Any())
                {
                    _stockRepository.DeleteData(stock);
                    _unitOfWorkManage.CommitTran();
                    return WebResponseContent.Instance.OK("托盘无明细记录，已直接删除托盘主数据");
                }

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

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

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

                _unitOfWorkManage.CommitTran();
                return WebResponseContent.Instance.OK("托盘撤销成功，已重置关联入库单及明细状态");
            }
            //  èŽ·å–库存详情关联的所有入库单号
            var relatedOrderNos = stock.Details.Select(d => d.OrderNo).First();
            //  æŸ¥è¯¢æ‰€æœ‰å…³è”的入库单（含详情）
            var inboundOrders = _inboundOrderRepository.Db.Queryable<Dt_InboundOrder>()
                .Includes(x => x.Details)
                .Where(x => relatedOrderNos == x.InboundOrderNo)
                .First();

            var barcodes = stock.Details.Select(d => d.Barcode).ToList();

            // åŒ¹é…åº“存条码对应的入库单明细
            var matchedInboundDetails = inboundOrders.Details
                ?.Where(d => barcodes.Contains(d.Barcode))
                .ToList();
            foreach (var detail in matchedInboundDetails)
            catch (Exception ex)
            {
                detail.ReceiptQuantity = 0;
                detail.OrderDetailStatus = 0;
                _inboundOrderDetailRepository.UpdateData(detail);
                _unitOfWorkManage.RollbackTran(); 
                return WebResponseContent.Instance.Error($"托盘撤销失败：{ex.Message}");
            }
            _stockDetailRepository.DeleteData(stock.Details);
            _stockRepository.DeleteData(stock);
        }


            return WebResponseContent.Instance.OK("托盘撤销成功");
        private void ResetInboundOrderStatus(List<string> orderNos, List<string> barcodes = null)
        {
            foreach (var orderNo in orderNos)
            {
                var inboundOrder = _inboundOrderRepository.Db.Queryable<Dt_InboundOrder>()
                    .Includes(x => x.Details)
                    .First(x => x.InboundOrderNo == orderNo);

                if (inboundOrder == null) continue;

                bool isSingleBarcode = barcodes != null && barcodes.Count == 1;
                if (!isSingleBarcode)
                {
                    // éžå•ä¸ªæ¡ç ï¼ˆæ•´å•/多个条码）：重置主表状态为0
                    inboundOrder.OrderStatus = 0;
                    _inboundOrderRepository.UpdateData(inboundOrder);
                }

                // é‡ç½®å…¥åº“单明细状态
                if (inboundOrder.Details == null || !inboundOrder.Details.Any()) continue;

                var targetDetails = barcodes == null
                    ? inboundOrder.Details.ToList() // ä¸ä¼ æ¡ç åˆ™é‡ç½®æ•´å•æ˜Žç»†
                    : inboundOrder.Details.Where(d => barcodes.Contains(d.Barcode)).ToList();

                foreach (var detail in targetDetails)
                {
                    detail.ReceiptQuantity = 0;
                    detail.OrderDetailStatus = 0;
                    _inboundOrderDetailRepository.UpdateData(detail);
                }
            }
        }

        public override PageGridData<Dt_InboundOrder> GetPageData(PageDataOptions options)
        {
            string wheres = ValidatePageOptions(options);

            string pattern = @"inboundOrderNo like '[^']+'\s*and\s*";
            wheres = Regex.Replace(wheres, pattern, "", RegexOptions.IgnoreCase);

            //获取排序字段
            Dictionary<string, SqlSugar.OrderByType> orderbyDic = GetPageDataSort(options, TProperties);
            List<OrderByModel> orderByModels = new List<OrderByModel>();
@@ -712,7 +801,7 @@
            if (!string.IsNullOrEmpty(options.Wheres))
            {
                try
                {
                {                  
                    searchParametersList = options.Wheres.DeserializeObject<List<SearchParameters>>();
                    if (searchParametersList.Count > 0)
                    {