提交

pan

2025-11-20 246622a6e9c2563bd21d627c21c6012017f0f04e

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

@@ -16,10 +16,12 @@
#endregion << ç‰ˆ æœ¬ æ³¨ é‡Š >>

using AutoMapper;
using Dm.filter;
using MailKit.Search;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using Org.BouncyCastle.Asn1.Ocsp;
using Org.BouncyCastle.Asn1.Pkcs;
using SqlSugar;
using System.Reflection;
using System.Reflection.Emit;
@@ -37,6 +39,7 @@
using WIDESEA_Core.Enums;
using WIDESEA_Core.Helper;
using WIDESEA_DTO.Basic;
using WIDESEA_DTO.Inbound;
using WIDESEA_DTO.Task;
using WIDESEA_IBasicService;
using WIDESEA_IInboundService;
@@ -58,10 +61,16 @@
        private readonly ILocationInfoService _locationInfoService;
        private readonly IInboundOrderService _inboundOrderService;
        private readonly IInboundOrderDetailService _inboundOrderDetailService;

        private readonly IOutboundOrderService _outboundOrderService;
        private readonly IOutboundOrderDetailService _outboundOrderDetailService;
        private readonly IOutStockLockInfoService _outStockLockInfoService;
        private readonly ILocationStatusChangeRecordService _locationStatusChangeRecordService;
        private readonly IESSApiService _eSSApiService;
        private readonly IStockService _stockService;
        private readonly IRecordService _recordService;

        private readonly IInvokeMESService _invokeMESService;
        public IRepository<Dt_Task> Repository => BaseDal;

        private Dictionary<string, SqlSugar.OrderByType> _taskOrderBy = new()
@@ -81,7 +90,7 @@

        public List<int> TaskOutboundTypes => typeof(TaskTypeEnum).GetEnumIndexList();

        public TaskService(IRepository<Dt_Task> BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IRepository<Dt_StockInfo> stockRepository, ILocationInfoService locationInfoService, IInboundOrderService inboundOrderService, ILocationStatusChangeRecordService locationStatusChangeRecordService, IESSApiService eSSApiService, ILogger<TaskService> logger, IStockService stockService, IRecordService recordService, IInboundOrderDetailService inboundOrderDetailService) : base(BaseDal)
        public TaskService(IRepository<Dt_Task> BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IRepository<Dt_StockInfo> stockRepository, ILocationInfoService locationInfoService, IInboundOrderService inboundOrderService, ILocationStatusChangeRecordService locationStatusChangeRecordService, IESSApiService eSSApiService, ILogger<TaskService> logger, IStockService stockService, IRecordService recordService, IInboundOrderDetailService inboundOrderDetailService, IOutboundOrderService outboundOrderService, IOutboundOrderDetailService outboundOrderDetailService, IInvokeMESService invokeMESService, IOutStockLockInfoService outStockLockInfoService) : base(BaseDal)
        {
            _mapper = mapper;
            _unitOfWorkManage = unitOfWorkManage;
@@ -94,7 +103,12 @@
            _stockService = stockService;
            _recordService = recordService;
            _inboundOrderDetailService = inboundOrderDetailService;
            _outboundOrderService = outboundOrderService;
            _outboundOrderDetailService = outboundOrderDetailService;
            _invokeMESService = invokeMESService;
            _outStockLockInfoService = outStockLockInfoService;
        }


        /// <summary>
        /// 
@@ -106,6 +120,7 @@
            try
            {
                Dt_Task task;

                if (int.TryParse(taskNum, out var newTaskNum))
                {
                    task = BaseDal.QueryFirst(x => x.TaskNum == newTaskNum);
@@ -118,6 +133,7 @@
                {
                    return WebResponseContent.Instance.Error("未找到任务信息");
                }
                _logger.LogInformation($"TaskService TaskCompleted: {JsonConvert.SerializeObject(task)} , {task.TaskType} ");

                MethodInfo? methodInfo = GetType().GetMethod(((TaskTypeEnum)task.TaskType) + "TaskCompleted");
                if (methodInfo != null)
@@ -132,6 +148,7 @@
            }
            catch (Exception ex)
            {
                _logger.LogError($"TaskService TaskCompleted:  {ex.Message} ");
                return WebResponseContent.Instance.Error(ex.Message);
            }
        }
@@ -140,12 +157,12 @@
        /// </summary>
        /// <param name="task"></param>
        /// <returns></returns>
        public WebResponseContent InboundTaskCompleted(Dt_Task task)
        public async Task<WebResponseContent> InboundTaskCompleted(Dt_Task task)
        {
            decimal beforeQuantity = 0;

            //查库存
            Dt_StockInfo stockInfo = _stockRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletCode == task.PalletCode && x.WarehouseId == task.WarehouseId).First();
            Dt_StockInfo stockInfo = _stockRepository.Db.Queryable<Dt_StockInfo>().Includes(x => x.Details).Where(x => x.PalletCode == task.PalletCode && x.WarehouseId == task.WarehouseId).First();
            if (stockInfo == null)
            {
                return WebResponseContent.Instance.Error($"未找到托盘对应的组盘信息");
@@ -227,12 +244,114 @@
            _locationStatusChangeRecordService.AddLocationStatusChangeRecord(locationInfo, beforeStatus, StockChangeType.Inbound.ObjToInt(), "", task.TaskNum);

            _recordService.StockQuantityChangeRecordService.AddStockChangeRecord(stockInfo, stockInfo.Details, beforeQuantity, stockInfo.Details.Sum(x => x.StockQuantity) + beforeQuantity, WIDESEA_Common.StockEnum.StockChangeType.MaterielGroup);
            try
            {
                foreach (var inboundOrder in inboundOrders)
                {
                    if (inboundOrder.OrderType == InOrderTypeEnum.Allocat.ObjToInt())//调拨入库
                    {

                    }
                    else if (inboundOrder.OrderType == InOrderTypeEnum.ReCheck.ObjToInt()) //重检入库
                    {

                    }
                    else
                    {
                        if (inboundOrder != null && inboundOrder.OrderStatus == InOrderStatusEnum.入库完成.ObjToInt())
                        {
                            var feedmodel = new FeedbackInboundRequestModel
                            {
                                reqCode = Guid.NewGuid().ToString(),
                                reqTime = DateTime.Now.ToString(),
                                business_type = inboundOrder.BusinessType,
                                factoryArea = inboundOrder.FactoryArea,
                                operationType = 1,
                                Operator = inboundOrder.Operator,
                                orderNo = inboundOrder.UpperOrderNo,
                                status = inboundOrder.OrderStatus,
                                details = new List<FeedbackInboundDetailsModel>()

                            };

                            var groupedData = inboundOrder.Details.GroupBy(item => new { item.MaterielCode, item.SupplyCode, item.BatchNo, item.lineNo, item.BarcodeUnit, item.WarehouseCode })
                               .Select(group => new FeedbackInboundDetailsModel
                               {
                                   materialCode = group.Key.MaterielCode,
                                   supplyCode = group.Key.SupplyCode,
                                   batchNo = group.Key.BatchNo,
                                   lineNo = group.Key.lineNo,
                                   warehouseCode = group.Key.WarehouseCode,
                                   qty = group.Sum(x => x.BarcodeQty),
                                   // warehouseCode= "1072",
                                   unit = group.Key.BarcodeUnit,
                                   barcodes = group.Select(row => new FeedbackBarcodesModel
                                   {
                                       barcode = row.Barcode,
                                       qty = row.BarcodeQty
                                   }).ToList()
                               }).ToList();
                            feedmodel.details = groupedData;

                            var result = await _invokeMESService.FeedbackInbound(feedmodel);
                            if (result != null && result.code == 200)
                            {
                                _inboundOrderService.Db.Updateable<Dt_InboundOrder>().SetColumns(it => new Dt_InboundOrder { ReturnToMESStatus = 1 })
                                .Where(it => it.Id == inboundOrder.Id).ExecuteCommand();
                                _inboundOrderDetailService.Db.Updateable<Dt_InboundOrderDetail>().SetColumns(it => new Dt_InboundOrderDetail { ReturnToMESStatus = 1 })
                                .Where(it => it.OrderId == inboundOrder.Id).ExecuteCommand();
                            }
                        }
                    }

                }
            }
            catch (Exception ex)
            {
                _logger.LogInformation("InboundTaskCompleted å›žå†™MES失败:  " + ex.Message);
            }

            return WebResponseContent.Instance.OK();
        }

        public WebResponseContent OutboundTaskCompleted(Dt_Task task)
        {
            _logger.LogInformation($"TaskService  OutboundTaskCompleted: {task.TaskNum}");
            //查货位
            Dt_LocationInfo locationInfo = _locationInfoService.Repository.QueryFirst(x => x.LocationCode == task.SourceAddress);
            if (locationInfo == null)
            {
                return WebResponseContent.Instance.Error($"未找到对应的终点货位信息");
            }
            locationInfo.LocationStatus = LocationStatusEnum.Free.ObjToInt();
            _locationInfoService.Repository.UpdateData(locationInfo);

            var outloks = _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>().Where(x => x.TaskNum == task.TaskNum).ToList();

            var stockids = outloks.Select(x => x.StockId).ToList();

            _stockService.StockInfoService.Db.Updateable<Dt_StockInfo>()
                                  .SetColumns(it => new Dt_StockInfo
                                  {
                                      StockStatus = StockStatusEmun.出库锁定.ObjToInt()
                                  })
                                  .Where(it => stockids.Contains(it.Id))
                                  .ExecuteCommand();

            _stockService.StockInfoDetailService.Db.Updateable<Dt_StockInfoDetail>()
                                  .SetColumns(it => new Dt_StockInfoDetail
                                  {
                                      Status = StockStatusEmun.出库锁定.ObjToInt()
                                  })
                                  .Where(it => stockids.Contains(it.StockId))
                                  .ExecuteCommand();



            return WebResponseContent.Instance.OK();


        }
        public async Task<WebResponseContent> InEmptyTaskCompleted(Dt_Task task)
        {

@@ -286,14 +405,69 @@
            }
        }

        public WebResponseContent InPickTaskCompleted(Dt_Task task)
        {
            _logger.LogInformation($"TaskService  InPickTaskCompleted: {task.TaskNum}");
            //查库存
            Dt_StockInfo stockInfo = _stockRepository.Db.Queryable<Dt_StockInfo>().Includes(x => x.Details).Where(x => x.PalletCode == task.PalletCode).First();
            if (stockInfo == null)
            {
                return WebResponseContent.Instance.Error($"未找到托盘对应的组盘信息");
            }
            if (stockInfo.Details.Count == 0 && stockInfo.PalletType != PalletTypeEnum.Empty.ObjToInt())
            {
                return WebResponseContent.Instance.Error($"未找到该托盘库存明细信息");
            }

            // èŽ·å–所有回库中的出库锁定记录
            var returnLocks = _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
                .Where(it => it.OrderNo == task.OrderNo && it.PalletCode == task.PalletCode && it.Status == (int)OutLockStockStatusEnum.回库中)
                .ToList();
            // æ›´æ–°å‡ºåº“锁定记录状态为回库完成
            foreach (var lockInfo in returnLocks)
            {
                lockInfo.Status = (int)OutLockStockStatusEnum.已回库;
            }
            _outStockLockInfoService.Db.Updateable(returnLocks).ExecuteCommand();

            //查货位
            Dt_LocationInfo locationInfo = _locationInfoService.Repository.QueryFirst(x => x.LocationCode == task.TargetAddress);
            if (locationInfo == null)
            {
                return WebResponseContent.Instance.Error($"未找到对应的终点货位信息");
            }
            stockInfo.LocationCode = task.TargetAddress;
            stockInfo.StockStatus = StockStatusEmun.入库完成.ObjToInt();
            stockInfo.Details.ForEach(x =>
            {
                x.Status = StockStatusEmun.入库完成.ObjToInt();
            });
            _stockService.StockInfoService.Repository.UpdateData(stockInfo);
            _stockService.StockInfoDetailService.Repository.UpdateData(stockInfo.Details);

            if (stockInfo.PalletType == PalletTypeEnum.Empty.ObjToInt())
            {
                locationInfo.LocationStatus = LocationStatusEnum.Pallet.ObjToInt();
            }
            else
            {
                locationInfo.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
            }
            _locationInfoService.Repository.UpdateData(locationInfo);

            task.TaskStatus = TaskStatusEnum.Finish.ObjToInt();

            BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateTypeEnum.自动完成 : OperateTypeEnum.人工完成);

            return WebResponseContent.Instance.OK();
        }

        public async Task<WebResponseContent> OutEmptyTaskCompleted(Dt_Task task)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                Dt_StockInfo stockInfo = _stockRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletCode == task.PalletCode && x.WarehouseId == task.WarehouseId).First();
                Dt_StockInfo stockInfo = _stockRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletCode == task.PalletCode).First();
                if (stockInfo == null)
                {
                    return WebResponseContent.Instance.Error($"未找到托盘对应的库存信息");
@@ -305,7 +479,6 @@
                    return content.Error($"未找到对应的终点货位信息");
                }

                _stockRepository.Db.Deleteable(stockInfo);

                int beforeStatus = locationInfo.LocationStatus;

@@ -317,6 +490,7 @@
                task.TaskStatus = TaskStatusEnum.Finish.ObjToInt();
                BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateTypeEnum.自动完成 : OperateTypeEnum.人工完成);
                _stockService.StockInfoService.Repository.DeleteAndMoveIntoHty(stockInfo, App.User.UserId == 0 ? OperateTypeEnum.自动完成 : OperateTypeEnum.人工完成);
                _stockRepository.Db.Deleteable(stockInfo).ExecuteCommand();

                _locationStatusChangeRecordService.AddLocationStatusChangeRecord(locationInfo, beforeStatus, StockChangeType.Outbound.ObjToInt(), stockInfo.Details.FirstOrDefault()?.OrderNo ?? "", task.TaskNum);

@@ -325,9 +499,154 @@
            }
            catch (Exception ex)
            {
                _logger.LogError($"TaskService OutEmptyTaskCompleted:  {ex.Message} ");
                return await Task.FromResult(WebResponseContent.Instance.Error(ex.Message));
            }
        }




        /// <summary>
        /// å›žåº“完成回调 
        public async Task<WebResponseContent> BackToStockComplete(Dt_Task task)
        {
            try
            {
                _unitOfWorkManage.BeginTran();

                // èŽ·å–相关的出库锁定信息
                var lockInfos = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
                    .Where(x => x.TaskNum == task.TaskNum &&
                               x.Status == (int)OutLockStockStatusEnum.回库中)
                    .ToListAsync();

                if (!lockInfos.Any())
                    return WebResponseContent.Instance.Error("未找到回库中的锁定信息");

                //  æ¢å¤åº“存出库数量（回库的部分）
                await RestoreStockOutboundQuantity(lockInfos);

                //  æ›´æ–°å‡ºåº“单明细的锁定数量
                var orderDetailGroups = lockInfos.GroupBy(x => x.OrderDetailId);

                foreach (var group in orderDetailGroups)
                {
                    var orderDetailId = group.Key;
                    var totalUnpicked = group.Sum(x => x.AssignQuantity - x.PickedQty);

                    if (totalUnpicked > 0)
                    {
                        var orderDetail = await _outboundOrderService.Db.Queryable<Dt_OutboundOrderDetail>()
                            .Where(x => x.Id == orderDetailId)
                            .FirstAsync();
                        orderDetail.LockQuantity -= totalUnpicked;

                        // æ¢å¤çŠ¶æ€
                        if (orderDetail.LockQuantity <= 0 && orderDetail.OverOutQuantity <= 0)
                        {
                            orderDetail.OrderDetailStatus = (int)OrderDetailStatusEnum.New;
                        }
                        else if (orderDetail.OverOutQuantity > 0)
                        {
                            orderDetail.OrderDetailStatus = (int)OrderDetailStatusEnum.AssignOverPartial;
                        }

                        await _outboundOrderService.Db.Updateable(orderDetail).ExecuteCommandAsync();
                    }
                }

                //  æ›´æ–°é”å®šä¿¡æ¯çŠ¶æ€ä¸ºå·²å›žåº“
                foreach (var lockInfo in lockInfos)
                {
                    lockInfo.Status = (int)OutLockStockStatusEnum.已回库;
                }
                await _outStockLockInfoService.Db.Updateable(lockInfos).ExecuteCommandAsync();

                // 6. æ›´æ–°åº“存状态
                var stockIds = lockInfos.Select(x => x.StockId).Distinct().ToList();
                var stocks = await _stockService.StockInfoService.Db.Queryable<Dt_StockInfo>()
                    .Where(x => stockIds.Contains(x.Id))
                    .ToListAsync();

                foreach (var stock in stocks)
                {
                    stock.StockStatus = (int)StockStatusEmun.入库完成;
                    stock.LocationCode = task.TargetAddress; // æ›´æ–°è´§ä½
                }
                await _stockService.StockInfoService.Db.Updateable(stocks).ExecuteCommandAsync();

                // 7. æ›´æ–°è´§ä½çŠ¶æ€
                var location = await _locationInfoService.Db.Queryable<Dt_LocationInfo>()
                    .Where(x => x.LocationCode == task.TargetAddress)
                    .FirstAsync();
                if (location != null)
                {
                    location.LocationStatus = (int)LocationStatusEnum.InStock;
                    await _locationInfoService.Db.Updateable(location).ExecuteCommandAsync();
                }

                //  æ›´æ–°ä»»åŠ¡çŠ¶æ€ä¸ºå·²å®Œæˆ
                task.TaskStatus = (int)TaskStatusEnum.Finish;

                await Db.Updateable(task).ExecuteCommandAsync();

                _unitOfWorkManage.CommitTran();

                return WebResponseContent.Instance.OK("回库完成", new
                {
                    TaskNum = task.TaskNum,
                    PalletCode = task.PalletCode,
                    RestoredQuantity = lockInfos.Sum(x => x.AssignQuantity - x.PickedQty)
                });
            }
            catch (Exception ex)
            {
                _unitOfWorkManage.RollbackTran();
                return WebResponseContent.Instance.Error($"回库完成处理失败: {ex.Message}");
            }
        }

        /// <summary>
        /// æ¢å¤åº“存出库数量（回库的部分）
        /// </summary>
        private async Task RestoreStockOutboundQuantity(List<Dt_OutStockLockInfo> lockInfos)
        {
            // æŒ‰åº“å­˜ID和物料分组
            var stockGroups = lockInfos.GroupBy(x => new { x.StockId, x.MaterielCode });

            foreach (var group in stockGroups)
            {
                var stockId = group.Key.StockId;
                var materielCode = group.Key.MaterielCode;
                var totalUnpicked = group.Sum(x => x.AssignQuantity - x.PickedQty);

                if (totalUnpicked <= 0) continue;

                // èŽ·å–该物料在库存中的所有条码
                var stockDetails = await _stockService.StockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
                    .Where(x => x.StockId == stockId && x.MaterielCode == materielCode)
                    .ToListAsync();

                if (!stockDetails.Any()) continue;

                // æŒ‰å‡ºåº“数量的比例分配恢复数量
                var totalOutbound = stockDetails.Sum(x => x.OutboundQuantity);

                if (totalOutbound <= 0) continue;

                foreach (var detail in stockDetails)
                {
                    if (detail.OutboundQuantity <= 0) continue;

                    decimal ratio = detail.OutboundQuantity / totalOutbound;
                    decimal restoreAmount = Math.Min(detail.OutboundQuantity, totalUnpicked * ratio);

                    detail.OutboundQuantity -= restoreAmount;
                    await _stockService.StockInfoDetailService.Db.Updateable(detail).ExecuteCommandAsync();
                }
            }
        }

    }
}