using Microsoft.Extensions.Logging; using SqlSugar; using SqlSugar.Extensions; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; using WIDESEA_BasicService; using WIDESEA_Common.CommonEnum; using WIDESEA_Common.OrderEnum; using WIDESEA_Common.StockEnum; using WIDESEA_Core; using WIDESEA_Core.BaseRepository; using WIDESEA_Core.BaseServices; using WIDESEA_DTO.Outbound; using WIDESEA_IAllocateService; using WIDESEA_IBasicService; using WIDESEA_IOutboundService; using WIDESEA_IStockService; using WIDESEA_Model.Models; using WIDESEA_Model.Models.Basic; using WIDESEA_Model.Models.Outbound; using static WIDESEA_OutboundService.OutboundBatchPickingService; namespace WIDESEA_OutboundService { public class OutboundBatchPickingService : ServiceBase>, IOutboundBatchPickingService { private readonly IUnitOfWorkManage _unitOfWorkManage; public IRepository Repository => BaseDal; private readonly IStockInfoService _stockInfoService; private readonly IStockService _stockService; private readonly IOutStockLockInfoService _outStockLockInfoService; private readonly IStockInfoDetailService _stockInfoDetailService; private readonly ILocationInfoService _locationInfoService; private readonly IOutboundOrderDetailService _outboundOrderDetailService; private readonly IOutboundOrderService _outboundOrderService; private readonly ISplitPackageService _splitPackageService; private readonly IRepository _taskRepository; private readonly IESSApiService _eSSApiService; private readonly IInvokeMESService _invokeMESService; private readonly IDailySequenceService _dailySequenceService; private readonly IAllocateService _allocateService; private readonly IRepository _outboundBatchRepository; private readonly ILogger _logger; private Dictionary stations = new Dictionary { {"2-1","2-9" }, {"3-1","3-9" }, }; private Dictionary movestations = new Dictionary { {"2-1","2-5" }, {"3-1","3-5" }, }; public OutboundBatchPickingService(IRepository BaseDal, IUnitOfWorkManage unitOfWorkManage, IStockInfoService stockInfoService, IStockService stockService, IOutStockLockInfoService outStockLockInfoService, IStockInfoDetailService stockInfoDetailService, ILocationInfoService locationInfoService, IOutboundOrderDetailService outboundOrderDetailService, ISplitPackageService splitPackageService, IOutboundOrderService outboundOrderService, IRepository taskRepository, IESSApiService eSSApiService, ILogger logger, IInvokeMESService invokeMESService, IDailySequenceService dailySequenceService, IAllocateService allocateService, IRepository outboundBatchRepository) : base(BaseDal) { _unitOfWorkManage = unitOfWorkManage; _stockInfoService = stockInfoService; _stockService = stockService; _outStockLockInfoService = outStockLockInfoService; _stockInfoDetailService = stockInfoDetailService; _locationInfoService = locationInfoService; _outboundOrderDetailService = outboundOrderDetailService; _splitPackageService = splitPackageService; _outboundOrderService = outboundOrderService; _taskRepository = taskRepository; _eSSApiService = eSSApiService; _logger = logger; _invokeMESService = invokeMESService; _dailySequenceService = dailySequenceService; _allocateService = allocateService; _outboundBatchRepository = outboundBatchRepository; } // /// 获取托盘的锁定信息 /// public async Task> GetPalletLockInfos(string orderNo, string palletCode) { var lockInfos = await _outStockLockInfoService.Db.Queryable() .Where(x => x.OrderNo == orderNo && x.PalletCode == palletCode) .Select(x => new { x.Id, x.OrderNo, x.BatchNo, x.MaterielCode, x.CurrentBarcode, x.AssignQuantity, x.PickedQty, x.Status, x.LocationCode, x.PalletCode }).ToListAsync(); var lockInfoDtos = lockInfos.Select(x => new PalletLockInfoDto { Id = x.Id, OrderNo = x.OrderNo, BatchNo = x.BatchNo, MaterielCode = x.MaterielCode, CurrentBarcode = x.CurrentBarcode, AssignQuantity = x.AssignQuantity, PickedQty = x.PickedQty, Status = x.Status, LocationCode = x.LocationCode, PalletCode = x.PalletCode, CanSplit = (x.Status == (int)OutLockStockStatusEnum.出库中 && x.AssignQuantity - x.PickedQty > 0), CanPick = (x.Status == (int)OutLockStockStatusEnum.出库中 && x.PickedQty < x.AssignQuantity) }).ToList(); return lockInfoDtos; } #region 查询方法 /// /// 获取托盘的已拣选列表 /// public async Task> GetPalletPickedList(string orderNo, string palletCode) { var pickedList = await Db.Queryable() .Where(x => x.OrderNo == orderNo && x.PalletCode == palletCode && !x.IsCancelled) .Select(x => new PalletPickedInfoDto { Id = x.Id, OrderNo = x.OrderNo, OrderDetailId = x.OrderDetailId, PalletCode = x.PalletCode, Barcode = x.Barcode, MaterielCode = x.MaterielCode, PickedQty = x.PickQuantity, PickTime = x.PickTime, Operator = x.Operator, LocationCode = x.LocationCode }) .ToListAsync(); return pickedList; } /// /// 获取托盘状态 /// public async Task GetPalletStatus(string orderNo, string palletCode) { // 获取托盘的锁定信息 var lockInfos = await _outStockLockInfoService.Db.Queryable() .Where(x => x.OrderNo == orderNo && x.PalletCode == palletCode) .ToListAsync(); if (!lockInfos.Any()) { return new PalletStatusDto { OrderNo = orderNo, PalletCode = palletCode, Status = (int)PalletStatusEnum.无任务, StatusText = "无任务", TotalItems = 0, CompletedItems = 0, PendingItems = 0 }; } var totalItems = lockInfos.Count; var completedItems = lockInfos.Count(x => x.Status == (int)OutLockStockStatusEnum.拣选完成); var pendingItems = lockInfos.Count(x => x.Status == (int)OutLockStockStatusEnum.出库中); var status = PalletStatusEnum.拣选中; if (pendingItems == 0 && completedItems > 0) { status = PalletStatusEnum.已完成; } else if (pendingItems > 0 && completedItems == 0) { status = PalletStatusEnum.未开始; } else if (pendingItems > 0 && completedItems > 0) { status = PalletStatusEnum.拣选中; } return new PalletStatusDto { OrderNo = orderNo, PalletCode = palletCode, Status = (int)status, StatusText = GetPalletStatusText(status), TotalItems = totalItems, CompletedItems = completedItems, PendingItems = pendingItems }; } /// /// 获取拆包信息 /// public async Task GetSplitPackageInfo(string orderNo, string palletCode, string barcode) { // 查找锁定信息 var lockInfo = await _outStockLockInfoService.Db.Queryable() .Where(x => x.OrderNo == orderNo && x.PalletCode == palletCode && x.CurrentBarcode == barcode //&& x.Status == (int)OutLockStockStatusEnum.出库中 ) .FirstAsync(); if (lockInfo == null) throw new Exception("未找到有效的锁定信息"); // 计算剩余可拆数量 var remainQuantity = lockInfo.AssignQuantity - lockInfo.PickedQty; return new SplitPackageInfoDto { OrderNo = orderNo, PalletCode = palletCode, Barcode = barcode, MaterielCode = lockInfo.MaterielCode, RemainQuantity = remainQuantity, AssignQuantity = lockInfo.AssignQuantity, PickedQty = lockInfo.PickedQty }; } #endregion #region 取走空箱逻辑 /// /// 取走空箱 - 清理已完成拣选的托盘数据 /// public async Task RemoveEmptyPallet(string orderNo, string palletCode) { try { _unitOfWorkManage.BeginTran(); // 验证托盘是否可以取走(必须全部完成拣选) var validationResult = await ValidateEmptyPalletRemoval(orderNo, palletCode); if (!validationResult.IsValid) return WebResponseContent.Instance.Error(validationResult.ErrorMessage); var completedLocks = validationResult.Data; // 清理锁定记录(标记为已完成) await CleanupCompletedLocks(completedLocks); // 更新相关订单状态 await UpdateOrderStatusAfterPalletRemoval(orderNo); // 记录操作历史 // await RecordEmptyPalletRemoval(orderNo, palletCode, completedLocks); _unitOfWorkManage.CommitTran(); return WebResponseContent.Instance.OK("取走空箱成功"); } catch (Exception ex) { _unitOfWorkManage.RollbackTran(); _logger.LogError($"取走空箱失败 - OrderNo: {orderNo}, PalletCode: {palletCode}, Error: {ex.Message}"); return WebResponseContent.Instance.Error($"取走空箱失败:{ex.Message}"); } } /// /// 验证空箱取走条件 /// private async Task>> ValidateEmptyPalletRemoval(string orderNo, string palletCode) { // 获取托盘的所有锁定记录 var lockInfos = await _outStockLockInfoService.Db.Queryable() .Where(x => x.OrderNo == orderNo && x.PalletCode == palletCode) .ToListAsync(); if (!lockInfos.Any()) return ValidationResult>.Error("该托盘没有锁定记录"); // 检查是否有未完成的锁定记录 var unfinishedLocks = lockInfos.Where(x => x.Status == (int)OutLockStockStatusEnum.出库中 || x.Status == (int)OutLockStockStatusEnum.回库中).ToList(); if (unfinishedLocks.Any()) { var unfinishedCount = unfinishedLocks.Count; var unfinishedQty = unfinishedLocks.Sum(x => x.AssignQuantity - x.PickedQty); return ValidationResult>.Error( $"托盘还有{unfinishedCount}条未完成记录,剩余数量{unfinishedQty},不能取走空箱"); } // 获取已完成的锁定记录 var completedLocks = lockInfos.Where(x => x.Status == (int)OutLockStockStatusEnum.拣选完成).ToList(); if (!completedLocks.Any()) return ValidationResult>.Error("该托盘没有已完成拣选的记录"); return ValidationResult>.Success(completedLocks); } /// /// 清理已完成的锁定记录 /// private async Task CleanupCompletedLocks(List completedLocks) { foreach (var lockInfo in completedLocks) { // 标记锁定记录为已取走 lockInfo.Status = (int)OutLockStockStatusEnum.已取走; lockInfo.Operator = App.User.UserName; await _outStockLockInfoService.Db.Updateable(lockInfo).ExecuteCommandAsync(); // 清理对应的库存记录状态 await CleanupStockInfo(lockInfo); } } /// /// 清理库存信息 /// private async Task CleanupStockInfo(Dt_OutStockLockInfo lockInfo) { var stockDetail = await _stockInfoDetailService.Db.Queryable() .FirstAsync(x => x.Barcode == lockInfo.CurrentBarcode && x.StockId == lockInfo.StockId); if (stockDetail != null && stockDetail.Status == (int)StockStatusEmun.出库完成) { stockDetail.Status = (int)StockStatusEmun.已清理; await _stockInfoDetailService.Db.Updateable(stockDetail).ExecuteCommandAsync(); } } /// /// 更新订单状态 /// private async Task UpdateOrderStatusAfterPalletRemoval(string orderNo) { // 检查订单是否所有托盘都已完成 var allLocks = await _outStockLockInfoService.Db.Queryable() .Where(x => x.OrderNo == orderNo) .ToListAsync(); var unfinishedPallets = allLocks .GroupBy(x => x.PalletCode) .Where(g => g.Any(x => x.Status == (int)OutLockStockStatusEnum.出库中 || x.Status == (int)OutLockStockStatusEnum.回库中)) .ToList(); // 如果没有未完成的托盘,更新订单状态为出库完成 if (!unfinishedPallets.Any()) { await _outboundOrderService.Db.Updateable() .SetColumns(x => new Dt_OutboundOrder { OrderStatus = (int)OutOrderStatusEnum.出库完成, }) .Where(x => x.OrderNo == orderNo) .ExecuteCommandAsync(); } } /// /// 记录空箱取走历史 /// private async Task RecordEmptyPalletRemoval(string orderNo, string palletCode, List completedLocks) { var removalRecord = new Dt_EmptyPalletRemoval { OrderNo = orderNo, PalletCode = palletCode, RemovalTime = DateTime.Now, Operator = App.User.UserName, CompletedItemsCount = completedLocks.Count, TotalPickedQuantity = completedLocks.Sum(x => x.PickedQty) }; await Db.Insertable(removalRecord).ExecuteCommandAsync(); } #endregion #region 分批分拣 /// /// 分批分拣确认 /// public async Task ConfirmBatchPicking(string orderNo, string palletCode, string barcode) { try { _unitOfWorkManage.BeginTran(); // 验证分拣请求 var validationResult = await ValidatePickingRequest(orderNo, palletCode, barcode); if (!validationResult.IsValid) return WebResponseContent.Instance.Error(validationResult.ErrorMessage); var (lockInfo, orderDetail, stockDetail, batch) = validationResult.Data; // 检查是否需要自动拆包 var autoSplitResult = await CheckAndAutoSplitIfNeeded(lockInfo, stockDetail, palletCode); if (autoSplitResult != null) { // 如果执行了自动拆包,重新获取最新的锁定信息和库存信息 var refreshedValidation = await ValidatePickingRequest(orderNo, palletCode, barcode); if (!refreshedValidation.IsValid) { _unitOfWorkManage.RollbackTran(); return WebResponseContent.Instance.Error(refreshedValidation.ErrorMessage); } (lockInfo, orderDetail, stockDetail, batch) = refreshedValidation.Data; // 重要修复:自动拆包后,立即执行原条码的分拣 var actualPickedQty = lockInfo.AssignQuantity; var pickingResult = await ExecutePickingLogic(lockInfo, orderDetail, stockDetail, actualPickedQty); // 更新批次和订单数据 await UpdateBatchAndOrderData(batch, orderDetail, actualPickedQty, orderNo); // 记录拣选历史 await RecordPickingHistory(pickingResult, orderNo, palletCode); _unitOfWorkManage.CommitTran(); return WebResponseContent.Instance.OK("自动拆包并分拣成功", new { AutoSplitted = true, NewBarcode = autoSplitResult.NewBarcode, OriginalBarcode = barcode, SplitQuantity = autoSplitResult.SplitQuantity, PickedQuantity = actualPickedQty, MaterialCode = lockInfo.MaterielCode }); } // 正常分拣流程(不需要自动拆包) var normalPickedQty = lockInfo.AssignQuantity; var normalPickingResult = await ExecutePickingLogic(lockInfo, orderDetail, stockDetail, normalPickedQty); // 更新批次和订单数据 await UpdateBatchAndOrderData(batch, orderDetail, normalPickedQty, orderNo); // 记录拣选历史 await RecordPickingHistory(normalPickingResult, orderNo, palletCode); _unitOfWorkManage.CommitTran(); return WebResponseContent.Instance.OK("分拣成功", new { PickedQuantity = normalPickedQty, Barcode = barcode, MaterialCode = lockInfo.MaterielCode, AutoSplitted = false }); } catch (Exception ex) { _unitOfWorkManage.RollbackTran(); _logger.LogError($"分拣失败 - OrderNo: {orderNo}, PalletCode: {palletCode}, Barcode: {barcode}, Error: {ex.Message}"); return WebResponseContent.Instance.Error($"分拣失败:{ex.Message}"); } } /// /// 取消分拣 /// public async Task CancelPicking(string orderNo, string palletCode, string barcode) { try { _unitOfWorkManage.BeginTran(); // 查找分拣记录 var pickingRecord = await Db.Queryable() .Where(x => x.OrderNo == orderNo && x.PalletCode == palletCode && x.Barcode == barcode && !x.IsCancelled) .OrderByDescending(x => x.PickTime) .FirstAsync(); if (pickingRecord == null) return WebResponseContent.Instance.Error("未找到分拣记录"); // 恢复锁定信息和库存 var revertResult = await RevertPickingData(pickingRecord); // 更新批次和订单数据 await RevertBatchAndOrderData(pickingRecord, revertResult); // 标记分拣记录为已取消 pickingRecord.IsCancelled = true; pickingRecord.CancelTime = DateTime.Now; pickingRecord.CancelOperator = App.User.UserName; await Db.Updateable(pickingRecord).ExecuteCommandAsync(); _unitOfWorkManage.CommitTran(); return WebResponseContent.Instance.OK("取消分拣成功"); } catch (Exception ex) { _unitOfWorkManage.RollbackTran(); _logger.LogError($"取消分拣失败 - OrderNo: {orderNo}, PalletCode: {palletCode}, Error: {ex.Message}"); return WebResponseContent.Instance.Error($"取消分拣失败:{ex.Message}"); } } #endregion #region 手动拆包 #region 手动拆包相关方法 /// /// 手动拆包 /// public async Task ManualSplitPackage(string orderNo, string palletCode, string originalBarcode, decimal splitQuantity) { try { _unitOfWorkManage.BeginTran(); // 验证拆包请求 var validationResult = await ValidateSplitRequest(orderNo, palletCode, originalBarcode, splitQuantity); if (!validationResult.IsValid) return WebResponseContent.Instance.Error(validationResult.ErrorMessage); var (lockInfo, stockDetail) = validationResult.Data; // 执行拆包逻辑 var splitResult = await ExecuteManualSplitLogic(lockInfo, stockDetail, splitQuantity, palletCode); _unitOfWorkManage.CommitTran(); return WebResponseContent.Instance.OK("手动拆包成功", new { NewBarcode = splitResult.NewBarcode, OriginalBarcode = originalBarcode, SplitQuantity = splitQuantity }); } catch (Exception ex) { _unitOfWorkManage.RollbackTran(); _logger.LogError($"手动拆包失败 - OrderNo: {orderNo}, Barcode: {originalBarcode}, Error: {ex.Message}"); return WebResponseContent.Instance.Error($"手动拆包失败:{ex.Message}"); } } /// /// 验证拆包请求 - 增强分配数量控制 /// private async Task> ValidateSplitRequest( string orderNo, string palletCode, string originalBarcode, decimal splitQuantity) { _logger.LogInformation($"开始验证拆包请求 - 订单: {orderNo}, 托盘: {palletCode}, 原条码: {originalBarcode}, 拆包数量: {splitQuantity}"); // 查找锁定信息 var lockInfo = await _outStockLockInfoService.Db.Queryable() .Where(x => x.OrderNo == orderNo && x.PalletCode == palletCode && x.CurrentBarcode == originalBarcode && x.Status == (int)OutLockStockStatusEnum.出库中) .FirstAsync(); if (lockInfo == null) { _logger.LogWarning($"未找到有效的锁定信息 - 订单: {orderNo}, 托盘: {palletCode}, 条码: {originalBarcode}"); return ValidationResult<(Dt_OutStockLockInfo, Dt_StockInfoDetail)>.Error("未找到有效的锁定信息"); } _logger.LogInformation($"找到锁定信息 - 分配数量: {lockInfo.AssignQuantity}, 已拣选: {lockInfo.PickedQty}, 订单数量: {lockInfo.OrderQuantity}"); // 获取订单明细 var orderDetail = await _outboundOrderDetailService.Db.Queryable() .FirstAsync(x => x.Id == lockInfo.OrderDetailId); if (orderDetail == null) { _logger.LogWarning($"未找到订单明细 - OrderDetailId: {lockInfo.OrderDetailId}"); return ValidationResult<(Dt_OutStockLockInfo, Dt_StockInfoDetail)>.Error("未找到订单明细"); } _logger.LogInformation($"找到订单明细 - 已分配数量: {orderDetail.AllocatedQuantity}, 锁定数量: {orderDetail.LockQuantity}"); // 获取库存信息 var stockDetail = await _stockInfoDetailService.Db.Queryable() .FirstAsync(x => x.Barcode == originalBarcode && x.StockId == lockInfo.StockId); if (stockDetail == null) { _logger.LogWarning($"未找到库存信息 - 条码: {originalBarcode}, StockId: {lockInfo.StockId}"); return ValidationResult<(Dt_OutStockLockInfo, Dt_StockInfoDetail)>.Error("未找到对应的库存信息"); } _logger.LogInformation($"找到库存信息 - 库存数量: {stockDetail.StockQuantity}, 出库数量: {stockDetail.OutboundQuantity}"); // 重要修复:验证拆包数量不能大于库存数量 if (stockDetail.StockQuantity < splitQuantity) { _logger.LogWarning($"拆包数量大于库存数量 - 拆包数量: {splitQuantity}, 库存数量: {stockDetail.StockQuantity}"); return ValidationResult<(Dt_OutStockLockInfo, Dt_StockInfoDetail)>.Error($"拆包数量不能大于库存数量,当前库存:{stockDetail.StockQuantity}"); } // 重要修复:验证拆包数量不能大于锁定信息的分配数量 if (lockInfo.AssignQuantity < splitQuantity) { _logger.LogWarning($"拆包数量大于分配数量 - 拆包数量: {splitQuantity}, 分配数量: {lockInfo.AssignQuantity}"); return ValidationResult<(Dt_OutStockLockInfo, Dt_StockInfoDetail)>.Error($"拆包数量不能大于分配数量,当前分配数量:{lockInfo.AssignQuantity}"); } // 重要修复:验证拆包数量不能大于锁定信息的未拣选数量 decimal remainingToPick = lockInfo.AssignQuantity - lockInfo.PickedQty; if (remainingToPick < splitQuantity) { _logger.LogWarning($"拆包数量大于未拣选数量 - 拆包数量: {splitQuantity}, 未拣选数量: {remainingToPick}"); return ValidationResult<(Dt_OutStockLockInfo, Dt_StockInfoDetail)>.Error($"拆包数量不能大于未拣选数量,当前未拣选:{remainingToPick}"); } // 重要修复:验证拆包后原锁定信息的分配数量不会为负数 if (lockInfo.AssignQuantity - splitQuantity < 0) { _logger.LogWarning($"拆包后分配数量为负数 - 当前分配数量: {lockInfo.AssignQuantity}, 拆包数量: {splitQuantity}"); return ValidationResult<(Dt_OutStockLockInfo, Dt_StockInfoDetail)>.Error($"拆包后分配数量不能为负数"); } // 重要修复:验证订单明细的分配数量是否足够 // 注意:手动拆包不会改变订单明细的分配数量,因为总分配数量不变 // 只是从一个锁定信息转移到另一个锁定信息 decimal totalLockAssignQuantity = await GetTotalLockAssignQuantity(orderDetail.Id); if (orderDetail.AllocatedQuantity != totalLockAssignQuantity) { _logger.LogWarning($"订单明细分配数量与锁定信息不一致 - 订单明细分配数量: {orderDetail.AllocatedQuantity}, 锁定信息总分配数量: {totalLockAssignQuantity}"); // 这里不直接返回错误,因为拆包操作本身不会导致不一致,只是记录警告 } _logger.LogInformation($"拆包验证通过 - 原条码: {originalBarcode}, 拆包数量: {splitQuantity}"); return ValidationResult<(Dt_OutStockLockInfo, Dt_StockInfoDetail)>.Success((lockInfo, stockDetail)); } /// /// 获取订单明细的所有锁定信息的总分配数量 /// private async Task GetTotalLockAssignQuantity(long orderDetailId) { var lockInfos = await _outStockLockInfoService.Db.Queryable() .Where(x => x.OrderDetailId == orderDetailId) .ToListAsync(); return lockInfos.Sum(x => x.AssignQuantity); } /// /// 执行手动拆包逻辑 - 增强分配数量控制 /// private async Task ExecuteManualSplitLogic(Dt_OutStockLockInfo lockInfo, Dt_StockInfoDetail stockDetail, decimal splitQuantity, string palletCode) { _logger.LogInformation($"开始执行手动拆包逻辑 - 原条码: {stockDetail.Barcode}, 拆包数量: {splitQuantity}"); // 重要修复:获取订单明细并验证分配数量 var orderDetail = await _outboundOrderDetailService.Db.Queryable() .FirstAsync(x => x.Id == lockInfo.OrderDetailId); if (orderDetail == null) throw new InvalidOperationException("未找到订单明细"); // 验证拆包数量不会导致分配数量为负数 if (lockInfo.AssignQuantity < splitQuantity) { throw new InvalidOperationException($"拆包数量超过锁定信息分配数量,拆包数量: {splitQuantity}, 分配数量: {lockInfo.AssignQuantity}"); } // 生成新条码 string newBarcode = await GenerateNewBarcode(); // 记录拆包前的分配数量 decimal originalAssignQtyBefore = lockInfo.AssignQuantity; decimal originalOrderQtyBefore = lockInfo.OrderQuantity; // 1. 创建新库存明细 var newStockDetail = new Dt_StockInfoDetail { StockId = stockDetail.StockId, MaterielCode = stockDetail.MaterielCode, OrderNo = stockDetail.OrderNo, BatchNo = stockDetail.BatchNo, StockQuantity = splitQuantity, OutboundQuantity = 0, Barcode = newBarcode, Status = (int)StockStatusEmun.出库锁定, SupplyCode = stockDetail.SupplyCode, Unit = stockDetail.Unit, BarcodeQty = stockDetail.BarcodeQty, BarcodeUnit = stockDetail.BarcodeUnit, BusinessType = stockDetail.BusinessType, InboundOrderRowNo = stockDetail.InboundOrderRowNo, }; await _stockInfoDetailService.Db.Insertable(newStockDetail).ExecuteCommandAsync(); _logger.LogInformation($"创建新库存明细 - 条码: {newBarcode}, 库存数量: {splitQuantity}"); // 2. 更新原库存明细 decimal originalStockQtyBefore = stockDetail.StockQuantity; stockDetail.StockQuantity -= splitQuantity; await _stockInfoDetailService.Db.Updateable(stockDetail).ExecuteCommandAsync(); _logger.LogInformation($"更新原库存明细 - 库存数量从 {originalStockQtyBefore} 减少到 {stockDetail.StockQuantity}"); // 3. 创建新锁定信息 var newLockInfo = new Dt_OutStockLockInfo { OrderNo = lockInfo.OrderNo, OrderDetailId = lockInfo.OrderDetailId, OutboundBatchNo = lockInfo.OutboundBatchNo, MaterielCode = lockInfo.MaterielCode, MaterielName = lockInfo.MaterielName, StockId = lockInfo.StockId, OrderQuantity = splitQuantity, AssignQuantity = splitQuantity, PickedQty = 0, LocationCode = lockInfo.LocationCode, PalletCode = lockInfo.PalletCode, TaskNum = lockInfo.TaskNum, Status = (int)OutLockStockStatusEnum.出库中, Unit = lockInfo.Unit, SupplyCode = lockInfo.SupplyCode, OrderType = lockInfo.OrderType, CurrentBarcode = newBarcode, IsSplitted = 1, ParentLockId = lockInfo.Id, Operator = App.User.UserName, FactoryArea = lockInfo.FactoryArea, lineNo = lockInfo.lineNo, WarehouseCode = lockInfo.WarehouseCode, BarcodeQty = lockInfo.BarcodeQty, BarcodeUnit = lockInfo.BarcodeUnit, }; await _outStockLockInfoService.Db.Insertable(newLockInfo).ExecuteCommandAsync(); _logger.LogInformation($"创建新锁定信息 - 条码: {newBarcode}, 分配数量: {splitQuantity}"); // 4. 更新原锁定信息 lockInfo.AssignQuantity -= splitQuantity; lockInfo.OrderQuantity -= splitQuantity; _logger.LogInformation($"更新原锁定信息 - 分配数量从 {originalAssignQtyBefore} 减少到 {lockInfo.AssignQuantity}"); _logger.LogInformation($"更新原锁定信息 - 订单数量从 {originalOrderQtyBefore} 减少到 {lockInfo.OrderQuantity}"); await _outStockLockInfoService.Db.Updateable(lockInfo).ExecuteCommandAsync(); // 重要修复:手动拆包不会改变订单明细的分配数量,因为总分配数量不变 // 只是从一个锁定信息转移到另一个锁定信息 _logger.LogInformation($"订单明细分配数量保持不变 - 已分配数量: {orderDetail.AllocatedQuantity}"); // 5. 记录拆包历史 await RecordSplitHistory(lockInfo, stockDetail, splitQuantity, newBarcode, false); _logger.LogInformation($"手动拆包逻辑执行完成"); return new SplitResultDto { NewBarcode = newBarcode }; } #endregion #endregion #region 取消拆包 /// /// 取消拆包 /// public async Task CancelSplitPackage(string orderNo, string palletCode, string newBarcode) { try { _unitOfWorkManage.BeginTran(); // 1. 查找拆包记录并验证 var validationResult = await ValidateCancelSplitRequest(orderNo, palletCode, newBarcode); if (!validationResult.IsValid) return WebResponseContent.Instance.Error(validationResult.ErrorMessage); var (splitRecord, newLockInfo, newStockDetail) = validationResult.Data; // 2. 查找原始锁定信息 var originalLockInfo = await _outStockLockInfoService.Db.Queryable() .FirstAsync(x => x.Id == splitRecord.OutStockLockInfoId); // 3. 检查该条码是否被再次拆包 var childSplitRecords = await _splitPackageService.Db.Queryable() .Where(x => x.OriginalBarcode == newBarcode && !x.IsReverted) .ToListAsync(); if (childSplitRecords.Any()) { return WebResponseContent.Instance.Error("该条码已被再次拆包,请先取消后续的拆包操作"); } // 4. 执行取消拆包逻辑 await ExecuteCancelSplitLogic(splitRecord, originalLockInfo, newLockInfo, newStockDetail); _unitOfWorkManage.CommitTran(); return WebResponseContent.Instance.OK("取消拆包成功"); } catch (Exception ex) { _unitOfWorkManage.RollbackTran(); _logger.LogError($"取消拆包失败 - OrderNo: {orderNo}, PalletCode: {palletCode}, Barcode: {newBarcode}, Error: {ex.Message}"); return WebResponseContent.Instance.Error($"取消拆包失败:{ex.Message}"); } } /// /// 执行取消拆包逻辑 /// private async Task ExecuteCancelSplitLogic(Dt_SplitPackageRecord splitRecord, Dt_OutStockLockInfo originalLockInfo, Dt_OutStockLockInfo newLockInfo, Dt_StockInfoDetail newStockDetail) { _logger.LogInformation($"开始执行取消拆包逻辑 - 原条码: {splitRecord.OriginalBarcode}, 新条码: {splitRecord.NewBarcode}, 拆包数量: {splitRecord.SplitQty}"); // 恢复原锁定信息 decimal originalAssignQtyBefore = originalLockInfo.AssignQuantity; decimal originalOrderQtyBefore = originalLockInfo.OrderQuantity; // 重要修复:恢复分配数量和订单数量 originalLockInfo.AssignQuantity += splitRecord.SplitQty; originalLockInfo.OrderQuantity += splitRecord.SplitQty; _logger.LogInformation($"恢复原锁定信息 - 分配数量从 {originalAssignQtyBefore} 增加到 {originalLockInfo.AssignQuantity}"); _logger.LogInformation($"恢复原锁定信息 - 订单数量从 {originalOrderQtyBefore} 增加到 {originalLockInfo.OrderQuantity}"); // 如果原锁定信息的状态是拣选完成,需要重新设置为出库中 if (originalLockInfo.Status == (int)OutLockStockStatusEnum.拣选完成) { originalLockInfo.Status = (int)OutLockStockStatusEnum.出库中; _logger.LogInformation($"原锁定信息状态从拣选完成恢复为出库中"); } await _outStockLockInfoService.Db.Updateable(originalLockInfo).ExecuteCommandAsync(); // 恢复原库存明细 var originalStock = await _stockInfoDetailService.Db.Queryable() .FirstAsync(x => x.Barcode == splitRecord.OriginalBarcode && x.StockId == splitRecord.StockId); if (originalStock != null) { decimal originalStockQtyBefore = originalStock.StockQuantity; originalStock.StockQuantity += splitRecord.SplitQty; _logger.LogInformation($"恢复原库存明细 - 库存数量从 {originalStockQtyBefore} 增加到 {originalStock.StockQuantity}"); // 如果原库存状态是出库完成,需要重新设置为出库锁定 if (originalStock.Status == (int)StockStatusEmun.出库完成) { originalStock.Status = (int)StockStatusEmun.出库锁定; _logger.LogInformation($"原库存状态从出库完成恢复为出库锁定"); } await _stockInfoDetailService.Db.Updateable(originalStock).ExecuteCommandAsync(); } // 删除新锁定信息 _logger.LogInformation($"删除新锁定信息 - 条码: {newLockInfo.CurrentBarcode}, 分配数量: {newLockInfo.AssignQuantity}"); await _outStockLockInfoService.Db.Deleteable() .Where(x => x.Id == newLockInfo.Id) .ExecuteCommandAsync(); // 删除新库存明细 _logger.LogInformation($"删除新库存明细 - 条码: {newStockDetail.Barcode}, 库存数量: {newStockDetail.StockQuantity}"); await _stockInfoDetailService.Db.Deleteable() .Where(x => x.Barcode == newLockInfo.CurrentBarcode) .ExecuteCommandAsync(); // 标记拆包记录为已撤销 splitRecord.IsReverted = true; splitRecord.RevertTime = DateTime.Now; splitRecord.RevertOperator = App.User.UserName; await _splitPackageService.Db.Updateable(splitRecord).ExecuteCommandAsync(); _logger.LogInformation($"标记拆包记录为已撤销"); // 检查并更新批次和订单状态 await CheckAndUpdateBatchStatus(originalLockInfo.BatchNo); await CheckAndUpdateOrderStatus(originalLockInfo.OrderNo); _logger.LogInformation($"取消拆包逻辑执行完成"); } /// /// 验证取消拆包请求 /// private async Task> ValidateCancelSplitRequest( string orderNo, string palletCode, string newBarcode) { _logger.LogInformation($"开始验证取消拆包请求 - 订单: {orderNo}, 托盘: {palletCode}, 条码: {newBarcode}"); // 查找拆包记录 var splitRecord = await _splitPackageService.Db.Queryable() .Where(x => x.NewBarcode == newBarcode && x.OrderNo == orderNo && !x.IsReverted) .FirstAsync(); if (splitRecord == null) return ValidationResult<(Dt_SplitPackageRecord, Dt_OutStockLockInfo, Dt_StockInfoDetail)>.Error("未找到拆包记录"); _logger.LogInformation($"找到拆包记录 - 原条码: {splitRecord.OriginalBarcode}, 新条码: {splitRecord.NewBarcode}, 拆包数量: {splitRecord.SplitQty}"); // 查找新锁定信息 var newLockInfo = await _outStockLockInfoService.Db.Queryable() .Where(x => x.CurrentBarcode == newBarcode && x.PalletCode == palletCode && x.OrderNo == orderNo) .FirstAsync(); if (newLockInfo == null) return ValidationResult<(Dt_SplitPackageRecord, Dt_OutStockLockInfo, Dt_StockInfoDetail)>.Error("未找到新锁定信息"); _logger.LogInformation($"找到新锁定信息 - 状态: {newLockInfo.Status}, 已拣选: {newLockInfo.PickedQty}, 分配数量: {newLockInfo.AssignQuantity}"); // 重要修复:检查新条码是否已被分拣 var newBarcodePickingRecords = await Db.Queryable() .Where(x => x.Barcode == newBarcode && x.OrderNo == orderNo && !x.IsCancelled) .ToListAsync(); if (newBarcodePickingRecords.Any()) { var totalPickedQty = newBarcodePickingRecords.Sum(x => x.PickQuantity); _logger.LogWarning($"新条码 {newBarcode} 已被分拣,总拣选数量: {totalPickedQty}"); return ValidationResult<(Dt_SplitPackageRecord, Dt_OutStockLockInfo, Dt_StockInfoDetail)>.Error( $"新条码已被分拣(已拣选数量:{totalPickedQty}),请先取消分拣,然后再取消拆包"); } // 重要修复:检查原条码是否已被分拣 var originalBarcodePickingRecords = await Db.Queryable() .Where(x => x.Barcode == splitRecord.OriginalBarcode && x.OrderNo == orderNo && !x.IsCancelled) .ToListAsync(); if (originalBarcodePickingRecords.Any()) { var totalPickedQty = originalBarcodePickingRecords.Sum(x => x.PickQuantity); _logger.LogWarning($"原条码 {splitRecord.OriginalBarcode} 已被分拣,总拣选数量: {totalPickedQty}"); return ValidationResult<(Dt_SplitPackageRecord, Dt_OutStockLockInfo, Dt_StockInfoDetail)>.Error( $"原条码已被分拣(已拣选数量:{totalPickedQty}),请先取消分拣,然后再取消拆包"); } _logger.LogInformation($"新旧条码均未被分拣,可以取消拆包"); // 检查新条码是否被再次拆包 var childSplitRecords = await _splitPackageService.Db.Queryable() .Where(x => x.OriginalBarcode == newBarcode && !x.IsReverted) .ToListAsync(); if (childSplitRecords.Any()) { var childBarcodes = string.Join(", ", childSplitRecords.Select(x => x.NewBarcode)); _logger.LogWarning($"条码 {newBarcode} 已被再次拆包,生成的新条码: {childBarcodes}"); return ValidationResult<(Dt_SplitPackageRecord, Dt_OutStockLockInfo, Dt_StockInfoDetail)>.Error( $"该条码已被再次拆包,生成的新条码:{childBarcodes},请先取消后续拆包"); } var newStockDetail = await _stockInfoDetailService.Db.Queryable() .FirstAsync(x => x.Barcode == newBarcode); if (newStockDetail == null) return ValidationResult<(Dt_SplitPackageRecord, Dt_OutStockLockInfo, Dt_StockInfoDetail)>.Error("未找到新库存明细"); _logger.LogInformation($"取消拆包验证通过 - 条码: {newBarcode}"); return ValidationResult<(Dt_SplitPackageRecord, Dt_OutStockLockInfo, Dt_StockInfoDetail)>.Success((splitRecord, newLockInfo, newStockDetail)); } #endregion #region 批量取消拆包链 /// /// 批量取消拆包链 - 取消某个条码及其所有后续拆包 /// public async Task CancelSplitPackageChain(string orderNo, string palletCode, string startBarcode) { try { _unitOfWorkManage.BeginTran(); // 1. 查找所有相关的拆包记录(形成拆包链) var splitChain = await GetSplitPackageChain(orderNo, startBarcode); if (!splitChain.Any()) return WebResponseContent.Instance.Error("未找到拆包记录"); _logger.LogInformation($"找到拆包链,共 {splitChain.Count} 条记录"); // 2. 收集拆包链中涉及的所有条码(包括原条码和新条码) var allBarcodesInChain = new List { startBarcode }; allBarcodesInChain.AddRange(splitChain.Select(x => x.NewBarcode)); // 3. 检查拆包链中是否有已被分拣的条码 var pickedBarcodesInfo = await GetPickedBarcodesInfo(orderNo, allBarcodesInChain); if (pickedBarcodesInfo.Any()) { var pickedBarcodes = string.Join(", ", pickedBarcodesInfo.Select(x => $"{x.Barcode}(已拣选{x.PickedQty})")); return WebResponseContent.Instance.Error( $"以下条码已被分拣,请先取消分拣:{pickedBarcodes}"); } // 4. 按拆包顺序倒序取消(从最新的开始取消) var reversedChain = splitChain.OrderByDescending(x => x.SplitTime).ToList(); foreach (var splitRecord in reversedChain) { _logger.LogInformation($"取消拆包记录 - 原条码: {splitRecord.OriginalBarcode}, 新条码: {splitRecord.NewBarcode}"); await CancelSingleSplitPackage(splitRecord, palletCode); } _unitOfWorkManage.CommitTran(); return WebResponseContent.Instance.OK($"成功取消拆包链,共{reversedChain.Count}次拆包操作"); } catch (Exception ex) { _unitOfWorkManage.RollbackTran(); _logger.LogError($"取消拆包链失败 - OrderNo: {orderNo}, StartBarcode: {startBarcode}, Error: {ex.Message}"); return WebResponseContent.Instance.Error($"取消拆包链失败:{ex.Message}"); } } /// /// 获取条码的拆包和拣选状态 /// public async Task GetBarcodeSplitAndPickStatus(string orderNo, string barcode) { try { // 1. 获取拆包信息 var splitChain = await GetSplitPackageChain(orderNo, barcode); var isOriginalBarcode = !splitChain.Any(x => x.NewBarcode == barcode); // 2. 获取拣选信息 var pickingRecords = await Db.Queryable() .Where(x => x.Barcode == barcode && x.OrderNo == orderNo && !x.IsCancelled) .ToListAsync(); var totalPickedQty = pickingRecords.Sum(x => x.PickQuantity); // 3. 获取锁定信息 var lockInfo = await _outStockLockInfoService.Db.Queryable() .Where(x => x.CurrentBarcode == barcode && x.OrderNo == orderNo) .FirstAsync(); // 4. 获取库存信息 var stockDetail = await _stockInfoDetailService.Db.Queryable() .Where(x => x.Barcode == barcode) .FirstAsync(); var statusInfo = new BarcodeStatusInfoDto { Barcode = barcode, OrderNo = orderNo, IsOriginalBarcode = isOriginalBarcode, SplitChainCount = splitChain.Count, HasBeenPicked = pickingRecords.Any(), TotalPickedQuantity = totalPickedQty, PickRecordCount = pickingRecords.Count, LockInfoStatus = lockInfo?.Status ?? 0, LockInfoPickedQty = lockInfo?.PickedQty ?? 0, LockInfoAssignQty = lockInfo?.AssignQuantity ?? 0, StockQuantity = stockDetail?.StockQuantity ?? 0, StockStatus = stockDetail?.Status ?? 0, CanCancelSplit = !pickingRecords.Any(), // 未被分拣才能取消拆包 NeedCancelPickFirst = pickingRecords.Any() // 需要先取消分拣 }; // 5. 获取操作建议 statusInfo.OperationSuggestions = GetOperationSuggestions(statusInfo); return WebResponseContent.Instance.OK("获取状态成功", statusInfo); } catch (Exception ex) { _logger.LogError($"获取条码状态失败 - OrderNo: {orderNo}, Barcode: {barcode}, Error: {ex.Message}"); return WebResponseContent.Instance.Error("获取条码状态失败"); } } /// /// 获取操作建议 /// private List GetOperationSuggestions(BarcodeStatusInfoDto statusInfo) { var suggestions = new List(); if (statusInfo.HasBeenPicked) { suggestions.Add($"该条码已被分拣(数量:{statusInfo.TotalPickedQuantity}),如需取消拆包,请先取消分拣"); if (statusInfo.IsOriginalBarcode) { suggestions.Add("这是原条码,取消分拣后将恢复为可分拣状态"); } else { suggestions.Add("这是拆包生成的新条码,取消分拣后才能取消拆包"); } } else { if (statusInfo.IsOriginalBarcode && statusInfo.SplitChainCount > 0) { suggestions.Add("这是原条码,可以取消拆包链"); } else if (!statusInfo.IsOriginalBarcode) { suggestions.Add("这是拆包生成的新条码,可以单独取消拆包"); } } if (statusInfo.LockInfoStatus == (int)OutLockStockStatusEnum.拣选完成) { suggestions.Add("锁定状态:拣选完成"); } else if (statusInfo.LockInfoStatus == (int)OutLockStockStatusEnum.出库中) { suggestions.Add("锁定状态:出库中"); } return suggestions; } /// /// 获取已被分拣的条码信息 /// private async Task> GetPickedBarcodesInfo(string orderNo, List barcodes) { var pickedBarcodes = new List(); foreach (var barcode in barcodes) { var pickingRecords = await Db.Queryable() .Where(x => x.Barcode == barcode && x.OrderNo == orderNo && !x.IsCancelled) .ToListAsync(); if (pickingRecords.Any()) { var totalPickedQty = pickingRecords.Sum(x => x.PickQuantity); pickedBarcodes.Add(new PickedBarcodeInfo { Barcode = barcode, PickedQty = totalPickedQty, PickRecordCount = pickingRecords.Count }); } } return pickedBarcodes; } /// /// 获取拆包链 - 查找某个条码的所有拆包记录(包括后续拆包) /// public async Task> GetSplitPackageChain(string orderNo, string startBarcode) { var allSplitRecords = new List(); var visitedBarcodes = new HashSet(); // 防止循环引用 // 使用队列进行广度优先搜索 var queue = new Queue(); queue.Enqueue(startBarcode); visitedBarcodes.Add(startBarcode); while (queue.Count > 0) { var currentBarcode = queue.Dequeue(); // 查找以当前条码为原条码的所有拆包记录 var splitRecords = await _splitPackageService.Db.Queryable() .Where(x => x.OriginalBarcode == currentBarcode && x.OrderNo == orderNo && !x.IsReverted) .ToListAsync(); foreach (var record in splitRecords) { // 避免重复处理 if (!visitedBarcodes.Contains(record.NewBarcode)) { allSplitRecords.Add(record); queue.Enqueue(record.NewBarcode); visitedBarcodes.Add(record.NewBarcode); } } } return allSplitRecords; } /// /// 取消单个拆包记录 /// private async Task CancelSingleSplitPackage(Dt_SplitPackageRecord splitRecord, string palletCode) { _logger.LogInformation($"开始取消单个拆包记录 - 原条码: {splitRecord.OriginalBarcode}, 新条码: {splitRecord.NewBarcode}"); // 再次验证分拣状态(防止并发操作) var newBarcodePickingRecords = await Db.Queryable() .Where(x => x.Barcode == splitRecord.NewBarcode && !x.IsCancelled) .ToListAsync(); if (newBarcodePickingRecords.Any()) { throw new InvalidOperationException($"新条码 {splitRecord.NewBarcode} 在验证后被分拣,无法取消拆包"); } var originalBarcodePickingRecords = await Db.Queryable() .Where(x => x.Barcode == splitRecord.OriginalBarcode && !x.IsCancelled) .ToListAsync(); if (originalBarcodePickingRecords.Any()) { throw new InvalidOperationException($"原条码 {splitRecord.OriginalBarcode} 在验证后被分拣,无法取消拆包"); } // 查找相关数据 var newLockInfo = await _outStockLockInfoService.Db.Queryable() .Where(x => x.CurrentBarcode == splitRecord.NewBarcode && x.PalletCode == palletCode) .FirstAsync(); var newStockDetail = await _stockInfoDetailService.Db.Queryable() .FirstAsync(x => x.Barcode == splitRecord.NewBarcode); var originalLockInfo = await _outStockLockInfoService.Db.Queryable() .FirstAsync(x => x.Id == splitRecord.OutStockLockInfoId); // 执行取消逻辑 await ExecuteCancelSplitLogic(splitRecord, originalLockInfo, newLockInfo, newStockDetail); _logger.LogInformation($"取消单个拆包记录完成 - 原条码: {splitRecord.OriginalBarcode}, 新条码: {splitRecord.NewBarcode}"); } #endregion #region 拆包信息查询增强 /// /// 获取拆包链信息 /// public async Task GetSplitPackageChainInfo(string orderNo, string barcode) { try { var splitChain = await GetSplitPackageChain(orderNo, barcode); var chainInfo = new SplitPackageChainInfoDto { OriginalBarcode = barcode, TotalSplitTimes = splitChain.Count, SplitChain = splitChain.Select(x => new SplitChainItemDto { SplitTime = x.SplitTime, OriginalBarcode = x.OriginalBarcode, NewBarcode = x.NewBarcode, SplitQuantity = x.SplitQty, Operator = x.Operator, IsReverted = x.IsReverted , IsAutoSplit = x.IsAutoSplit }).ToList() }; return WebResponseContent.Instance.OK("获取成功", chainInfo); } catch (Exception ex) { _logger.LogError($"获取拆包链信息失败 - OrderNo: {orderNo}, Barcode: {barcode}, Error: {ex.Message}"); return WebResponseContent.Instance.Error("获取拆包链信息失败"); } } /// /// 查找根条码 /// public async Task FindRootBarcode(string orderNo, string startBarcode) { var currentBarcode = startBarcode; var visited = new HashSet(); while (!string.IsNullOrEmpty(currentBarcode) && !visited.Contains(currentBarcode)) { visited.Add(currentBarcode); // 查找当前条码是否是由其他条码拆包而来 var parentRecord = await _splitPackageService.Db.Queryable() .Where(x => x.NewBarcode == currentBarcode && x.OrderNo == orderNo && !x.IsReverted) .FirstAsync(); if (parentRecord == null) { // 没有父级拆包记录,说明这是根条码 return currentBarcode; } currentBarcode = parentRecord.OriginalBarcode; } // 如果出现循环引用,返回起始条码 return startBarcode; } #endregion #region 更新批次状态检查 /// /// 检查并更新批次状态 /// private async Task CheckAndUpdateBatchStatus(string batchNo) { var batch = await _outboundBatchRepository.Db.Queryable() .FirstAsync(x => x.BatchNo == batchNo); if (batch != null) { // 重新计算批次完成数量 var batchLocks = await _outStockLockInfoService.Db.Queryable() .Where(x => x.BatchNo == batchNo) .ToListAsync(); var completedQuantity = batchLocks.Where(x => x.Status == (int)OutLockStockStatusEnum.拣选完成) .Sum(x => x.PickedQty); batch.CompletedQuantity = completedQuantity; // 更新批次状态 if (batch.CompletedQuantity >= batch.BatchQuantity) { batch.BatchStatus = (int)BatchStatusEnum.已完成; } else if (batch.CompletedQuantity > 0) { batch.BatchStatus = (int)BatchStatusEnum.执行中; } else { batch.BatchStatus = (int)BatchStatusEnum.分配中; } await _outboundBatchRepository.Db.Updateable(batch).ExecuteCommandAsync(); } } #endregion #region 分批回库 /// /// 分批回库 - 释放未拣选的库存 /// public async Task BatchReturnStock(string orderNo, string palletCode) { try { _unitOfWorkManage.BeginTran(); // 查找托盘上未完成的锁定记录(只处理出库中的记录) var unfinishedLocks = await _outStockLockInfoService.Db.Queryable() .Where(x => x.OrderNo == orderNo && x.PalletCode == palletCode && x.Status == (int)OutLockStockStatusEnum.出库中) .ToListAsync(); if (!unfinishedLocks.Any()) return WebResponseContent.Instance.Error("该托盘没有未完成的锁定记录"); // 按出库批次分组处理 var batchGroups = unfinishedLocks.GroupBy(x => x.OutboundBatchNo); // 使用 OutboundBatchNo foreach (var batchGroup in batchGroups) { var outboundBatchNo = batchGroup.Key; var batchLocks = batchGroup.ToList(); // 释放库存和锁定记录 foreach (var lockInfo in batchLocks) { await ReleaseLockAndStock(lockInfo); } // 更新批次状态 await UpdateBatchStatusForReturn(outboundBatchNo, batchLocks); // 更新订单明细的已分配数量 await UpdateOrderDetailAfterReturn(batchLocks); } _unitOfWorkManage.CommitTran(); return WebResponseContent.Instance.OK("分批回库成功"); } catch (Exception ex) { _unitOfWorkManage.RollbackTran(); _logger.LogError($"分批回库失败 - OrderNo: {orderNo}, PalletCode: {palletCode}, Error: {ex.Message}"); return WebResponseContent.Instance.Error($"分批回库失败:{ex.Message}"); } } #endregion #region 验证方法 private async Task> ValidatePickingRequest( string orderNo, string palletCode, string barcode) { _logger.LogInformation($"开始验证分拣请求 - 订单: {orderNo}, 托盘: {palletCode}, 条码: {barcode}"); // 查找锁定信息 var lockInfo = await _outStockLockInfoService.Db.Queryable() .Where(x => x.OrderNo == orderNo && x.PalletCode == palletCode && x.CurrentBarcode == barcode && x.Status == (int)OutLockStockStatusEnum.出库中) .FirstAsync(); if (lockInfo == null) return ValidationResult<(Dt_OutStockLockInfo, Dt_OutboundOrderDetail, Dt_StockInfoDetail, Dt_OutboundBatch)>.Error("未找到有效的锁定信息"); _logger.LogInformation($"找到锁定信息 - 分配数量: {lockInfo.AssignQuantity}, 已拣选: {lockInfo.PickedQty}"); // 检查是否已经分拣完成 if (lockInfo.PickedQty >= lockInfo.AssignQuantity) return ValidationResult<(Dt_OutStockLockInfo, Dt_OutboundOrderDetail, Dt_StockInfoDetail, Dt_OutboundBatch)>.Error("该条码已分拣完成"); // 获取关联数据 var orderDetail = await _outboundOrderDetailService.Db.Queryable() .FirstAsync(x => x.Id == lockInfo.OrderDetailId); if (orderDetail == null) return ValidationResult<(Dt_OutStockLockInfo, Dt_OutboundOrderDetail, Dt_StockInfoDetail, Dt_OutboundBatch)>.Error("未找到订单明细"); _logger.LogInformation($"找到订单明细 - 已分配数量: {orderDetail.AllocatedQuantity}, 锁定数量: {orderDetail.LockQuantity}"); // 重要修复:检查订单明细的已分配数量是否足够 decimal remainingToPick = lockInfo.AssignQuantity - lockInfo.PickedQty; if (orderDetail.AllocatedQuantity < remainingToPick) { _logger.LogWarning($"订单明细已分配数量不足 - 需要拣选: {remainingToPick}, 可用分配数量: {orderDetail.AllocatedQuantity}"); return ValidationResult<(Dt_OutStockLockInfo, Dt_OutboundOrderDetail, Dt_StockInfoDetail, Dt_OutboundBatch)>.Error( $"订单明细分配数量不足,需要拣选:{remainingToPick},可用分配数量:{orderDetail.AllocatedQuantity}"); } // 重要修复:检查锁定数量是否足够 if (orderDetail.LockQuantity < remainingToPick) { _logger.LogWarning($"订单明细锁定数量不足 - 需要拣选: {remainingToPick}, 可用锁定数量: {orderDetail.LockQuantity}"); return ValidationResult<(Dt_OutStockLockInfo, Dt_OutboundOrderDetail, Dt_StockInfoDetail, Dt_OutboundBatch)>.Error( $"订单明细锁定数量不足,需要拣选:{remainingToPick},可用锁定数量:{orderDetail.LockQuantity}"); } var stockDetail = await _stockInfoDetailService.Db.Queryable() .FirstAsync(x => x.Barcode == barcode && x.StockId == lockInfo.StockId); if (stockDetail == null) return ValidationResult<(Dt_OutStockLockInfo, Dt_OutboundOrderDetail, Dt_StockInfoDetail, Dt_OutboundBatch)>.Error("未找到对应的库存信息"); // 验证库存数量 if (stockDetail.StockQuantity < remainingToPick) return ValidationResult<(Dt_OutStockLockInfo, Dt_OutboundOrderDetail, Dt_StockInfoDetail, Dt_OutboundBatch)>.Error( $"库存数量不足,需要拣选:{remainingToPick},实际库存:{stockDetail.StockQuantity}"); // 验证库存状态 if (stockDetail.Status != (int)StockStatusEmun.出库锁定) { return ValidationResult<(Dt_OutStockLockInfo, Dt_OutboundOrderDetail, Dt_StockInfoDetail, Dt_OutboundBatch)>.Error( $"库存状态异常,当前状态:{stockDetail.Status},期望状态:出库锁定"); } // 使用 OutboundBatchNo 查找批次 var batch = await _outboundBatchRepository.Db.Queryable() .FirstAsync(x => x.BatchNo == lockInfo.OutboundBatchNo); _logger.LogInformation($"分拣验证通过 - 条码: {barcode}, 剩余需拣选: {remainingToPick}, 可用库存: {stockDetail.StockQuantity}"); return ValidationResult<(Dt_OutStockLockInfo, Dt_OutboundOrderDetail, Dt_StockInfoDetail, Dt_OutboundBatch)>.Success((lockInfo, orderDetail, stockDetail, batch)); } /// /// 检查并执行自动拆包(如果需要) /// private async Task CheckAndAutoSplitIfNeeded(Dt_OutStockLockInfo lockInfo, Dt_StockInfoDetail stockDetail, string palletCode) { // 检查是否需要自动拆包的条件: // 1. 库存数量大于分配数量 // 2. 锁定信息状态为出库中 // 3. 未拣选数量等于分配数量(表示还未开始拣选) bool needAutoSplit = stockDetail.StockQuantity > lockInfo.AssignQuantity && lockInfo.Status == (int)OutLockStockStatusEnum.出库中 && lockInfo.PickedQty == 0; if (!needAutoSplit) return null; // 计算拆包数量 = 库存数量 - 分配数量 decimal splitQuantity = stockDetail.StockQuantity - lockInfo.AssignQuantity; // 执行自动拆包 var splitResult = await ExecuteAutoSplitLogic(lockInfo, stockDetail, splitQuantity, palletCode); return new AutoSplitResult { NewBarcode = splitResult.NewBarcode, SplitQuantity = splitQuantity }; } /// /// 执行自动拆包逻辑 /// private async Task ExecuteAutoSplitLogic(Dt_OutStockLockInfo lockInfo, Dt_StockInfoDetail stockDetail, decimal splitQuantity, string palletCode) { _logger.LogInformation($"开始执行自动拆包逻辑 - 原条码: {stockDetail.Barcode}, 拆包数量: {splitQuantity}"); // 生成新条码 string newBarcode = await GenerateNewBarcode(); // 重要修复:记录拆包前的分配数量 decimal originalAssignQtyBefore = lockInfo.AssignQuantity; decimal originalOrderQtyBefore = lockInfo.OrderQuantity; // 1. 创建新库存明细(剩余部分) var newStockDetail = new Dt_StockInfoDetail { StockId = stockDetail.StockId, MaterielCode = stockDetail.MaterielCode, OrderNo = stockDetail.OrderNo, BatchNo = stockDetail.BatchNo, StockQuantity = splitQuantity, OutboundQuantity = 0, Barcode = newBarcode, Status = (int)StockStatusEmun.出库锁定, SupplyCode = stockDetail.SupplyCode, Unit = stockDetail.Unit, BarcodeQty = stockDetail.BarcodeQty, BarcodeUnit = stockDetail.BarcodeUnit, BusinessType = stockDetail.BusinessType, InboundOrderRowNo = stockDetail.InboundOrderRowNo, }; await _stockInfoDetailService.Db.Insertable(newStockDetail).ExecuteCommandAsync(); _logger.LogInformation($"创建新库存明细 - 条码: {newBarcode}, 库存数量: {splitQuantity}"); // 2. 更新原库存明细 // 重要修复:原库存数量设置为分配数量(保持不变) decimal originalStockQtyBefore = stockDetail.StockQuantity; // 注意:自动拆包时,原库存数量保持不变,因为我们要分拣的就是分配数量 // stockDetail.StockQuantity 保持不变 _logger.LogInformation($"原库存明细保持不变 - 库存数量: {stockDetail.StockQuantity}"); // 3. 创建新锁定信息(剩余部分) var newLockInfo = new Dt_OutStockLockInfo { OrderNo = lockInfo.OrderNo, OrderDetailId = lockInfo.OrderDetailId, OutboundBatchNo = lockInfo.OutboundBatchNo, MaterielCode = lockInfo.MaterielCode, MaterielName = lockInfo.MaterielName, StockId = lockInfo.StockId, OrderQuantity = splitQuantity, AssignQuantity = splitQuantity, PickedQty = 0, LocationCode = lockInfo.LocationCode, PalletCode = lockInfo.PalletCode, TaskNum = lockInfo.TaskNum, Status = (int)OutLockStockStatusEnum.出库中, Unit = lockInfo.Unit, SupplyCode = lockInfo.SupplyCode, OrderType = lockInfo.OrderType, CurrentBarcode = newBarcode, IsSplitted = 1, ParentLockId = lockInfo.Id, Operator = App.User.UserName, FactoryArea = lockInfo.FactoryArea, lineNo = lockInfo.lineNo, WarehouseCode = lockInfo.WarehouseCode, BarcodeQty = lockInfo.BarcodeQty, BarcodeUnit = lockInfo.BarcodeUnit, }; await _outStockLockInfoService.Db.Insertable(newLockInfo).ExecuteCommandAsync(); _logger.LogInformation($"创建新锁定信息 - 条码: {newBarcode}, 分配数量: {splitQuantity}"); // 4. 重要修复:自动拆包时,原锁定信息的分配数量保持不变 // 因为自动拆包后,原条码仍然需要被分拣,分配数量不应该改变 _logger.LogInformation($"原锁定信息保持不变 - 分配数量: {lockInfo.AssignQuantity}, 订单数量: {lockInfo.OrderQuantity}"); // 5. 记录拆包历史 await RecordSplitHistory(lockInfo, stockDetail, splitQuantity, newBarcode, true, originalStockQtyBefore); _logger.LogInformation($"自动拆包逻辑执行完成"); return new SplitResultDto { NewBarcode = newBarcode }; } #endregion #region 核心逻辑方法 private async Task ExecutePickingLogic( Dt_OutStockLockInfo lockInfo, Dt_OutboundOrderDetail orderDetail, Dt_StockInfoDetail stockDetail, decimal actualPickedQty) { _logger.LogInformation($"开始执行分拣逻辑 - 条码: {stockDetail.Barcode}, 分配数量: {lockInfo.AssignQuantity}, 实际拣选: {actualPickedQty}"); // 重要修复:再次验证订单明细的分配数量(防止并发操作) if (orderDetail.AllocatedQuantity < actualPickedQty) { throw new InvalidOperationException($"订单明细分配数量不足,需要拣选 {actualPickedQty},可用分配数量 {orderDetail.AllocatedQuantity}"); } if (orderDetail.LockQuantity < actualPickedQty) { throw new InvalidOperationException($"订单明细锁定数量不足,需要拣选 {actualPickedQty},可用锁定数量 {orderDetail.LockQuantity}"); } // 1. 更新锁定信息 lockInfo.PickedQty += actualPickedQty; _logger.LogInformation($"更新锁定信息 - 已拣选数量从 {lockInfo.PickedQty - actualPickedQty} 增加到 {lockInfo.PickedQty}"); // 准确判断拣选完成状态 if (Math.Abs(lockInfo.PickedQty - lockInfo.AssignQuantity) < 0.001m) { lockInfo.Status = (int)OutLockStockStatusEnum.拣选完成; _logger.LogInformation($"锁定信息状态更新为拣选完成"); } else if (lockInfo.PickedQty > 0) { lockInfo.Status = (int)OutLockStockStatusEnum.出库中; _logger.LogInformation($"锁定信息状态保持为出库中(部分拣选)"); } lockInfo.Operator = App.User.UserName; await _outStockLockInfoService.Db.Updateable(lockInfo).ExecuteCommandAsync(); // 2. 更新库存信息 decimal originalStockQty = stockDetail.StockQuantity; decimal originalOutboundQty = stockDetail.OutboundQuantity; stockDetail.StockQuantity -= actualPickedQty; stockDetail.OutboundQuantity += actualPickedQty; _logger.LogInformation($"更新库存信息 - 库存数量从 {originalStockQty} 减少到 {stockDetail.StockQuantity}"); _logger.LogInformation($"更新库存信息 - 出库数量从 {originalOutboundQty} 增加到 {stockDetail.OutboundQuantity}"); // 准确判断库存状态 if (stockDetail.StockQuantity <= 0) { stockDetail.Status = (int)StockStatusEmun.出库完成; _logger.LogInformation($"库存状态更新为出库完成"); } else { stockDetail.Status = (int)StockStatusEmun.出库锁定; _logger.LogInformation($"库存状态保持为出库锁定"); } await _stockInfoDetailService.Db.Updateable(stockDetail).ExecuteCommandAsync(); _logger.LogInformation($"分拣逻辑执行完成 - 条码: {stockDetail.Barcode}"); return new PickingResult { FinalLockInfo = lockInfo, ActualPickedQty = actualPickedQty }; } private async Task RevertPickingData(Dt_PickingRecord pickingRecord) { _logger.LogInformation($"开始恢复拣选数据 - 拣选记录ID: {pickingRecord.Id}, 条码: {pickingRecord.Barcode}, 拣选数量: {pickingRecord.PickQuantity}"); // 1. 恢复锁定信息 var lockInfo = await _outStockLockInfoService.Db.Queryable() .FirstAsync(x => x.Id == pickingRecord.OutStockLockId); if (lockInfo == null) { throw new InvalidOperationException($"未找到对应的锁定信息,ID: {pickingRecord.OutStockLockId}"); } decimal originalPickedQty = lockInfo.PickedQty; decimal originalAssignQty = lockInfo.AssignQuantity; // 记录原始分配数量 // 重要修复:只恢复已拣选数量,不修改分配数量 lockInfo.PickedQty -= pickingRecord.PickQuantity; // 确保已拣选数量不会为负数 if (lockInfo.PickedQty < 0) { _logger.LogWarning($"已拣选数量出现负数,重置为0。原值: {lockInfo.PickedQty + pickingRecord.PickQuantity}, 恢复数量: {pickingRecord.PickQuantity}"); lockInfo.PickedQty = 0; } _logger.LogInformation($"恢复锁定信息 - 已拣选数量从 {originalPickedQty} 减少到 {lockInfo.PickedQty}"); _logger.LogInformation($"锁定信息分配数量保持不变: {originalAssignQty}"); // 恢复锁定状态 if (lockInfo.PickedQty <= 0) { lockInfo.Status = (int)OutLockStockStatusEnum.出库中; _logger.LogInformation($"锁定信息状态恢复为出库中"); } else if (lockInfo.PickedQty < lockInfo.AssignQuantity) { lockInfo.Status = (int)OutLockStockStatusEnum.出库中; // 部分拣选状态 _logger.LogInformation($"锁定信息状态恢复为出库中(部分拣选)"); } await _outStockLockInfoService.Db.Updateable(lockInfo).ExecuteCommandAsync(); // 2. 恢复库存信息 var stockDetail = await _stockInfoDetailService.Db.Queryable() .FirstAsync(x => x.Barcode == pickingRecord.Barcode); if (stockDetail == null) { throw new InvalidOperationException($"未找到对应的库存信息,条码: {pickingRecord.Barcode}"); } decimal originalStockQty = stockDetail.StockQuantity; decimal originalOutboundQty = stockDetail.OutboundQuantity; stockDetail.StockQuantity += pickingRecord.PickQuantity; stockDetail.OutboundQuantity -= pickingRecord.PickQuantity; // 确保出库数量不会为负数 if (stockDetail.OutboundQuantity < 0) { _logger.LogWarning($"出库数量出现负数,重置为0。原值: {stockDetail.OutboundQuantity + pickingRecord.PickQuantity}, 恢复数量: {pickingRecord.PickQuantity}"); stockDetail.OutboundQuantity = 0; } _logger.LogInformation($"恢复库存信息 - 库存数量从 {originalStockQty} 增加到 {stockDetail.StockQuantity}"); _logger.LogInformation($"恢复库存信息 - 出库数量从 {originalOutboundQty} 减少到 {stockDetail.OutboundQuantity}"); // 恢复库存状态 if (stockDetail.StockQuantity > 0) { stockDetail.Status = (int)StockStatusEmun.出库锁定; _logger.LogInformation($"库存状态恢复为出库锁定"); } await _stockInfoDetailService.Db.Updateable(stockDetail).ExecuteCommandAsync(); _logger.LogInformation($"恢复拣选数据完成 - 条码: {pickingRecord.Barcode}"); return new RevertPickingResult { LockInfo = lockInfo, StockDetail = stockDetail }; } #endregion #region 数据更新方法 private async Task UpdateBatchAndOrderData(Dt_OutboundBatch batch, Dt_OutboundOrderDetail orderDetail, decimal pickedQty, string orderNo) { _logger.LogInformation($"开始更新批次和订单数据 - 拣选数量: {pickedQty}"); // 重要修复:验证分配数量不会变成负数 if (orderDetail.AllocatedQuantity < pickedQty) { throw new InvalidOperationException($"更新订单数据时分配数量不足,需要减少 {pickedQty},当前分配数量 {orderDetail.AllocatedQuantity}"); } if (orderDetail.LockQuantity < pickedQty) { throw new InvalidOperationException($"更新订单数据时锁定数量不足,需要减少 {pickedQty},当前锁定数量 {orderDetail.LockQuantity}"); } // 1. 更新批次完成数量 decimal originalBatchCompletedQty = batch.CompletedQuantity; batch.CompletedQuantity += pickedQty; _logger.LogInformation($"更新批次完成数量 - 从 {originalBatchCompletedQty} 增加到 {batch.CompletedQuantity}"); if (batch.CompletedQuantity >= batch.BatchQuantity) { batch.BatchStatus = (int)BatchStatusEnum.已完成; _logger.LogInformation($"批次状态更新为已完成"); } await _outboundBatchRepository.Db.Updateable(batch).ExecuteCommandAsync(); // 2. 更新订单明细 decimal originalOverOutQty = orderDetail.OverOutQuantity; decimal originalAllocatedQty = orderDetail.AllocatedQuantity; decimal originalLockQty = orderDetail.LockQuantity; orderDetail.OverOutQuantity += pickedQty; orderDetail.AllocatedQuantity -= pickedQty; // LockQuantity 同步减少 orderDetail.LockQuantity = orderDetail.AllocatedQuantity; _logger.LogInformation($"更新订单明细 - 已出库数量从 {originalOverOutQty} 增加到 {orderDetail.OverOutQuantity}"); _logger.LogInformation($"更新订单明细 - 已分配数量从 {originalAllocatedQty} 减少到 {orderDetail.AllocatedQuantity}"); _logger.LogInformation($"更新订单明细 - 锁定数量从 {originalLockQty} 减少到 {orderDetail.LockQuantity}"); await _outboundOrderDetailService.Db.Updateable(orderDetail).ExecuteCommandAsync(); // 3. 检查订单状态 await CheckAndUpdateOrderStatus(orderNo); _logger.LogInformation($"批次和订单数据更新完成"); } private async Task RevertBatchAndOrderData(Dt_PickingRecord pickingRecord, RevertPickingResult revertResult) { _logger.LogInformation($"开始恢复批次和订单数据"); // 1. 恢复批次完成数量 var batch = await _outboundBatchRepository.Db.Queryable() .FirstAsync(x => x.BatchNo == revertResult.LockInfo.OutboundBatchNo); if (batch != null) { decimal originalCompletedQty = batch.CompletedQuantity; batch.CompletedQuantity -= pickingRecord.PickQuantity; _logger.LogInformation($"恢复批次完成数量 - 从 {originalCompletedQty} 减少到 {batch.CompletedQuantity}"); // 重新计算批次状态 if (batch.CompletedQuantity <= 0) { batch.BatchStatus = (int)BatchStatusEnum.分配中; _logger.LogInformation($"批次状态恢复为分配中"); } else if (batch.CompletedQuantity < batch.BatchQuantity) { batch.BatchStatus = (int)BatchStatusEnum.执行中; _logger.LogInformation($"批次状态恢复为执行中"); } await _outboundBatchRepository.Db.Updateable(batch).ExecuteCommandAsync(); } // 2. 恢复订单明细 var orderDetail = await _outboundOrderDetailService.Db.Queryable() .FirstAsync(x => x.Id == pickingRecord.OrderDetailId); if (orderDetail != null) { decimal originalOverOutQty = orderDetail.OverOutQuantity; decimal originalAllocatedQty = orderDetail.AllocatedQuantity; decimal originalLockQty = orderDetail.LockQuantity; // 重要修复:只恢复相关数量,分配数量保持不变 orderDetail.OverOutQuantity -= pickingRecord.PickQuantity; // 注意:AllocatedQuantity 和 LockQuantity 在取消分拣时不应该改变 _logger.LogInformation($"恢复订单明细 - 已出库数量从 {originalOverOutQty} 减少到 {orderDetail.OverOutQuantity}"); _logger.LogInformation($"订单明细分配数量保持不变: {originalAllocatedQty}"); _logger.LogInformation($"订单明细锁定数量保持不变: {originalLockQty}"); await UpdateBatchAllocateStatus(orderDetail); await _outboundOrderDetailService.Db.Updateable(orderDetail).ExecuteCommandAsync(); } // 3. 重新检查订单状态 await CheckAndUpdateOrderStatus(pickingRecord.OrderNo); _logger.LogInformation($"恢复批次和订单数据完成"); } private async Task UpdateBatchAllocateStatus(Dt_OutboundOrderDetail orderDetail) { if (orderDetail.AllocatedQuantity >= orderDetail.NeedOutQuantity) { orderDetail.BatchAllocateStatus = OrderDetailStatusEnum.AssignOver.ObjToInt(); } else if (orderDetail.AllocatedQuantity > 0) { orderDetail.BatchAllocateStatus = OrderDetailStatusEnum.AssignOverPartial.ObjToInt(); } else { orderDetail.BatchAllocateStatus = OrderDetailStatusEnum.New.ObjToInt(); } } private async Task ReleaseLockAndStock(Dt_OutStockLockInfo lockInfo) { // 恢复库存状态 - 回库后库存变为可用状态 var stockDetail = await _stockInfoDetailService.Db.Queryable() .FirstAsync(x => x.Barcode == lockInfo.CurrentBarcode && x.StockId == lockInfo.StockId); if (stockDetail != null) { // 回库后库存状态恢复为入库完成(可用状态) stockDetail.Status = (int)StockStatusEmun.入库完成; await _stockInfoDetailService.Db.Updateable(stockDetail).ExecuteCommandAsync(); } // 更新锁定记录状态为已回库 lockInfo.Status = (int)OutLockStockStatusEnum.已回库; lockInfo.Operator = App.User.UserName; await _outStockLockInfoService.Db.Updateable(lockInfo).ExecuteCommandAsync(); } /// /// 更新批次状态(回库) /// private async Task UpdateBatchStatusForReturn(string outboundBatchNo, List returnedLocks) { var batch = await _outboundBatchRepository.Db.Queryable() .FirstAsync(x => x.BatchNo == outboundBatchNo); if (batch != null) { // 计算回库数量(未拣选的部分) var returnedQty = returnedLocks.Sum(x => x.AssignQuantity - x.PickedQty); batch.CompletedQuantity -= returnedQty; // 更新批次状态 if (batch.CompletedQuantity <= 0) { batch.BatchStatus = (int)BatchStatusEnum.已回库; } else if (batch.CompletedQuantity < batch.BatchQuantity) { batch.BatchStatus = (int)BatchStatusEnum.执行中; } else { batch.BatchStatus = (int)BatchStatusEnum.已完成; } batch.Operator = App.User.UserName; await _outboundBatchRepository.Db.Updateable(batch).ExecuteCommandAsync(); } } /// /// 更新订单明细(回库后) /// private async Task UpdateOrderDetailAfterReturn(List returnedLocks) { var orderDetailGroups = returnedLocks.GroupBy(x => x.OrderDetailId); foreach (var group in orderDetailGroups) { var orderDetailId = group.Key; var returnedQty = group.Sum(x => x.AssignQuantity - x.PickedQty); var orderDetail = await _outboundOrderDetailService.Db.Queryable() .FirstAsync(x => x.Id == orderDetailId); if (orderDetail != null) { orderDetail.AllocatedQuantity -= returnedQty; // LockQuantity 同步减少,保持与已分配数量一致 orderDetail.LockQuantity = orderDetail.AllocatedQuantity; await UpdateBatchAllocateStatus(orderDetail); await _outboundOrderDetailService.Db.Updateable(orderDetail).ExecuteCommandAsync(); } } } #endregion #region 辅助方法 private async Task GenerateNewBarcode() { var seq = await _dailySequenceService.GetNextSequenceAsync(); return "WSLOT" + DateTime.Now.ToString("yyyyMMdd") + seq.ToString().PadLeft(5, '0'); } private async Task RecordSplitHistory(Dt_OutStockLockInfo lockInfo, Dt_StockInfoDetail stockDetail, decimal splitQty, string newBarcode, bool isAutoSplit, decimal? originalStockQuantity = null) { var splitHistory = new Dt_SplitPackageRecord { OrderNo = lockInfo.OrderNo, OutStockLockInfoId = lockInfo.Id, StockId = stockDetail.StockId, Operator = App.User.UserName, OriginalBarcode = stockDetail.Barcode, NewBarcode = newBarcode, SplitQty = splitQty, SplitTime = DateTime.Now, Status = (int)SplitPackageStatusEnum.已拆包, IsAutoSplit = isAutoSplit , // SplitType = isAutoSplit ? "自动拆包" : "手动拆包" OriginalStockQuantity = originalStockQuantity ?? stockDetail.StockQuantity, //RemainingStockQuantity = stockDetail.StockQuantity - splitQty }; await _splitPackageService.Db.Insertable(splitHistory).ExecuteCommandAsync(); } private async Task RecordPickingHistory(PickingResult result, string orderNo, string palletCode) { var pickingRecord = new Dt_PickingRecord { OrderNo = orderNo, // BatchNo = result.FinalLockInfo.BatchNo, OrderDetailId = result.FinalLockInfo.OrderDetailId, PalletCode = palletCode, Barcode = result.FinalLockInfo.CurrentBarcode, MaterielCode = result.FinalLockInfo.MaterielCode, PickQuantity = result.ActualPickedQty, PickTime = DateTime.Now, Operator = App.User.UserName, OutStockLockId = result.FinalLockInfo.Id, BarcodeUnit = result.FinalLockInfo.BarcodeUnit, BarcodeQty = result.FinalLockInfo.BarcodeQty, BatchNo = result.FinalLockInfo.BatchNo, lineNo = result.FinalLockInfo.lineNo, SupplyCode = result.FinalLockInfo.SupplyCode, WarehouseCode = result.FinalLockInfo.WarehouseCode, // IsCancelled = false }; await Db.Insertable(pickingRecord).ExecuteCommandAsync(); } private async Task CheckAndUpdateOrderStatus(string orderNo) { var orderDetails = await _outboundOrderDetailService.Db.Queryable() .LeftJoin((detail, order) => detail.OrderId == order.Id) .Where((detail, order) => order.OrderNo == orderNo) .Select((detail, order) => detail) .ToListAsync(); bool allCompleted = orderDetails.All(x => x.OverOutQuantity >= x.NeedOutQuantity); var orderStatus = allCompleted ? (int)OutOrderStatusEnum.出库完成 : (int)OutOrderStatusEnum.出库中; await _outboundOrderService.Db.Updateable() .SetColumns(x => x.OrderStatus == orderStatus) .Where(x => x.OrderNo == orderNo) .ExecuteCommandAsync(); } private string GetPalletStatusText(PalletStatusEnum status) { return status switch { PalletStatusEnum.未开始 => "未开始", PalletStatusEnum.拣选中 => "拣选中", PalletStatusEnum.已完成 => "已完成", PalletStatusEnum.无任务 => "无任务", _ => "未知" }; } #endregion #region DTO类 /// /// 条码状态信息DTO /// public class BarcodeStatusInfoDto { public string Barcode { get; set; } public string OrderNo { get; set; } public bool IsOriginalBarcode { get; set; } public int SplitChainCount { get; set; } public bool HasBeenPicked { get; set; } public decimal TotalPickedQuantity { get; set; } public int PickRecordCount { get; set; } public int LockInfoStatus { get; set; } public decimal LockInfoPickedQty { get; set; } public decimal LockInfoAssignQty { get; set; } public decimal StockQuantity { get; set; } public int StockStatus { get; set; } public bool CanCancelSplit { get; set; } public bool NeedCancelPickFirst { get; set; } public List OperationSuggestions { get; set; } = new List(); } public class PickedBarcodeInfo { public string Barcode { get; set; } public decimal PickedQty { get; set; } public int PickRecordCount { get; set; } } /// /// 自动拆包结果 /// public class AutoSplitResult { public string NewBarcode { get; set; } public decimal SplitQuantity { get; set; } } public class PickingResult { public Dt_OutStockLockInfo FinalLockInfo { get; set; } public decimal ActualPickedQty { get; set; } } public class RevertPickingResult { public Dt_OutStockLockInfo LockInfo { get; set; } public Dt_StockInfoDetail StockDetail { get; set; } } public class SplitResultDto { public string NewBarcode { get; set; } } public class ValidationResult { public bool IsValid { get; set; } public string ErrorMessage { get; set; } public T Data { get; set; } public static ValidationResult Success(T data) => new ValidationResult { IsValid = true, Data = data }; public static ValidationResult Error(string message) => new ValidationResult { IsValid = false, ErrorMessage = message }; } #endregion } // 支持类 public class SplitResultDto { public string NewBarcode { get; set; } } }