后端

Zhang-Hong-Lin

2025-03-10 eb72ad7c5ec8f4f0cd8b291d16534a10e9eb113c

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs

@@ -50,6 +50,7 @@
        private readonly IRepository<dt_errormsgInfo> _errorinfoRepository;
        private readonly Idt_ErrormsginfoService _ErrormsginfoService;
        private readonly IMapper _mapper;
        private readonly IRepository<dt_stationInfo> _dt_stationInfoRepository;

        private Dictionary<string, OrderByType> _taskOrderBy = new()
            {
@@ -78,6 +79,7 @@
            IRepository<dt_batchInfo> batchRepository,
            IRepository<Dt_Task_hty> taskhtyRepository,
            IRepository<dt_errormsgInfo> errorinfoRepository,
            IRepository<dt_stationInfo> dt_stationInfoRepository,
            Idt_ErrormsginfoService errormsginfoService,
            IUnitOfWorkManage unitOfWorkManage,
            IMapper mapper) : base(BaseDal)
@@ -93,6 +95,7 @@
            _errorinfoRepository = errorinfoRepository;
            _ErrormsginfoService = errormsginfoService;
            _mapper = mapper;
            _dt_stationInfoRepository = dt_stationInfoRepository;
        }

        /// <summary>
@@ -622,8 +625,49 @@
                    throw new Exception(string.Format("天车放货完成任务未查询到任务号{0}", taskNum));
                }
                
                
                if (nawtask.TaskType == (int)TaskInboundTypeEnum.Inbound)
                {
                    var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "剔除架");
                    string sourceAddress = station.Row + "-" + station.Column + "-1";
                    if (nawtask.SourceAddress.Equals(sourceAddress))
                    {
                        var batck = _batchinfoRepository.QueryFirst(v => v.Id == 1);
                        //新建库存
                        Dt_StockInfo stock = new Dt_StockInfo();
                        stock.LocationCode = nawtask.TargetAddress;
                        stock.Weight = (decimal)weight;
                        stock.StockStatus = (int)stockEnum.Free;
                        stock.BatchNo = batck.InBatch;
                        stock.Remark = 3;
                        //修改货位信息
                        var location = _locationRepository.QueryFirst(v => v.LocationCode == nawtask.TargetAddress);
                        location.LocationStatus = (int)LocationStatusEnum.InStock;
                        //处理任务信息
                        Dt_Task_hty taskhty = new Dt_Task_hty();
                        taskhty.TaskNum = nawtask.TaskNum;
                        taskhty.Roadway = nawtask.Roadway;
                        taskhty.TaskType = nawtask.TaskType;
                        taskhty.TaskState = (int)TaskInStatusEnum.Line_InFinish;
                        taskhty.SourceAddress = nawtask.SourceAddress;
                        taskhty.TargetAddress = nawtask.TargetAddress;
                        taskhty.ExceptionMessage = nawtask.ExceptionMessage;
                        taskhty.Grade = nawtask.Grade;
                        taskhty.Dispatchertime = nawtask.Dispatchertime;
                        taskhty.Remark = nawtask.Remark;
                        taskhty.PalletCode = nawtask.PalletCode;
                        taskhty.NextAddress = nawtask.NextAddress;
                        taskhty.CurrentAddress = nawtask.CurrentAddress;

                        //开始数据库事务
                        _unitOfWorkManage.BeginTran();
                        _stockRepository.AddData(stock);
                        _locationRepository.UpdateData(location);
                        _taskhtyRepository.AddData(taskhty);
                        BaseDal.DeleteData(nawtask);
                        //提交事务
                        _unitOfWorkManage.CommitTran();
                    }
                    else
                {
                    var batck = _batchinfoRepository.QueryFirst(v=>v.Id==1);
                    //新建库存
@@ -686,7 +730,48 @@
                    //提交事务
                    _unitOfWorkManage.CommitTran();
                }
                }
                else if (nawtask.TaskType == (int)TaskOutboundTypeEnum.Outbound)
                {
                    var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "西跨架子");
                    string targetAddress = station.Row + "-" + station.Column + "-1";
                    if (nawtask.TargetAddress.Equals(targetAddress))
                    {
                        //查找库存
                        var stock = _stockRepository.QueryFirst(v => v.LocationCode == nawtask.SourceAddress);
                        if (stock == null)
                        {
                            throw new Exception($"未找到库存信息货位号:【{nawtask.TargetAddress}】");
                        }
                        //修改货位状态
                        var location = _locationRepository.QueryFirst(v => v.LocationCode == nawtask.SourceAddress);
                        location.LocationStatus = (int)LocationStatusEnum.Free;
                        //准备历史任务数据
                        Dt_Task_hty taskhty = new Dt_Task_hty();
                        taskhty.TaskNum = nawtask.TaskNum;
                        taskhty.Roadway = nawtask.Roadway;
                        taskhty.TaskType = nawtask.TaskType;
                        taskhty.TaskState = (int)TaskOutStatusEnum.OutFinish;
                        taskhty.SourceAddress = nawtask.SourceAddress;
                        taskhty.TargetAddress = nawtask.TargetAddress;
                        taskhty.ExceptionMessage = nawtask.ExceptionMessage;
                        taskhty.Grade = nawtask.Grade;
                        taskhty.Dispatchertime = nawtask.Dispatchertime;
                        taskhty.Remark = nawtask.Remark;
                        taskhty.PalletCode = nawtask.PalletCode;
                        taskhty.NextAddress = nawtask.NextAddress;
                        taskhty.CurrentAddress = nawtask.CurrentAddress;
                        //开始数据库事务

                        _unitOfWorkManage.BeginTran();
                        _stockRepository.DeleteData(stock);
                        _locationRepository.UpdateData(location);
                        _taskhtyRepository.AddData(taskhty);
                        BaseDal.DeleteData(nawtask);
                        //提交事务
                        _unitOfWorkManage.CommitTran();
                    }
                    else
                {
                    //查找库存
                    var stock = _stockRepository.QueryFirst(v=>v.LocationCode== nawtask.SourceAddress);
@@ -743,6 +828,7 @@
                    //提交事务
                    _unitOfWorkManage.CommitTran();
                }
                }
                else if (nawtask.TaskType == (int)TaskOutboundTypeEnum.OutInventory || nawtask.TaskType == (int)TaskMoveEnum.Mowe)
                {
                    //处理任务信息