using Microsoft.Extensions.Logging; using SqlSugar; 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) { // 如果库存已经出库完成,标记为已清理 if (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 辅助方法 private string GetPalletStatusText(PalletStatusEnum status) { return status switch { PalletStatusEnum.未开始 => "未开始", PalletStatusEnum.拣选中 => "拣选中", PalletStatusEnum.已完成 => "已完成", PalletStatusEnum.无任务 => "无任务", _ => "未知" }; } #endregion #region 分批分拣 /// /// 分批分拣确认 /// public async Task ConfirmBatchPicking(string orderNo, string palletCode, string barcode) { try { _unitOfWorkManage.BeginTran(); // 1. 验证分拣请求 var validationResult = await ValidatePickingRequest(orderNo, palletCode, barcode); if (!validationResult.IsValid) return WebResponseContent.Instance.Error(validationResult.ErrorMessage); var (lockInfo, orderDetail, stockDetail, batch) = validationResult.Data; // 使用锁定信息的分配数量作为实际分拣数量 var actualPickedQty = lockInfo.AssignQuantity; // 2. 执行分拣逻辑 var pickingResult = await ExecutePickingLogic(lockInfo, orderDetail, stockDetail, actualPickedQty); // 3. 更新批次和订单数据 await UpdateBatchAndOrderData(batch, orderDetail, actualPickedQty, orderNo); // 4. 记录拣选历史 await RecordPickingHistory(pickingResult, orderNo, palletCode); _unitOfWorkManage.CommitTran(); return WebResponseContent.Instance.OK("分拣成功", new { PickedQuantity = actualPickedQty, Barcode = barcode, MaterialCode = lockInfo.MaterielCode }); } 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("未找到分拣记录"); // 恢复锁定信息和库存 await RevertPickingData(pickingRecord); //更新批次和订单数据 await RevertBatchAndOrderData(pickingRecord); // 标记分拣记录为已取消 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 手动拆包 /// /// 手动拆包 /// 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 ExecuteSplitLogic(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}"); } } #endregion #region 取消拆包 #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) { // 1. 恢复原锁定信息 // 注意:这里需要累加,而不是简单的赋值,因为可能有多次拆包 originalLockInfo.AssignQuantity += splitRecord.SplitQty; originalLockInfo.OrderQuantity += splitRecord.SplitQty; // 如果原锁定信息的状态是拣选完成,需要重新设置为出库中 if (originalLockInfo.Status == (int)OutLockStockStatusEnum.拣选完成) { originalLockInfo.Status = (int)OutLockStockStatusEnum.出库中; } await _outStockLockInfoService.Db.Updateable(originalLockInfo).ExecuteCommandAsync(); // 2. 恢复原库存明细 var originalStock = await _stockInfoDetailService.Db.Queryable() .FirstAsync(x => x.Barcode == splitRecord.OriginalBarcode && x.StockId == splitRecord.StockId); originalStock.StockQuantity += splitRecord.SplitQty; // 如果原库存状态是出库完成,需要重新设置为出库锁定 if (originalStock.Status == (int)StockStatusEmun.出库完成) { originalStock.Status = (int)StockStatusEmun.出库锁定; } await _stockInfoDetailService.Db.Updateable(originalStock).ExecuteCommandAsync(); // 3. 删除新锁定信息 await _outStockLockInfoService.Db.Deleteable() .Where(x => x.Id == newLockInfo.Id) .ExecuteCommandAsync(); // 4. 删除新库存明细 await _stockInfoDetailService.Db.Deleteable() .Where(x => x.Barcode == newLockInfo.CurrentBarcode) .ExecuteCommandAsync(); // 5. 标记拆包记录为已撤销 splitRecord.IsReverted = true; splitRecord.RevertTime = DateTime.Now; splitRecord.RevertOperator = App.User.UserName; await _splitPackageService.Db.Updateable(splitRecord).ExecuteCommandAsync(); // 6. 检查并更新批次和订单状态 await CheckAndUpdateBatchStatus(originalLockInfo.BatchNo); await CheckAndUpdateOrderStatus(originalLockInfo.OrderNo); } /// /// 验证取消拆包请求 - 增强版本 /// private async Task> ValidateCancelSplitRequest( string orderNo, string palletCode, string 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("未找到拆包记录"); // 查找新锁定信息 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("未找到新锁定信息"); // 检查新条码是否已被分拣 var pickingRecord = await Db.Queryable() .Where(x => x.Barcode == newBarcode && !x.IsCancelled) .FirstAsync(); if (pickingRecord != null) return ValidationResult<(Dt_SplitPackageRecord, Dt_OutStockLockInfo, Dt_StockInfoDetail)>.Error("该条码已被分拣,无法取消拆包"); // 检查新条码是否被再次拆包 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)); return ValidationResult<(Dt_SplitPackageRecord, Dt_OutStockLockInfo, Dt_StockInfoDetail)>.Error( $"该条码已被再次拆包,生成的新条码:{childBarcodes},请先取消后续拆包"); } var newStockDetail = await _stockInfoDetailService.Db.Queryable() .FirstAsync(x => x.Barcode == 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("未找到拆包记录"); // 2. 按拆包顺序倒序取消(从最新的开始取消) var reversedChain = splitChain.OrderByDescending(x => x.SplitTime).ToList(); foreach (var splitRecord in reversedChain) { 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> 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) { // 查找相关数据 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); } #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 }).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 DTO类 public class SplitPackageChainInfoDto { public string OriginalBarcode { get; set; } public string RootBarcode { get; set; } // 新增:根条码 public int TotalSplitTimes { get; set; } public string ChainType { get; set; } // "root" 或 "branch" public List SplitChain { get; set; } } public class SplitChainItemDto { public DateTime SplitTime { get; set; } public string OriginalBarcode { get; set; } public string NewBarcode { get; set; } public decimal SplitQuantity { get; set; } public string Operator { get; set; } public bool IsReverted { get; set; } } #endregion #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.BatchNo); foreach (var batchGroup in batchGroups) { var batchNo = batchGroup.Key; var batchLocks = batchGroup.ToList(); // 释放库存和锁定记录 foreach (var lockInfo in batchLocks) { await ReleaseLockAndStock(lockInfo); } // 更新批次状态 await UpdateBatchStatusForReturn(batchNo, 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) { // 查找锁定信息 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("未找到有效的锁定信息"); // 检查是否已经分拣完成 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); var stockDetail = await _stockInfoDetailService.Db.Queryable() .FirstAsync(x => x.Barcode == barcode && x.StockId == lockInfo.StockId); // 验证库存数量 if (stockDetail.StockQuantity < lockInfo.AssignQuantity) return ValidationResult<(Dt_OutStockLockInfo, Dt_OutboundOrderDetail, Dt_StockInfoDetail, Dt_OutboundBatch)>.Error( $"库存数量不足,需要:{lockInfo.AssignQuantity},实际:{stockDetail.StockQuantity}"); var batch = await _outboundBatchRepository.Db.Queryable() .FirstAsync(x => x.BatchNo == lockInfo.OutboundBatchNo); return ValidationResult<(Dt_OutStockLockInfo, Dt_OutboundOrderDetail, Dt_StockInfoDetail, Dt_OutboundBatch)>.Success((lockInfo, orderDetail, stockDetail, batch)); } private async Task> ValidateSplitRequest( string orderNo, string palletCode, string originalBarcode, decimal 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) return ValidationResult<(Dt_OutStockLockInfo, Dt_StockInfoDetail)>.Error("未找到有效的锁定信息"); var stockDetail = await _stockInfoDetailService.Db.Queryable() .FirstAsync(x => x.Barcode == originalBarcode && x.StockId == lockInfo.StockId); if (stockDetail.StockQuantity < splitQuantity) return ValidationResult<(Dt_OutStockLockInfo, Dt_StockInfoDetail)>.Error("拆包数量不能大于库存数量"); if (lockInfo.AssignQuantity - lockInfo.PickedQty < splitQuantity) return ValidationResult<(Dt_OutStockLockInfo, Dt_StockInfoDetail)>.Error("拆包数量不能大于未拣选数量"); return ValidationResult<(Dt_OutStockLockInfo, Dt_StockInfoDetail)>.Success((lockInfo, stockDetail)); } #endregion #region 核心逻辑方法 private async Task ExecutePickingLogic( Dt_OutStockLockInfo lockInfo, Dt_OutboundOrderDetail orderDetail, Dt_StockInfoDetail stockDetail, decimal actualPickedQty) { // 更新锁定信息 lockInfo.PickedQty += actualPickedQty; if (lockInfo.PickedQty >= lockInfo.AssignQuantity) { lockInfo.Status = (int)OutLockStockStatusEnum.拣选完成; } await _outStockLockInfoService.Db.Updateable(lockInfo).ExecuteCommandAsync(); // 更新库存 stockDetail.StockQuantity -= actualPickedQty; stockDetail.OutboundQuantity += actualPickedQty; if (stockDetail.StockQuantity <= 0) { stockDetail.Status = (int)StockStatusEmun.出库完成; } await _stockInfoDetailService.Db.Updateable(stockDetail).ExecuteCommandAsync(); return new PickingResult { FinalLockInfo = lockInfo, ActualPickedQty = actualPickedQty }; } private async Task RevertPickingData(Dt_PickingRecord pickingRecord) { // 恢复锁定信息 var lockInfo = await _outStockLockInfoService.Db.Queryable() .FirstAsync(x => x.Id == pickingRecord.OutStockLockId); lockInfo.PickedQty -= pickingRecord.PickQuantity; lockInfo.Status = (int)OutLockStockStatusEnum.出库中; await _outStockLockInfoService.Db.Updateable(lockInfo).ExecuteCommandAsync(); // 恢复库存 var stockDetail = await _stockInfoDetailService.Db.Queryable() .FirstAsync(x => x.Barcode == pickingRecord.Barcode); stockDetail.StockQuantity += pickingRecord.PickQuantity; stockDetail.OutboundQuantity -= pickingRecord.PickQuantity; stockDetail.Status = (int)StockStatusEmun.出库锁定; await _stockInfoDetailService.Db.Updateable(stockDetail).ExecuteCommandAsync(); return new RevertPickingResult { LockInfo = lockInfo, StockDetail = stockDetail }; } private async Task ExecuteSplitLogic(Dt_OutStockLockInfo lockInfo, Dt_StockInfoDetail stockDetail, decimal splitQuantity, string palletCode) { // 生成新条码 string newBarcode = await GenerateNewBarcode(); // 创建新库存明细 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(); // 更新原库存明细 stockDetail.StockQuantity -= splitQuantity; await _stockInfoDetailService.Db.Updateable(stockDetail).ExecuteCommandAsync(); var newLockInfo = new Dt_OutStockLockInfo { OrderNo = lockInfo.OrderNo, OrderDetailId = lockInfo.OrderDetailId, BatchNo = lockInfo.BatchNo, MaterielCode = lockInfo.MaterielCode, MaterielName = lockInfo.MaterielName, StockId = lockInfo.StockId, OrderQuantity = splitQuantity, //OriginalQuantity = quantity, 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, // OriginalLockQuantity = quantity, 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(); // 更新原锁定信息 lockInfo.AssignQuantity -= splitQuantity; lockInfo.OrderQuantity -= splitQuantity; await _outStockLockInfoService.Db.Updateable(lockInfo).ExecuteCommandAsync(); // 记录拆包历史 await RecordSplitHistory(lockInfo, stockDetail, splitQuantity, newBarcode); return new SplitResultDto { NewBarcode = newBarcode }; } private async Task ExecuteCancelSplitLogic(Dt_SplitPackageRecord splitRecord, Dt_OutStockLockInfo newLockInfo, Dt_StockInfoDetail newStockDetail) { // 恢复原库存 var originalStock = await _stockInfoDetailService.Db.Queryable() .FirstAsync(x => x.Barcode == splitRecord.OriginalBarcode && x.StockId == splitRecord.StockId); originalStock.StockQuantity += splitRecord.SplitQty; await _stockInfoDetailService.Db.Updateable(originalStock).ExecuteCommandAsync(); // 恢复原锁定信息 var originalLockInfo = await _outStockLockInfoService.Db.Queryable() .FirstAsync(x => x.Id == splitRecord.OutStockLockInfoId); originalLockInfo.AssignQuantity += splitRecord.SplitQty; originalLockInfo.OrderQuantity += splitRecord.SplitQty; await _outStockLockInfoService.Db.Updateable(originalLockInfo).ExecuteCommandAsync(); // 删除新库存明细 await _stockInfoDetailService.Db.Deleteable() .Where(x => x.Barcode == newLockInfo.CurrentBarcode) .ExecuteCommandAsync(); // 删除新锁定信息 await _outStockLockInfoService.Db.Deleteable() .Where(x => x.Id == newLockInfo.Id) .ExecuteCommandAsync(); // 标记拆包记录为已撤销 splitRecord.IsReverted = true; splitRecord.RevertTime = DateTime.Now; splitRecord.RevertOperator = App.User.UserName; await _splitPackageService.Db.Updateable(splitRecord).ExecuteCommandAsync(); } #endregion #region 数据更新方法 private async Task UpdateBatchAndOrderData(Dt_OutboundBatch batch, Dt_OutboundOrderDetail orderDetail, decimal pickedQty, string orderNo) { // 更新批次完成数量 batch.CompletedQuantity += pickedQty; if (batch.CompletedQuantity >= batch.BatchQuantity) { batch.BatchStatus = (int)BatchStatusEnum.已完成; } await _outboundBatchRepository.Db.Updateable(batch).ExecuteCommandAsync(); // 更新订单明细 orderDetail.OverOutQuantity += pickedQty; orderDetail.AllocatedQuantity -= pickedQty; await _outboundOrderDetailService.Db.Updateable(orderDetail).ExecuteCommandAsync(); // 检查订单状态 await CheckAndUpdateOrderStatus(orderNo); } private async Task RevertBatchAndOrderData(Dt_PickingRecord pickingRecord) { // 恢复批次完成数量 var batch = await _outboundBatchRepository.Db.Queryable() .FirstAsync(x => x.BatchNo == pickingRecord.BatchNo); batch.CompletedQuantity -= pickingRecord.PickQuantity; batch.BatchStatus = (int)BatchStatusEnum.执行中; await _outboundBatchRepository.Db.Updateable(batch).ExecuteCommandAsync(); // 恢复订单明细 var orderDetail = await _outboundOrderDetailService.Db.Queryable() .FirstAsync(x => x.Id == pickingRecord.OrderDetailId); orderDetail.OverOutQuantity -= pickingRecord.PickQuantity; orderDetail.AllocatedQuantity += pickingRecord.PickQuantity; await _outboundOrderDetailService.Db.Updateable(orderDetail).ExecuteCommandAsync(); // 重新检查订单状态 await CheckAndUpdateOrderStatus(pickingRecord.OrderNo); } 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.已回库; await _outStockLockInfoService.Db.Updateable(lockInfo).ExecuteCommandAsync(); } private async Task UpdateBatchStatusForReturn(string batchNo, List returnedLocks) { var batch = await _outboundBatchRepository.Db.Queryable() .FirstAsync(x => x.BatchNo == batchNo); // 计算回库数量 var returnedQty = returnedLocks.Sum(x => x.AssignQuantity - x.PickedQty); batch.CompletedQuantity -= returnedQty; if (batch.CompletedQuantity <= 0) { 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); await _outboundOrderDetailService.Db.Updateable() .SetColumns(x => x.AllocatedQuantity == x.AllocatedQuantity - returnedQty) .Where(x => x.Id == orderDetailId) .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) { 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.已拆包 }; 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, // 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(); } #endregion #region DTO类 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; } } }