a

Zhang-Hong-Lin

2025-03-04 f8f31ede7a7d550cf0cea943226bd521bd4274a8

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

@@ -19,6 +19,7 @@
using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
using SqlSugar;
using System.Diagnostics.CodeAnalysis;
using System.Threading.Tasks;
using WIDESEAWCS_Common.LocationEnum;
using WIDESEAWCS_Common.StockEnum;
using WIDESEAWCS_Common.TaskEnum;
@@ -252,14 +253,14 @@
                    return task;
                }
                //查询当前任务池中是否存在状态为非新建的
                task= BaseDal.QueryFirst(v => v.TaskState != (int)TaskInStatusEnum.InNew || v.TaskState != (int)TaskOutStatusEnum.OutNew);
                if (task != null)
                {
                    throw new Exception($"当前任务池中存在执行中的任务,任务号:【{task.TaskNum}】");
                }
                //task= BaseDal.QueryFirst(v => v.TaskState != (int)TaskInStatusEnum.InNew || v.TaskState != (int)TaskOutStatusEnum.OutNew);
                //if (task != null)
                //{
                //    throw new Exception($"当前任务池中存在执行中的任务,任务号:【{task.TaskNum}】");
                //}
                if (workTpe.Equals("In"))
                {
                    task = BaseDal.QueryData(v=>v.TaskType==(int)TaskInboundTypeEnum.Inbound && v.TaskState==(int)TaskInStatusEnum.InNew).OrderBy(v=>v.CreateDate).First();
                    task = BaseDal.QueryData(v=>v.TaskType==(int)TaskInboundTypeEnum.Inbound && v.TaskState==(int)TaskInStatusEnum.InNew).OrderByDescending(v=>v.Grade) .OrderBy(v=>v.CreateDate).First();
                }
                else if (workTpe.Equals("Out"))
                {
@@ -310,7 +311,7 @@
        /// <returns>返回任务实体对象，可能为null</returns>
        public Dt_Task QueryTakNnmTask(int taskNum)
        {
            return BaseDal.QueryFirst(v=>v.TaskNum== taskNum);
            return BaseDal.QueryFirst(v=>v.TaskId== taskNum);
        }
        /// <summary>
        /// ä¿®æ”¹å¤©è½¦ä»»åŠ¡çŠ¶æ€ï¼Œå°†å…¥åº“取货执行中修改为入库取货完成
@@ -431,7 +432,7 @@
            }
            catch (Exception ex)
            {
                _ErrormsginfoService.UpdateErrorMsg(ex.Message,1);
                UpdateTaskExceptionMessage(taskNum, ex.Message);
            }
        }

@@ -565,7 +566,7 @@
            WebResponseContent content = new WebResponseContent();
            try
            {
                var nawtask = BaseDal.QueryFirst(v=>v.TaskNum== taskNum);
                var nawtask = BaseDal.QueryFirst(v=>v.TaskId== taskNum);
                if (nawtask == null)
                {
                    throw new Exception(string.Format("天车放货完成任务未查询到任务号{0}", taskNum));
@@ -577,11 +578,35 @@
                    Dt_StockInfo stock = new Dt_StockInfo();
                    stock.LocationCode = nawtask.TargetAddress;
                    stock.Weight = (decimal)weight;
                    stock.StockStatus = (int)stockEnum.Lock;
                    stock.BatchNo = batck.Batch;
                    stock.StockStatus = (int)stockEnum.Free;
                    stock.BatchNo = batck.InBatch;
                    if (nawtask.Remark== (int)MateTypeEnum.ZiChan)
                    {
                        stock.Remark = (int)MateTypeEnum.ZiChan;
                    }
                    else
                    {
                        stock.Remark = (int)MateTypeEnum.WaiGou;
                    }
                    Dt_StockInfo stockTow = new Dt_StockInfo();
                    stockTow.LocationCode = nawtask.NextAddress;
                    stockTow.Weight = (decimal)weight;
                    stockTow.StockStatus = (int)stockEnum.Free;
                    stockTow.BatchNo = batck.InBatch;
                    if (nawtask.Remark == (int)MateTypeEnum.ZiChan)
                    {
                        stockTow.Remark = (int)MateTypeEnum.ZiChan;
                    }
                    else
                    {
                        stockTow.Remark = (int)MateTypeEnum.WaiGou;
                    }
                    //修改货位信息
                    var location = _locationRepository.QueryFirst(v=>v.LocationCode==nawtask.TargetAddress);
                    location.LocationStatus = (int)LocationStatusEnum.InStock;
                    //修改货位信息
                    var locationtow = _locationRepository.QueryFirst(v => v.LocationCode == nawtask.NextAddress);
                    locationtow.LocationStatus = (int)LocationStatusEnum.InStock;
                    //处理任务信息
                    Dt_Task_hty taskhty = new Dt_Task_hty();
                    taskhty.TaskNum = nawtask.TaskNum;
@@ -594,10 +619,15 @@
                    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);
                    _stockRepository.AddData(stockTow);
                    _locationRepository.UpdateData(location);
                    _locationRepository.UpdateData(locationtow);
                    _taskhtyRepository.AddData(taskhty);
                    BaseDal.DeleteData(nawtask);
                    //提交事务
@@ -606,14 +636,18 @@
                else if (nawtask.TaskType == (int)TaskOutboundTypeEnum.Outbound)
                {
                    //查找库存
                    var stock = _stockRepository.QueryFirst(v=>v.LocationCode== nawtask.TargetAddress);
                    var stock = _stockRepository.QueryFirst(v=>v.LocationCode== nawtask.SourceAddress);
                    if (stock == null) 
                    {
                        throw new Exception($"未找到库存信息货位号:【{nawtask.TargetAddress}】");
                    }
                    var Towstock = _stockRepository.QueryFirst(v => v.LocationCode == nawtask.NextAddress);
                    //修改货位状态
                    var location = _locationRepository.QueryFirst(v => v.LocationCode == nawtask.TargetAddress);
                    var location = _locationRepository.QueryFirst(v => v.LocationCode == nawtask.SourceAddress);
                    location.LocationStatus = (int)LocationStatusEnum.Free;
                    //修改货位状态
                    var locationTow = _locationRepository.QueryFirst(v => v.LocationCode == nawtask.NextAddress);
                    locationTow.LocationStatus = (int)LocationStatusEnum.Free;
                    //准备历史任务数据
                    Dt_Task_hty taskhty = new Dt_Task_hty();
                    taskhty.TaskNum = nawtask.TaskNum;
@@ -626,10 +660,15 @@
                    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);
                    _stockRepository.DeleteData(Towstock);
                    _locationRepository.UpdateData(location);
                    _locationRepository.UpdateData(locationTow);
                    _taskhtyRepository.AddData(taskhty);
                    BaseDal.DeleteData(nawtask);
                    //提交事务