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

647556386

9 天以前 70aa9b5ca249a84e5867912d551cdafbec76e54e

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

@@ -1,4 +1,5 @@
using Microsoft.Extensions.Logging;
using Autofac.Core;
using Microsoft.Extensions.Logging;
using SqlSugar;
using WIDESEA_Common.LocationEnum;
using WIDESEA_Common.OrderEnum;
@@ -123,6 +124,10 @@

                // æ›´æ–°å‡ºåº“单明细状态
                UpdateOrderDetailStatus(item.Details, allocatedQuantity, needQuantity);


                // æ›´æ–°åº“存和托盘状态
               UpdateNormalStocksAndPalletsStatus(autoAssignStocks, stockAllocations);
            }

            if (outStocks.Any())
@@ -133,7 +138,27 @@

            return (outStocks, outboundOrderDetails, outStockLockInfos, locationInfos);
        }
        /// <summary>
        /// æ›´æ–°åº“存和托盘状态
        /// </summary>
        private void UpdateNormalStocksAndPalletsStatus(List<Dt_StockInfo> stocks, Dictionary<int, decimal> stockAllocations)
        {
            foreach (var stock in stocks)
            {
                var stockDetail = stock.Details.First();
                if (stockAllocations.TryGetValue(stockDetail.Id, out decimal allocatedQty) && allocatedQty > 0)
                {

                      _stockService.StockInfoService.Db.Updateable<Dt_StockInfo>()
                        .SetColumns(x => new Dt_StockInfo
                        {
                            StockStatus = (int)StockStatusEmun.出库锁定,
                        })
                        .Where(x => x.Id == stock.Id)
                        .ExecuteCommand();
                }
            }
        }
        /// <summary>
        /// æ£€æŸ¥è®¢å•æ˜¯å¦å…è®¸é‡æ–°åˆ†é…
        /// </summary>
@@ -331,6 +356,9 @@

                // æ›´æ–°å‡ºåº“单明细状态
                UpdateOrderDetailStatus(item.Details, allocatedQuantity, needQuantity);

                // æ›´æ–°åº“存和托盘状态为出库锁定
                await UpdateStocksAndPalletsStatus(autoAssignStocks, stockAllocations);
            }

            if (outStocks.Any())
@@ -343,7 +371,27 @@

            return (outStocks, groupDetails.SelectMany(x => x.Details).ToList(), outStockLockInfos, locationInfos);
        }

        /// <summary>
        /// æ›´æ–°åº“存和托盘状态
        /// </summary>
        private async Task UpdateStocksAndPalletsStatus(List<Dt_StockInfo> stocks, Dictionary<int, decimal> stockAllocations)
        {
            foreach (var stock in stocks)
            {
                var stockDetail = stock.Details.First();
                if (stockAllocations.TryGetValue(stockDetail.Id, out decimal allocatedQty) && allocatedQty > 0)
                {
              
                    await _stockService.StockInfoService.Db.Updateable<Dt_StockInfo>()
                        .SetColumns(x => new Dt_StockInfo
                        {
                            StockStatus = (int)StockStatusEmun.出库锁定, 
                        })
                        .Where(x => x.Id == stock.Id)
                        .ExecuteCommandAsync();
                }
            }
        }
        /// <summary>
        /// æŒ‰å…ˆè¿›å…ˆå‡ºåŽŸåˆ™åˆ†é…é”å®šæ•°é‡
        /// </summary>
@@ -588,24 +636,25 @@
                if (userSelection == null) continue;

                // è®¡ç®—该托盘实际可用数量
                var availableQuantity = CalculateAvailableQuantity(stock, outboundOrderDetail.MaterielCode,
                    outboundOrderDetail.BatchNo, outboundOrderDetail.SupplyCode);
                var availableQuantity = CalculateAvailableQuantityByBarcode(stock, outboundOrderDetail.MaterielCode,
           outboundOrderDetail.BatchNo, outboundOrderDetail.SupplyCode, userSelection.Barcode);

                // ç¡®å®šåˆ†é…æ•°é‡ï¼šå–用户选择数量、可用数量和剩余需求的最小值
                var assignQuantity = Math.Min(Math.Min(userSelection.UseableQuantity, availableQuantity),remainingNeedQuantity);
                var assignQuantity = Math.Min(Math.Min(userSelection.UseableQuantity, availableQuantity), remainingNeedQuantity);

                if (assignQuantity <= 0) continue;

                // æ‰§è¡Œåˆ†é…
                var actualAssigned = AssignStockQuantity(stock, outboundOrderDetail, assignQuantity);
                // æ‰§è¡Œåˆ†é…ï¼Œä½¿ç”¨ç”¨æˆ·é€‰æ‹©çš„条码
                var actualAssigned = AssignStockQuantity(stock, outboundOrderDetail, assignQuantity, userSelection.Barcode);

                if (actualAssigned > 0)
                {
                    outStocks.Add(stock);
                    totalAssignedFromUserSelection += actualAssigned;
                    remainingNeedQuantity -= actualAssigned;

                    // åˆ›å»ºé”å®šè®°å½•
                    var lockInfo = CreateOutStockLockInfo(outboundOrder, outboundOrderDetail, stock, actualAssigned);
                    // åˆ›å»ºé”å®šè®°å½•ï¼Œä½¿ç”¨ç”¨æˆ·é€‰æ‹©çš„条码
                    var lockInfo = CreateOutStockLockInfo(outboundOrder, outboundOrderDetail, stock, actualAssigned, userSelection.Barcode);
                    outStockLockInfos.Add(lockInfo);
                }
            }
@@ -664,7 +713,7 @@
            }

            // æ›´æ–°é”å®šæ•°é‡
            outboundOrderDetail.LockQuantity += totalAssignedFromUserSelection + totalAssignedFromUserSelection;
            outboundOrderDetail.LockQuantity += totalAssignedFromUserSelection;

            // æ›´æ–°çŠ¶æ€
            UpdateOrderDetailStatus(outboundOrderDetail, remainingNeedQuantity);
@@ -673,7 +722,25 @@

            return (outStocks, outboundOrderDetail, outStockLockInfos, locationInfos);
        }
        private decimal CalculateAvailableQuantityByBarcode(Dt_StockInfo stock, string materielCode, string batchNo, string supplyCode, string barcode)
        {
            var query = stock.Details.AsQueryable()
                .Where(d => d.MaterielCode == materielCode &&
                           (d.StockQuantity - d.OutboundQuantity) > 0 &&
                           d.Barcode == barcode);

            if (!string.IsNullOrEmpty(batchNo))
            {
                query = query.Where(x => x.BatchNo == batchNo);
            }

            if (!string.IsNullOrEmpty(supplyCode))
            {
                query = query.Where(d => d.SupplyCode == supplyCode);
            }

            return query.Sum(d => d.StockQuantity - d.OutboundQuantity);
        }
        // è¾…助方法
        private decimal CalculateAvailableQuantity(Dt_StockInfo stock, string materielCode, string batchNo, string supplyCode)
        {
@@ -686,9 +753,45 @@
            return relevantDetails.Sum(d => d.StockQuantity - d.OutboundQuantity);
        }

        private decimal AssignStockQuantity(Dt_StockInfo stock, Dt_OutboundOrderDetail detail, decimal assignQuantity)
        private decimal AssignStockQuantity(Dt_StockInfo stock, Dt_OutboundOrderDetail detail, decimal assignQuantity, string barcode)
        {
            decimal remainingAssign = assignQuantity;

            // æŒ‰å…ˆè¿›å…ˆå‡ºåˆ†é…æŒ‡å®šæ¡ç çš„库存明细
            var query = stock.Details.AsQueryable()
                .Where(d => d.MaterielCode == detail.MaterielCode &&
                           (d.StockQuantity - d.OutboundQuantity) > 0 &&
                           d.Barcode == barcode); // åªåˆ†é…æŒ‡å®šæ¡ç 

            if (!string.IsNullOrEmpty(detail.BatchNo))
            {
                query = query.Where(x => x.BatchNo == detail.BatchNo);
            }
            // å¦‚果出库单有供应商要求，按供应商过滤
            if (!string.IsNullOrEmpty(detail.SupplyCode))
            {
                query = query.Where(d => d.SupplyCode == detail.SupplyCode);
            }
            var sortedDetails = query.ToList().OrderBy(d => d.CreateDate);

            foreach (var stockDetail in sortedDetails)
            {
                if (remainingAssign <= 0) break;

                var available = stockDetail.StockQuantity - stockDetail.OutboundQuantity;
                var assign = Math.Min(available, remainingAssign);

                stockDetail.OutboundQuantity += assign;
                remainingAssign -= assign;
            }

            return assignQuantity - remainingAssign; // è¿”回实际分配数量
        }

        private (decimal assignedQuantity, string barcode) AssignStockQuantity(Dt_StockInfo stock, Dt_OutboundOrderDetail detail, decimal assignQuantity)
        {
            decimal remainingAssign = assignQuantity;
            string assignedBarcode = string.Empty;

            // æŒ‰å…ˆè¿›å…ˆå‡ºåˆ†é…åº“存明细
            var query = stock.Details.AsQueryable()
@@ -717,18 +820,20 @@

                stockDetail.OutboundQuantity += assign;
                remainingAssign -= assign;
                if (string.IsNullOrEmpty(assignedBarcode) && assign > 0)
                {
                    assignedBarcode = stockDetail.Barcode;
                }
            }

            return assignQuantity - remainingAssign; // è¿”回实际分配数量

            return (assignQuantity - remainingAssign, assignedBarcode);
        }

        private Dt_OutStockLockInfo CreateOutStockLockInfo(Dt_OutboundOrder outboundOrder, Dt_OutboundOrderDetail detail,
            Dt_StockInfo stock, decimal quantity)
            Dt_StockInfo stock, decimal quantity,string barcode="")
        {
            var barcode = stock.Details
                .Where(d => !string.IsNullOrEmpty(d.Barcode))
                .Select(d => d.Barcode)
                .FirstOrDefault();
            

            return _outStockLockInfoService.GetOutStockLockInfo(outboundOrder, detail, stock, quantity, barcode);
        }
@@ -792,8 +897,8 @@
                    return (false, $"托盘[{selection.PalletCode}]不存在");
                }

                var available = CalculateAvailableQuantity(stock, outboundOrderDetail.MaterielCode,
                    outboundOrderDetail.BatchNo, outboundOrderDetail.SupplyCode);
                var available = CalculateAvailableQuantityByBarcode(stock, outboundOrderDetail.MaterielCode,
                    outboundOrderDetail.BatchNo, outboundOrderDetail.SupplyCode,selection.Barcode);

                if (available <= 0)
                {