空箱跨区域移库

heshaofeng

7 天以前 ca3e4977395bc02c5d147dffdff7381333fdfbca

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

@@ -311,7 +311,7 @@
            stockInfo.StockStatus = StockStatusEmun.入库完成.ObjToInt();
            stockInfo.Details.ForEach(x =>
            {
                x.Status = StockStatusEmun.入库确认.ObjToInt();
                x.Status = inboundOrders.FirstOrDefault().CreateType == (int)OrderCreateTypeEnum.CreateInSystem ? StockStatusEmun.入库完成.ObjToInt():StockStatusEmun.入库确认.ObjToInt();
            });
            _stockService.StockInfoService.Repository.UpdateData(stockInfo);
            _stockService.StockInfoDetailService.Repository.UpdateData(stockInfo.Details);
@@ -2711,6 +2711,138 @@
                return await Task.FromResult(WebResponseContent.Instance.Error($"移库任务处理失败：{ex.Message}"));
            }
        }


        /// <summary>
        /// è·¨åŒºåŸŸç§»åº“任务完成
        /// </summary>
        /// <param name="task"></param>
        /// <returns></returns>
        public async Task<WebResponseContent> CrossAreaRelocationTaskCompleted(Dt_Task task)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                if (task == null || string.IsNullOrEmpty(task.PalletCode) || string.IsNullOrEmpty(task.TargetAddress))
                {
                    return WebResponseContent.Instance.Error("跨区域移库任务信息不完整（托盘号/目标货位为空）");
                }

                // 2. æŸ¥è¯¢æ‰˜ç›˜åº“存信息
                Dt_StockInfo stockInfo = await _stockRepository.Db.Queryable<Dt_StockInfo>()
                    .Includes(x => x.Details)
                    .Where(x => x.PalletCode == task.PalletCode)
                    .FirstAsync();

                if (stockInfo == null)
                {
                    return WebResponseContent.Instance.Error($"未找到托盘[{task.PalletCode}]对应的库存信息");
                }

                // éžç©ºæ‰˜ç›˜å¿…须有明细
                if (stockInfo.Details.Count == 0 && stockInfo.PalletType != PalletTypeEnum.Empty.ObjToInt())
                {
                    _logger.LogInformation($"CrossAreaRelocationTaskCompleted: æœªæ‰¾åˆ°è¯¥æ‰˜ç›˜åº“存明细信息.{task.TaskNum}");
                    return WebResponseContent.Instance.Error($"未找到该托盘[{task.PalletCode}]库存明细信息");
                }

                // 3. æŸ¥è¯¢ç›®æ ‡è´§ä½ + åŽŸè´§ä½ä¿¡æ¯
                Dt_LocationInfo targetLocationInfo = _locationInfoService.Repository.QueryFirst(x => x.LocationCode == task.TargetAddress);
                if (targetLocationInfo == null)
                {
                    return content.Error($"未找到对应的终点货位[{task.TargetAddress}]信息");
                }

                // åŽŸè´§ä½ä¿¡æ¯
                Dt_LocationInfo oldLocationInfo = null;
                if (!string.IsNullOrEmpty(stockInfo.LocationCode))
                {
                    oldLocationInfo = _locationInfoService.Repository.QueryFirst(x => x.LocationCode == stockInfo.LocationCode);
                    if (oldLocationInfo == null)
                    {
                        return content.Error($"未找到原货位[{stockInfo.LocationCode}]信息");
                    }
                }

                // 4. è´§ä½çŠ¶æ€æ ¡éªŒ
                if (targetLocationInfo.LocationStatus == LocationStatusEnum.InStock.ObjToInt())
                {
                    return WebResponseContent.Instance.Error($"目标货位[{task.TargetAddress}]状态不正确（当前为已占用）");
                }

                // 5. å¼€å¯äº‹åŠ¡å¤„理核心逻辑
                _unitOfWorkManage.BeginTran();

                // 5.1 ç›®æ ‡è´§ä½æ›´æ–°ä¸ºå ç”¨
                var beforeTargetLocationStatus = targetLocationInfo.LocationStatus;
                targetLocationInfo.LocationStatus = stockInfo.PalletType == PalletTypeEnum.Empty.ObjToInt()
                        ? LocationStatusEnum.Pallet.ObjToInt()
                        : LocationStatusEnum.InStock.ObjToInt();
                _locationInfoService.Repository.UpdateData(targetLocationInfo);

                // 5.2 åŽŸè´§ä½é‡Šæ”¾ç©ºé—²
                int beforeOldLocationStatus = 0;
                if (oldLocationInfo != null)
                {
                    beforeOldLocationStatus = oldLocationInfo.LocationStatus;
                    oldLocationInfo.LocationStatus = LocationStatusEnum.Free.ObjToInt();
                    _locationInfoService.Repository.UpdateData(oldLocationInfo);
                }

                // 5.3 æ›´æ–°åº“存：绑定新货位 + æ¢å¤æ­£å¸¸çŠ¶æ€
                string oldLocationCode = stockInfo.LocationCode;
                stockInfo.LocationCode = targetLocationInfo.LocationCode;
                stockInfo.StockStatus = StockStatusEmun.入库完成.ObjToInt();
                stockInfo.LocationType = targetLocationInfo.LocationType;
                _stockRepository.UpdateData(stockInfo);

                // 5.4 ä»»åŠ¡æ ‡è®°ä¸ºå®Œæˆ
                task.TaskStatus = TaskStatusEnum.Finish.ObjToInt();
                var result = _task_HtyService.DeleteAndMoveIntoHty(task, OperateTypeEnum.自动完成);

                // æäº¤äº‹åŠ¡
                _unitOfWorkManage.CommitTran();

                // ä»»åŠ¡å½’档失败则删除
                if (!result)
                {
                    await Db.Deleteable(task).ExecuteCommandAsync();
                }

                // è®°å½•è´§ä½çŠ¶æ€å˜æ›´æ—¥å¿—
                try
                {
                    _locationStatusChangeRecordService.AddLocationStatusChangeRecord(
                        targetLocationInfo,
                        beforeTargetLocationStatus,
                        StockChangeType.Inbound.ObjToInt(),
                        $"跨区域移库入库（原货位：{oldLocationCode}）",
                        task.TaskNum);

                    if (oldLocationInfo != null)
                    {
                        _locationStatusChangeRecordService.AddLocationStatusChangeRecord(
                            oldLocationInfo,
                            beforeOldLocationStatus,
                            StockChangeType.Outbound.ObjToInt(),
                            $"跨区域移库出库（目标货位：{targetLocationInfo.LocationCode}）",
                            task.TaskNum);
                    }
                }
                catch (Exception ex)
                {
                    _logger.LogInformation($"CrossAreaRelocationTaskCompleted è®°å½•æ—¥å¿—异常：{ex.Message}");
                }

                return content.OK("跨区域移库任务完成");
            }
            catch (Exception ex)
            {
                _unitOfWorkManage.RollbackTran();
                _logger.LogError($"CrossAreaRelocationTaskCompleted å¤„理失败：{ex.Message}", ex);
                return await Task.FromResult(WebResponseContent.Instance.Error($"跨区域移库任务处理失败：{ex.Message}"));
            }
        }
    }
}