数据库脚本提交

duyongjia

2025-02-28 cb385f0b515c738b503c5c75c9d7efcec323716d

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs

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

using AutoMapper;
using Newtonsoft.Json;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
using SqlSugar;
using SqlSugar.Extensions;
using System;
using System.Collections;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using System.Reflection;
@@ -40,6 +43,7 @@
using WIDESEAWCS_ITaskInfoRepository;
using WIDESEAWCS_ITaskInfoService;
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_QuartzJob;
using WIDESEAWCS_QuartzJob.Models;
using WIDESEAWCS_QuartzJob.Service;

@@ -53,6 +57,7 @@
        private readonly ILocationInfoRepository _locationInfoRepository;
        private readonly IMapper _mapper;
        private readonly IUnitOfWorkManage _unitOfWorkManage;
        private readonly ITaskRepository _taskRepository;

        private Dictionary<string, OrderByType> _taskOrderBy = new()
            {
@@ -70,7 +75,7 @@

        public List<int> TaskOtherboundTypes => typeof(TaskOtherTypeEnum).GetEnumIndexList();

        public TaskService(ITaskRepository BaseDal, IRouterService routerService, ITaskExecuteDetailService taskExecuteDetailService, ITaskExecuteDetailRepository taskExecuteDetailRepository, IMapper mapper, ILocationInfoRepository locationInfoRepository, IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
        public TaskService(ITaskRepository BaseDal, IRouterService routerService, ITaskExecuteDetailService taskExecuteDetailService, ITaskExecuteDetailRepository taskExecuteDetailRepository, IMapper mapper, ILocationInfoRepository locationInfoRepository, IUnitOfWorkManage unitOfWorkManage, ITaskRepository taskRepository) : base(BaseDal)
        {
            _routerService = routerService;
            _taskExecuteDetailService = taskExecuteDetailService;
@@ -78,6 +83,7 @@
            _mapper = mapper;
            _locationInfoRepository = locationInfoRepository;
            _unitOfWorkManage = unitOfWorkManage;
            _taskRepository = taskRepository;
        }

        /// <summary>
@@ -147,7 +153,9 @@
            WebResponseContent content = new WebResponseContent();
            try
            {
               // ServiceLogger.WriteLogToFile("");
                string inparam = JsonConvert.SerializeObject(taskDTO);
                
                ServiceLogger.WriteDebug("ReceiveTask", $"ReceiveMESTask方法入参{inparam}"); 
                Dt_Task task = new Dt_Task();
                Dt_Task taskinfo = BaseDal.QueryFirst(x => x.TaskNum == taskDTO.task_id);
                if(taskDTO.cmd==101)//如果是101按旧的任务号去查
@@ -157,6 +165,7 @@

                if (taskDTO.cmd!=3001&& taskDTO.cmd != 101 && taskinfo != null)
                {
                    ServiceLogger.WriteDebug("ReceiveTask", $"任务号重复，任务号：{taskDTO.task_id}");
                    return content = WebResponseContent.Instance.Error($"任务号重复，任务号：{taskDTO.task_id}");
                }
                Dt_LocationInfo locationsrc = _locationInfoRepository.QueryFirst(x => x.Remark == taskDTO.src_station.ToString());
@@ -175,10 +184,11 @@
                        }
                        else
                        {
                            ServiceLogger.WriteDebug("ReceiveTask", $"WCS未查询到源站点对应的库位，源站点：{taskDTO.dest_station.ToString()}");
                            return content = WebResponseContent.Instance.Error($"WCS未查询到源站点对应的库位，源站点：{taskDTO.dest_station.ToString()}");
                        }
                        break;
                    case 3001://AGV放货完成 WMS发3001的同时会写提升信号
                    case 3001://AGV放货完成 WMS发3001的同时WCS需在job中写提升信号
                        if (BaseDal.QueryFirst(x => x.TaskNum == taskDTO.task_id) == null)//手动入库直接发3001，需要生成任务，因为没有1001环节
                        {

@@ -193,6 +203,7 @@
                            }
                            else
                            {
                                ServiceLogger.WriteDebug("ReceiveTask", $"WCS未查询到源站点对应的库位，源站点：{taskDTO.dest_station.ToString()}");
                                return content = WebResponseContent.Instance.Error($"WCS未查询到源站点对应的库位，源站点：{taskDTO.dest_station.ToString()}");
                            }
                        }
@@ -201,7 +212,8 @@
                            if (taskinfo != null)
                            {
                                UpdateTaskStatus(taskinfo.TaskId, (int)TaskInStatusEnum.AGV_InExecuting);
                                _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"AGV入库执行中");
                                _taskExecuteDetailService.AddTaskExecuteDetail(taskinfo.TaskId, $"AGV入库执行中");
                                ServiceLogger.WriteDebug("ReceiveTask", $"AGV入库执行中（自动3001）更新状态成功，任务号：{taskinfo.TaskId}");
                                return content = WebResponseContent.Instance.OK($"AGV入库执行中（自动3001）更新状态成功，任务号：{taskinfo.TaskId}");
                            }
                            else
@@ -216,11 +228,13 @@
                        {
                            //更新任务表中NextAddress字段为新的任务号   taskDTO.weight-旧的任务号   taskDTO.task_id-新的任务号
                            UpdateTaskStatus(taskinfo.TaskId, taskDTO.task_id, (int)TaskInStatusEnum.AGV_InFinish);
                            _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"AGV搬运完成");
                            _taskExecuteDetailService.AddTaskExecuteDetail(taskinfo.TaskId, $"AGV搬运完成");
                            ServiceLogger.WriteDebug("ReceiveTask", $"AGV搬运完成（101）更新状态成功，任务号：{taskinfo.TaskId}");
                            return content = WebResponseContent.Instance.OK($"AGV搬运完成（101）更新状态成功，任务号：{taskinfo.TaskId}");
                        }
                        else
                        {
                            ServiceLogger.WriteDebug("ReceiveTask", $"AGV搬运完成（101）更新状态时，查询不到任务号");
                            return content = WebResponseContent.Instance.Error($"AGV搬运完成（101）更新状态时，查询不到任务号");
                        }
                        break;
@@ -229,6 +243,10 @@
                        task.TaskType= (int)TaskRelocationTypeEnum.Relocation;
                        task.TaskState = (int)TaskOutStatusEnum.OutNew;
                        task.Roadway = "SC01";
                        if (taskDTO.total > 0)
                        {
                            task.Remark = taskDTO.total.ToString();//取出库的总层数
                        }
                        task.Grade = 1;
                        break;
                    case 102:
@@ -252,7 +270,8 @@
                        }
                        else
                        {
                           return  content = WebResponseContent.Instance.Error($"WCS未查询到目标站点对应的库位，目标站点：{taskDTO.dest_station.ToString()}");
                            ServiceLogger.WriteDebug("ReceiveTask", $"WCS未查询到目标站点对应的库位，目标站点：{taskDTO.dest_station.ToString()}");
                            return  content = WebResponseContent.Instance.Error($"WCS未查询到目标站点对应的库位，目标站点：{taskDTO.dest_station.ToString()}");
                        }
                        break;
                    case 104://组立机上料  æš‚存位-->组立机
@@ -270,7 +289,8 @@
                            }
                            else
                            {
                              return  content = WebResponseContent.Instance.Error($"WCS未查询到目标站点对应的库位，目标站点：{task.TargetAddress.ToString()}");
                                ServiceLogger.WriteDebug("ReceiveTask", $"WCS未查询到目标站点对应的库位，目标站点：{task.TargetAddress.ToString()}");
                                return  content = WebResponseContent.Instance.Error($"WCS未查询到目标站点对应的库位，目标站点：{task.TargetAddress.ToString()}");
                            }
                            //根据目标地址（组立机）查询默认的执行任务的小堆垛机编号
                            Dt_LocationInfo locationtemp2 = _locationInfoRepository.QueryFirst(x => x.LocationCode == task.TargetAddress.ToString());
@@ -280,6 +300,8 @@
                            }
                            else
                            {

                                ServiceLogger.WriteDebug("ReceiveTask", $"WCS未查询到组立机对应的默认小堆垛机配置");
                                return content = WebResponseContent.Instance.Error($"WCS未查询到组立机对应的默认小堆垛机配置");
                            }
                            
@@ -292,7 +314,7 @@

                task.TaskNum = taskDTO.task_id;
                task.PalletCode = taskDTO.CarId;
                task.Roadway = "SC01";
             
                if (string.IsNullOrEmpty(task.SourceAddress))//如果不是站点，直接取行列层
                {
                    task.SourceAddress = $"SC01-{taskDTO.src_rack.ToString().PadLeft(3, '0')}-{taskDTO.src_col.ToString().PadLeft(3, '0')}-{taskDTO.src_row.ToString().PadLeft(3, '0')}";
@@ -310,10 +332,12 @@
                {
                    if (srcLocation.EnableStatus == (int)EnableStatusEnum.Disable)
                    {
                        ServiceLogger.WriteDebug("ReceiveTask", $"源地址已禁用：{srcLocation.LocationCode}");
                        return content = WebResponseContent.Instance.Error($"源地址已禁用：{srcLocation.LocationCode}");
                    }
                    if (tarLocation.EnableStatus == (int)EnableStatusEnum.Disable)
                    {
                        ServiceLogger.WriteDebug("ReceiveTask", $"目标地址已禁用：{tarLocation.LocationCode}");
                        return content = WebResponseContent.Instance.Error($"目标地址已禁用：{tarLocation.LocationCode}");
                    }
                    if (taskDTO.cmd != 101)//入库时不需要判断是否锁定，锁定状态是在生成任务时锁定
@@ -323,10 +347,13 @@
                        {
                            if (srcLocation.LocationStatus == (int)LocationStatusEnum.Lock)
                            {

                                ServiceLogger.WriteDebug("ReceiveTask", $"源地址已锁定：{srcLocation.LocationCode}");
                                return content = WebResponseContent.Instance.Error($"源地址已锁定：{srcLocation.LocationCode}");
                            }
                            if (tarLocation.LocationStatus == (int)LocationStatusEnum.Lock)
                            {
                                ServiceLogger.WriteDebug("ReceiveTask", $"目标地址已锁定：{tarLocation.LocationCode}");
                                return content = WebResponseContent.Instance.Error($"目标地址已锁定：{tarLocation.LocationCode}");
                            }
                        }
@@ -336,6 +363,8 @@
                        //WCS查询库位状态是否为“空闲”并且未禁用，锁定库位修改库位状态为“锁定”，生成WCS产品入库任务，加入WCS任务队列中。          
                        if (tarLocation.LocationStatus != (int)LocationStatusEnum.Free)
                        {

                            ServiceLogger.WriteDebug("ReceiveTask", $"入库-目标地址不是空闲状态：{tarLocation.LocationCode}");
                            return content = WebResponseContent.Instance.Error($"入库-目标地址不是空闲状态：{tarLocation.LocationCode}");
                        }
                        //srcLocation.LocationStatus = (int)LocationStatusEnum.Lock;
@@ -354,10 +383,14 @@
                        //WCS查询库位状态是否为“有货”，库位/暂存库位是否“空闲”
                        if (srcLocation.LocationStatus != (int)LocationStatusEnum.InStock)
                        {

                            ServiceLogger.WriteDebug("ReceiveTask", $"移库-源地址不是有货状态：{srcLocation.LocationCode}");
                            return content = WebResponseContent.Instance.Error($"移库-源地址不是有货状态：{srcLocation.LocationCode}");
                        }
                        if(tarLocation.LocationStatus != (int)LocationStatusEnum.Free)
                        {

                            ServiceLogger.WriteDebug("ReceiveTask", $"移库-目标地址不是空闲状态：{srcLocation.LocationCode}");
                            return content = WebResponseContent.Instance.Error($"移库-目标地址不是空闲状态：{srcLocation.LocationCode}");
                        }
                        srcLocation.LocationStatus = (int)LocationStatusEnum.Lock;
@@ -369,6 +402,8 @@
                        //WCS查询库位状态是否为“有货”
                        if (srcLocation.LocationStatus != (int)LocationStatusEnum.InStock)
                        {

                            ServiceLogger.WriteDebug("ReceiveTask", $"异常出库-源地址不是有货状态：{srcLocation.LocationCode}");
                            return content = WebResponseContent.Instance.Error($"异常出库-源地址不是有货状态：{srcLocation.LocationCode}");
                        }
                        srcLocation.LocationStatus = (int)LocationStatusEnum.Lock;
@@ -384,6 +419,8 @@
                        //WCS查询暂存库位是否“有货”
                        if (srcLocation.LocationStatus != (int)LocationStatusEnum.InStock)
                        {

                            ServiceLogger.WriteDebug("ReceiveTask", $"空车出库-源地址不是有货状态：{srcLocation.LocationCode}");
                            return content = WebResponseContent.Instance.Error($"空车出库-源地址不是有货状态：{srcLocation.LocationCode}");
                        }
                        //srcLocation.LocationStatus = (int)LocationStatusEnum.Lock;
@@ -398,6 +435,8 @@
                        //WCS查询暂存库位是否“有货”
                        if (srcLocation.LocationStatus != (int)LocationStatusEnum.InStock)
                        {

                            ServiceLogger.WriteDebug("ReceiveTask", $"上料任务-源地址不是有货状态：{srcLocation.LocationCode}");
                            return content = WebResponseContent.Instance.Error($"上料任务-源地址不是有货状态：{srcLocation.LocationCode}");
                        }
                        //srcLocation.LocationStatus = (int)LocationStatusEnum.Lock;
@@ -408,6 +447,7 @@
                }
                else
                {
                    ServiceLogger.WriteDebug("ReceiveTask", $"库位地址不存在，任务号:{task.TaskNum}");
                    return content = WebResponseContent.Instance.Error($"库位地址不存在，任务号:{task.TaskNum}");
                }

@@ -431,16 +471,264 @@
                    _unitOfWorkManage.RollbackTran();
                    throw;
                }

                content = WebResponseContent.Instance.OK("成功",task);
                ServiceLogger.WriteDebug("ReceiveTask", $"接收任务成功，任务号:{task.TaskNum}");
                content = WebResponseContent.Instance.OK($"接收任务成功，任务号:{task.TaskNum}", task);
                
            }
            catch (Exception ex)
            {
                ServiceLogger.WriteDebug("ReceiveTask", $"任务接收错误,错误信息:{ex.StackTrace}");
                content = WebResponseContent.Instance.Error($"任务接收错误,错误信息:{ex.Message}");
            }
            return content;

        }


        /// <summary>
        /// wcs手工生成任务
        /// </summary>
        /// <param name="taskDTO">WCS任务对象</param>
        /// <returns>返回处理结果</returns>
        public WebResponseContent ReceiveWCSTask([NotNull] MESTaskDTO taskDTO)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                taskDTO.task_id = GetTaskNo();
                string inparam = JsonConvert.SerializeObject(taskDTO);

                ServiceLogger.WriteDebug("ReceiveWCSTask", $"ReceiveWCSTask方法入参{inparam}");
                Dt_Task task = new Dt_Task();
                Dt_Task taskinfo = BaseDal.QueryFirst(x => x.TaskNum == taskDTO.task_id);
                if (taskDTO.cmd == 101)//如果是101按旧的任务号去查
                {
                    taskinfo = BaseDal.QueryFirst(x => x.TaskNum == taskDTO.weight);
                }

                if (taskDTO.cmd != 3001 && taskDTO.cmd != 101 && taskinfo != null)
                {
                    ServiceLogger.WriteDebug("ReceiveWCSTask", $"任务号重复，任务号：{taskDTO.task_id}");
                    return content = WebResponseContent.Instance.Error($"任务号重复，任务号：{taskDTO.task_id}");
                }
                Dt_LocationInfo locationsrc = _locationInfoRepository.QueryFirst(x => x.Remark == taskDTO.src_station.ToString());
                Dt_LocationInfo locationdsc = _locationInfoRepository.QueryFirst(x => x.Remark == taskDTO.dest_station.ToString());
                switch (taskDTO.cmd)
                {
                    case 3001://AGV放货完成 WMS发3001的同时WCS需在job中写提升信号
                        if (BaseDal.QueryFirst(x => x.TaskNum == taskDTO.task_id) == null)//手动入库直接发3001，需要生成任务，因为没有1001环节
                        {
                            taskDTO.dest_rack =int.Parse(taskDTO.dest_station.ToString().Substring(0, 1));
                            taskDTO.dest_row = int.Parse(taskDTO.dest_station.ToString().Substring(1, 2).TrimStart('0'));
                            taskDTO.dest_col = int.Parse(taskDTO.dest_station.ToString().Substring(3, 2).TrimStart('0'));
                            task.TaskType = (int)TaskInboundTypeEnum.Inbound;
                            task.TaskState = (int)TaskInStatusEnum.AGV_InExecuting;
                            task.Roadway = "SC01";
                            task.Grade = 2;
                            
                            if (locationsrc != null)
                            {
                                task.SourceAddress = locationsrc.LocationCode;
                            }
                            else
                            {
                                ServiceLogger.WriteDebug("ReceiveWCSTask", $"WCS未查询到源站点对应的库位，源站点：{taskDTO.dest_station.ToString()}");
                                return content = WebResponseContent.Instance.Error($"WCS未查询到源站点对应的库位，源站点：{taskDTO.dest_station.ToString()}");
                            }
                        }
                        break;
                    case 101://提升机提升完成 
                        if (taskinfo != null)
                        {
                            //更新任务表中NextAddress字段为新的任务号   taskDTO.weight-旧的任务号   taskDTO.task_id-新的任务号
                            UpdateTaskStatus(taskinfo.TaskId, taskDTO.task_id, (int)TaskInStatusEnum.AGV_InFinish);
                            _taskExecuteDetailService.AddTaskExecuteDetail(taskinfo.TaskId, $"AGV搬运完成");
                            ServiceLogger.WriteDebug("ReceiveWCSTask", $"AGV搬运完成（101）更新状态成功，任务号：{taskinfo.TaskId}");
                            return content = WebResponseContent.Instance.OK($"AGV搬运完成（101）更新状态成功，任务号：{taskinfo.TaskId}");
                        }
                        else
                        {
                            ServiceLogger.WriteDebug("ReceiveWCSTask", $"AGV搬运完成（101）更新状态时，查询不到任务号");
                            return content = WebResponseContent.Instance.Error($"AGV搬运完成（101）更新状态时，查询不到任务号");
                        }
                        break;

                    case 103://产品移库（移库，出库）
                        taskDTO.src_rack = int.Parse(taskDTO.src_station.ToString().Substring(0, 1));
                        taskDTO.src_row = int.Parse(taskDTO.src_station.ToString().Substring(1, 2).TrimStart('0'));
                        taskDTO.src_col = int.Parse(taskDTO.src_station.ToString().Substring(3, 2).TrimStart('0'));

                        taskDTO.dest_rack = int.Parse(taskDTO.dest_station.ToString().Substring(0, 1));
                        taskDTO.dest_row = int.Parse(taskDTO.dest_station.ToString().Substring(1, 2).TrimStart('0'));
                        taskDTO.dest_col = int.Parse(taskDTO.dest_station.ToString().Substring(3, 2).TrimStart('0'));

                        taskDTO.total = 9;
                        task.TaskType = (int)TaskRelocationTypeEnum.Relocation;
                        task.TaskState = (int)TaskOutStatusEnum.OutNew;
                        task.Roadway = "SC01";
                        
                        if (taskDTO.total > 0)
                        {
                            task.Remark = taskDTO.total.ToString();//取出库的总层数
                        }
                        task.Grade = 1;
                        break;
                    case 102:
                        if (taskDTO.dest_station == 1001 || taskDTO.dest_station == 1002)//异常出库
                        {
                            taskDTO.src_rack = int.Parse(taskDTO.src_station.ToString().Substring(0, 1));
                            taskDTO.src_row = int.Parse(taskDTO.src_station.ToString().Substring(1, 2).TrimStart('0'));
                            taskDTO.src_col = int.Parse(taskDTO.src_station.ToString().Substring(3, 2).TrimStart('0'));
                            task.TaskType = (int)TaskOutboundTypeEnum.OutInventory;
                            task.TaskState = (int)TaskOutStatusEnum.OutNew;
                            task.Roadway = "SC01";
                            task.Grade = 1;
                        }
                        if (locationdsc != null)
                        {
                            task.TargetAddress = locationdsc.LocationCode;
                        }
                        else
                        {
                            ServiceLogger.WriteDebug("ReceiveWCSTask", $"WCS未查询到目标站点对应的库位，目标站点：{taskDTO.dest_station.ToString()}");
                            return content = WebResponseContent.Instance.Error($"WCS未查询到目标站点对应的库位，目标站点：{taskDTO.dest_station.ToString()}");
                        }
                        break;
                    default:
                        break;
                }

                task.TaskNum = taskDTO.task_id;
                task.PalletCode = taskDTO.CarId;

                if (string.IsNullOrEmpty(task.SourceAddress))//如果不是站点，直接取行列层
                {
                    task.SourceAddress = $"SC01-{taskDTO.src_rack.ToString().PadLeft(3, '0')}-{taskDTO.src_col.ToString().PadLeft(3, '0')}-{taskDTO.src_row.ToString().PadLeft(3, '0')}";
                }
                if (string.IsNullOrEmpty(task.TargetAddress))//如果不是站点，直接取行列层
                {
                    task.TargetAddress = $"SC01-{taskDTO.dest_rack.ToString().PadLeft(3, '0')}-{taskDTO.dest_col.ToString().PadLeft(3, '0')}-{taskDTO.dest_row.ToString().PadLeft(3, '0')}";
                }
                task.Creater = "WCS";
                task.WMSId = 3;//WCS人工建任务

                //判断货位状态
                Dt_LocationInfo srcLocation = _locationInfoRepository.QueryFirst(x => x.LocationCode == task.SourceAddress);
                Dt_LocationInfo tarLocation = _locationInfoRepository.QueryFirst(x => x.LocationCode == task.TargetAddress);
                if (srcLocation != null && tarLocation != null)
                {
                    if (srcLocation.EnableStatus == (int)EnableStatusEnum.Disable)
                    {
                        ServiceLogger.WriteDebug("ReceiveWCSTask", $"源地址已禁用：{srcLocation.LocationCode}");
                        return content = WebResponseContent.Instance.Error($"源地址已禁用：{srcLocation.LocationCode}");
                    }
                    if (tarLocation.EnableStatus == (int)EnableStatusEnum.Disable)
                    {
                        ServiceLogger.WriteDebug("ReceiveWCSTask", $"目标地址已禁用：{tarLocation.LocationCode}");
                        return content = WebResponseContent.Instance.Error($"目标地址已禁用：{tarLocation.LocationCode}");
                    }
                    if (taskDTO.cmd != 101)//入库时不需要判断是否锁定，锁定状态是在生成任务时锁定
                    {

                        if (taskinfo != null && taskDTO.cmd == 3001 && taskinfo.WMSId == 3)//如果是手动入库，发3001，会生成任务，需要判断库位是否锁定;自动模式发1001的时候就生成了任务，再发3001就不需要判断是否锁定了
                        {
                            if (srcLocation.LocationStatus == (int)LocationStatusEnum.Lock)
                            {

                                ServiceLogger.WriteDebug("ReceiveWCSTask", $"源地址已锁定：{srcLocation.LocationCode}");
                                return content = WebResponseContent.Instance.Error($"源地址已锁定：{srcLocation.LocationCode}");
                            }
                            if (tarLocation.LocationStatus == (int)LocationStatusEnum.Lock)
                            {
                                ServiceLogger.WriteDebug("ReceiveWCSTask", $"目标地址已锁定：{tarLocation.LocationCode}");
                                return content = WebResponseContent.Instance.Error($"目标地址已锁定：{tarLocation.LocationCode}");
                            }
                        }
                    }
                    if (task.TaskType == (int)TaskInboundTypeEnum.Inbound)//入库  è·¯å¾„：提升机库位-->库位
                    {
                        //WCS查询库位状态是否为“空闲”并且未禁用，锁定库位修改库位状态为“锁定”，生成WCS产品入库任务，加入WCS任务队列中。          
                        if (tarLocation.LocationStatus != (int)LocationStatusEnum.Free)
                        {

                            ServiceLogger.WriteDebug("ReceiveWCSTask", $"入库-目标地址不是空闲状态：{tarLocation.LocationCode}");
                            return content = WebResponseContent.Instance.Error($"入库-目标地址不是空闲状态：{tarLocation.LocationCode}");
                        }
                        tarLocation.LocationStatus = (int)LocationStatusEnum.Lock;
                    }
                    else if (task.TaskType == (int)TaskRelocationTypeEnum.Relocation)  //产品移库（移库，出库共用）  è·¯å¾„：库位-->库位/暂存库位
                    {
                        //WCS查询库位状态是否为“有货”，库位/暂存库位是否“空闲”
                        if (srcLocation.LocationStatus != (int)LocationStatusEnum.InStock)
                        {
                            ServiceLogger.WriteDebug("ReceiveWCSTask", $"移库-源地址不是有货状态：{srcLocation.LocationCode}");
                            return content = WebResponseContent.Instance.Error($"移库-源地址不是有货状态：{srcLocation.LocationCode}");
                        }
                        if (tarLocation.LocationStatus != (int)LocationStatusEnum.Free)
                        {

                            ServiceLogger.WriteDebug("ReceiveWCSTask", $"移库-目标地址不是空闲状态：{srcLocation.LocationCode}");
                            return content = WebResponseContent.Instance.Error($"移库-目标地址不是空闲状态：{srcLocation.LocationCode}");
                        }
                        srcLocation.LocationStatus = (int)LocationStatusEnum.Lock;
                        tarLocation.LocationStatus = (int)LocationStatusEnum.Lock;
                    }
                    else if (task.TaskType == (int)TaskOutboundTypeEnum.OutInventory)  //异常出库（退库） è·¯å¾„：库位-->提升机库位  
                    {
                        //WCS查询库位状态是否为“有货”
                        if (srcLocation.LocationStatus != (int)LocationStatusEnum.InStock)
                        {
                            ServiceLogger.WriteDebug("ReceiveWCSTask", $"异常出库-源地址不是有货状态：{srcLocation.LocationCode}");
                            return content = WebResponseContent.Instance.Error($"异常出库-源地址不是有货状态：{srcLocation.LocationCode}");
                        }
                        srcLocation.LocationStatus = (int)LocationStatusEnum.Lock;
                    }
                }
                else
                {
                    ServiceLogger.WriteDebug("ReceiveWCSTask", $"库位地址不存在，任务号:{task.TaskNum}");
                    return content = WebResponseContent.Instance.Error($"库位地址不存在，任务号:{task.TaskNum}");
                }

                try
                {
                    //开启事物
                    _unitOfWorkManage.BeginTran();
                    _locationInfoRepository.UpdateData(tarLocation);
                    _locationInfoRepository.UpdateData(srcLocation);
                    BaseDal.AddData(task);
                    Dt_Task tasktemp = BaseDal.QueryFirst(x => x.TaskNum == task.TaskNum);
                    _taskExecuteDetailService.AddTaskExecuteDetail(tasktemp.TaskId, "接收WCS任务");
                    //提交事务
                    _unitOfWorkManage.CommitTran();

                }
                catch (Exception)
                {
                    _unitOfWorkManage.RollbackTran();
                    throw;
                }
                ServiceLogger.WriteDebug("ReceiveWCSTask", $"接收任务成功，任务号:{task.TaskNum}");
                content = WebResponseContent.Instance.OK($"接收任务成功，任务号:{task.TaskNum}", task);

            }
            catch (Exception ex)
            {
                ServiceLogger.WriteDebug("ReceiveWCSTask", $"任务接收错误,错误信息:{ex.StackTrace}");
                content = WebResponseContent.Instance.Error($"任务接收错误,错误信息:{ex.Message}");
            }
            return content;
        }


        /// <summary>
        /// èŽ·å–任务号
        /// </summary>
        /// <returns></returns>
        public int GetTaskNo()
        {
            DataTable dt = BaseDal.QueryTable("SELECT FORMAT(NEXT VALUE FOR dbo.seqTaskNum, '0000000');");
            return int.Parse("9"+ dt.Rows[0][0].ToString());
        }

        /// <summary>
@@ -551,6 +839,15 @@
        }

        /// <summary>
        /// æŸ¥è¯¢ç§»åº“任务
        /// </summary>
        /// <returns></returns>
        public Dt_Task QueryStackerCraneTaskByRelotion(int taskNum)
        {
            return BaseDal.QueryFirst(x => (x.Roadway == "SC01" )&&x.TaskType==(int)TaskRelocationTypeEnum.Relocation && x.TaskNum==taskNum, TaskOrderBy);
        }

        /// <summary>
        /// æŸ¥è¯¢å°å †åž›æœºå‡ºåº“完成任务
        /// </summary>
        /// <returns></returns>
@@ -565,8 +862,19 @@
        /// <param name="deviceNo"></param>
        /// <returns></returns>
        public Dt_Task QueryStackerCraneTaskByAGVRequest(string deviceNo)
        {
        { 
            return BaseDal.QueryFirst(x => x.Roadway == deviceNo && (TaskInboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskInStatusEnum.InNew), TaskOrderBy);
        }

        /// <summary>
        /// æŸ¥è¯¢AGV进入中的入库任务
        /// </summary>
        /// <param name="deviceNo"></param>
        /// <returns></returns>
        public Dt_Task QueryStackerCraneTaskByAGVIning(string deviceNo)
        {

            return BaseDal.QueryFirst(x => x.Roadway == deviceNo && (TaskInboundTypes.Contains(x.TaskType)&&x.CurrentAddress=="1"), TaskOrderBy);
        }
        /// <summary>
        /// å¯¹åº”WMS请求 3001-AGV放货完成
@@ -646,13 +954,63 @@

                _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, task.ExceptionMessage);

                content = WebResponseContent.Instance.OK();
               
            }
            catch (Exception ex)
            {
                content = WebResponseContent.Instance.Error(ex.Message);
            }
            return content;
        }

        /// <summary>
        /// è‡ªåŠ¨å…¥åº“时更新是否进入升降机标志（0，未进入 1，已进入）
        /// </summary>
        /// <param name="taskNum"></param>
        /// <param name="Inflag"></param>
        /// <returns></returns>
        public WebResponseContent UpdateTaskAllowIn(int taskNum, int Inflag)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
                if (task == null) return WebResponseContent.Instance.Error($"未找到该任务信息,任务号:【{taskNum}】");
                task.CurrentAddress = Inflag.ToString();
                task.ModifyDate = DateTime.Now;
                BaseDal.UpdateData(task);
            }
            catch (Exception ex)
            {
                content = WebResponseContent.Instance.Error(ex.Message);
            }
            return content;

        }

        /// <summary>
        /// æ˜¯å¦å·²å›žä¼ MES2001标志（0，未回传 1，已回传）
        /// </summary>
        /// <param name="taskNum"></param>
        /// <param name="Inflag"></param>
        /// <returns></returns>
        public WebResponseContent UpdateTaskIsBack(int taskNum, int Inflag)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
                if (task == null) return WebResponseContent.Instance.Error($"未找到该任务信息,任务号:【{taskNum}】");
                task.Remark = Inflag.ToString();
                task.ModifyDate = DateTime.Now;
                BaseDal.UpdateData(task);
            }
            catch (Exception ex)
            {
                content = WebResponseContent.Instance.Error(ex.Message);
            }
            return content;

        }

        /// <summary>
@@ -668,6 +1026,277 @@
            task.Modifier = "System";
            task.ModifyDate = DateTime.Now;
            BaseDal.UpdateData(task);
        }

        /// <summary>
        /// ä»»åŠ¡å¼ºåˆ¶å®Œæˆ å †åž›æœºå®žé™…已完成任务，WCS未收到完成信号或其他未知原因导致WCS任务未完成，可以执行该方法强制完成任务
        /// </summary>
        /// <param name="taskNum"></param>
        /// <returns></returns>
        public WebResponseContent ForceCompleteTask(int taskNum)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                bool isBack = false;
                //1，先查询任务，根据不同的任务类型做任务强制完成操作
                Dt_Task task = _taskRepository.QueryFirst(x => x.TaskNum == taskNum);
                if (task == null) return WebResponseContent.Instance.Error($"未找到该任务信息,任务号:【{taskNum}】");

                Dt_LocationInfo locationsrc = _locationInfoRepository.QueryFirst(x => x.LocationCode == task.SourceAddress.ToString());
                Dt_LocationInfo locationdsc = _locationInfoRepository.QueryFirst(x => x.LocationCode == task.TargetAddress.ToString());
                if (task.TaskType == (int)TaskInboundTypeEnum.Inbound)
                {
                    if (task.TaskState == (int)TaskInStatusEnum.SC_InExecuting)
                    {
                        task.TaskState = (int)TaskInStatusEnum.SC_InFinish;
                        //需要将目标地址改为有货状态
                        locationdsc.LocationStatus = (int)LocationStatusEnum.InStock;

                        //更新状态为任务完成
                        UpdateTaskStatus(task.TaskId, task.TaskState);
                        _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"堆垛机入库完成");
                        _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"入库任务完成");
                        //更新货位
                        _locationInfoRepository.UpdateData(locationdsc);
                        isBack = true;

                    }
                    else
                    {
                        return content = WebResponseContent.Instance.Error("该任务目前状态，不允计强制完成！");
                    }

                }
                else
                {
                    if (task.TaskState == (int)TaskOutStatusEnum.SC_OutExecuting)
                    {
                       
                        if (task.TaskType == (int)TaskOutboundTypeEnum.OutInventory || task.TaskType == (int)TaskOutboundTypeEnum.OutPick)//异常出库 ç©ºè½¦å‡ºåº“
                        {
                            task.TaskState = (int)TaskOutStatusEnum.OutFinish;
                            //源地址更新为空闲
                            locationsrc.LocationStatus = (int)LocationStatusEnum.Free;

                            //更新状态为任务完成
                            UpdateTaskStatus(task.TaskId, task.TaskState);
                            _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"堆垛机出库完成");
                            _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"出库任务完成");
                            //更新货位
                            _locationInfoRepository.UpdateData(locationsrc);
                            isBack = true;
                        }
                        else if (task.TaskType == (int)TaskRelocationTypeEnum.Relocation)//移库
                        {
                            task.TaskState = (int)TaskOutStatusEnum.OutFinish;
                            //源地址更新为空闲
                            locationsrc.LocationStatus = (int)LocationStatusEnum.Free;
                            //目标地址更新为有货
                            locationdsc.LocationStatus = (int)LocationStatusEnum.InStock;


                            //更新状态为任务完成
                            UpdateTaskStatus(task.TaskId, task.TaskState);
                            _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"堆垛机出库完成");
                            _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"出库任务完成");
                            //更新货位
                            _locationInfoRepository.UpdateData(locationsrc);
                            _locationInfoRepository.UpdateData(locationdsc);
                            isBack = true;


                        }
                        else//上料任务也改为强制完成20250115
                        {
                            //更新状态为任务完成
                            //task.TaskState = (int)TaskOutStatusEnum.OutFinish;
                            //UpdateTaskStatus(task.TaskId, task.TaskState);
                            //_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"堆垛机出库完成");
                            //_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"出库任务完成");
                            //isBack = true;
                            return WebResponseContent.Instance.Error($"上料任务不允计强制完成！");
                        }
                    }
                    else
                    {
                        return WebResponseContent.Instance.Error($"该任务状态不允计强制完成！");
                    }
                }

                //任务强制完成回调MES
                if (isBack)
                {
                    
                    if (task.TaskType == (int)TaskInboundTypeEnum.Inbound)//入库时回传需传新任务号
                    {
                        task.TaskNum =int.Parse(task.NextAddress);
                    }
                    MESSendCMD sendcmd = new MESSendCMD { cmd = 201, task_id = task.TaskNum, status = 6 };
                    MESResponse res = ApiInvoke.SendTaskCMD(sendcmd);
                    if (res != null && res.code != 0)
                    {
                        ServiceLogger.WriteDebug("ForceCompleteTask", $"任务强制完成后回传MES失败！,任务号:【{taskNum}】,失败信息:【{res.message}】");
                        content = WebResponseContent.Instance.Error($"任务强制完成后回传MES失败！,任务号:【{taskNum}】,失败信息:【{res.message}】");
                    }
                    else
                    {
                        ServiceLogger.WriteDebug("ForceCompleteTask", $"任务强制完成后回传MES成功！,任务号:【{taskNum}】");
                        content = WebResponseContent.Instance.Error($"大堆垛机完成后回传MES成功！,任务号:【{taskNum}】");
                    }
                }
            }
            catch (Exception ex)
            {
                content = WebResponseContent.Instance.Error(ex.Message);
            }
            return content;

        }

        /// <summary>
        /// å…è®¡é‡ç½®
        /// </summary>
        /// <param name="taskNum"></param>
        /// <returns></returns>
        public WebResponseContent AGVResetTask()
        {
            WebResponseContent content = new WebResponseContent();
            Dt_Task task = _taskRepository.QueryFirst(x => x.CurrentAddress == "1");
            if (task != null)
            {
                UpdateTaskAllowIn(task.TaskNum, 0);
            }
            else
            {
                return WebResponseContent.Instance.Error($"目前是允计AGV进入状态，无需重置！");
            }
            return content.Error("重置成功！");
        }

        /// <summary>
        /// ä»»åŠ¡å–消
        /// </summary>
        /// <param name="taskid"></param>
        /// <returns></returns>
        public WebResponseContent CancelTask(int taskNum)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                //1，先查询任务，根据不同的任务类型做任务取消操作
                Dt_Task task = _taskRepository.QueryFirst(x => x.TaskNum == taskNum);
                if (task == null) return WebResponseContent.Instance.Error($"未找到该任务信息,任务号:【{taskNum}】");

                //取消任务时，重置是否允计进入
                if (task.CurrentAddress == "1")
                {
                    UpdateTaskAllowIn(task.TaskNum, 0);
                }

                Dt_LocationInfo locationsrc = _locationInfoRepository.QueryFirst(x => x.LocationCode == task.SourceAddress.ToString());
                Dt_LocationInfo locationdsc = _locationInfoRepository.QueryFirst(x => x.LocationCode == task.TargetAddress.ToString());
                bool isBack = false;
                //如果是入库分自动和手动两种情况处理
                if (task.TaskType == (int)TaskInboundTypeEnum.Inbound)
                {
                    if (task.WMSId == 0 && task.TaskState == (int)TaskInStatusEnum.InNew)//自动入库，1001-AGV请求是否允计进入，任务状态为“新建入库任务200”之前可以取消
                    {
                        task.TaskState = (int)TaskInStatusEnum.InCancel;
                        //需要将目标地址恢复为空闲状态
                        locationdsc.LocationStatus = (int)LocationStatusEnum.Free;
                        //更新状态为任务取消
                        UpdateTaskStatus(task.TaskId, task.TaskState);
                        _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"入库任务取消");
                        _locationInfoRepository.UpdateData(locationdsc);
                        isBack = true;
                    }
                    else if (task.WMSId == 1 && task.TaskState == (int)TaskInStatusEnum.AGV_InExecuting)//手动入库，3001-AGV放货完成，任务状态为“AGV入库执行中210”之前可以取消
                    {
                        task.TaskState = (int)TaskInStatusEnum.InCancel;
                        //需要将目标地址恢复空闲状态
                        locationdsc.LocationStatus = (int)LocationStatusEnum.Free;
                        //更新状态为任务取消
                        UpdateTaskStatus(task.TaskId, task.TaskState);
                        _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"入库任务取消");
                        _locationInfoRepository.UpdateData(locationdsc);
                        isBack = true;
                    }
                    else
                    {
                        return WebResponseContent.Instance.Error($"该任务状态不允计取消！");
                    }
                }
                else//其他任务，任务状态“新建出库任务”之前，才可以取消
                {
                    if (task.TaskState == (int)TaskOutStatusEnum.OutNew)
                    {  
                        if(task.TaskType == (int)TaskOutboundTypeEnum.OutInventory|| task.TaskType == (int)TaskOutboundTypeEnum.OutPick)//异常出库 ç©ºè½¦å‡ºåº“
                        {
                            task.TaskState = (int)TaskOutStatusEnum.OutCancel;
                            //源地址恢复到有货
                            locationsrc.LocationStatus = (int)LocationStatusEnum.InStock;

                            //更新状态为任务取消
                            UpdateTaskStatus(task.TaskId, task.TaskState);
                            _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"出库任务取消");
                            _locationInfoRepository.UpdateData(locationsrc);
                            isBack = true;
                        }
                        else if(task.TaskType == (int)TaskRelocationTypeEnum.Relocation)//移库
                        {
                            task.TaskState = (int)TaskOutStatusEnum.OutCancel;
                            //源地址恢复到有货
                            locationsrc.LocationStatus = (int)LocationStatusEnum.InStock;
                            //需要将目标地址恢复空闲状态
                            locationdsc.LocationStatus = (int)LocationStatusEnum.Free;
                            //更新状态为任务取消
                            UpdateTaskStatus(task.TaskId, task.TaskState);
                            _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"出库任务取消");
                            _locationInfoRepository.UpdateData(locationsrc);
                            _locationInfoRepository.UpdateData(locationdsc);
                            isBack = true;
                        }
                        else
                        {
                            return WebResponseContent.Instance.Error($"上料任务不允计取消！");
                        }
                    }
                    else
                    {
                        return WebResponseContent.Instance.Error($"该任务状态不允计取消！");
                    }
                }



                //任务取消回调MES
                if (isBack)
                {
                    MESSendCMD sendcmd = new MESSendCMD { cmd = 201, task_id = task.TaskNum, status = 3 };
                    MESResponse res = ApiInvoke.SendTaskCMD(sendcmd);
                    if (res != null && res.code != 0)
                    {
                        ServiceLogger.WriteDebug("ForceCompleteTask", $"任务取消回传MES失败！,任务号:【{taskNum}】,失败信息:【{res.message}】");
                        content = WebResponseContent.Instance.Error($"任务取消回传MES失败！,任务号:【{taskNum}】,失败信息:【{res.message}】");
                    }
                    else
                    {
                        ServiceLogger.WriteDebug("ForceCompleteTask", $"任务取消回传MES成功！,任务号:【{taskNum}】");
                        content = WebResponseContent.Instance.Error($"任务取消回传MES成功！,任务号:【{taskNum}】");
                    }
                }
                else
                {

                }

            }
            catch (Exception ex)
            {
                content = WebResponseContent.Instance.Error(ex.Message);
            }
            return content;
        }


@@ -840,17 +1469,37 @@
                        _unitOfWorkManage.CommitTran();
                        //出库完成，回传WMS
                        //回传到WMS
                        MESSendCMD sendcmd = new MESSendCMD { cmd = 201, task_id = task.TaskNum, status = 6 };
                        MESResponse res = ApiInvoke.SendTaskCMD(sendcmd);
                        if (res != null && res.code != 0)
                        if (task.TaskType == (int)TaskOutboundTypeEnum.OutPick)
                        {
                            content = WebResponseContent.Instance.Error($"大堆垛机完成出库任务后回传MES失败！,任务号:【{taskNum}】,失败信息:【{res.message}】");
                            MESSendCMD sendcmd = new MESSendCMD { cmd = 201, task_id = task.TaskNum, status = 6 };
                            MESResponse res = ApiInvoke.SendTaskCMD(sendcmd);
                            if (res != null && res.code != 0)
                            {
                                ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"大堆垛机完成空车出库任务后回传MES失败！,任务号:【{taskNum}】,失败信息:【{res.message}】");
                                content = WebResponseContent.Instance.Error($"大堆垛机完成空车出库任务后回传MES失败！,任务号:【{taskNum}】,失败信息:【{res.message}】");
                            }

                        }
                        else
                        {
                            if (task.WMSId != 3)
                            {
                                MESSendCMD sendcmd = new MESSendCMD { cmd = 201, task_id = task.TaskNum, status = 6 };
                                MESResponse res = ApiInvoke.SendTaskCMD(sendcmd);
                                if (res != null && res.code != 0)
                                {
                                    ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"大堆垛机完成异常出库任务后回传MES失败！,任务号:【{taskNum}】,失败信息:【{res.message}】");
                                    content = WebResponseContent.Instance.Error($"大堆垛机完成异常出库任务后回传MES失败！,任务号:【{taskNum}】,失败信息:【{res.message}】");
                                }
                            }
                        }

                    }
                    catch (Exception ex)
                    {
                        _unitOfWorkManage.RollbackTran();
                        
                        ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"大堆垛机执行出库任务失败！,任务号:【{taskNum}】,失败信息:【{ex.Message}】");
                        content = WebResponseContent.Instance.Error($"大堆垛机执行出库任务失败！,任务号:【{taskNum}】,失败信息:【{ex.Message}】");
                    }

@@ -880,16 +1529,28 @@

                        //入库完成，回传MES  å…¥åº“完成回传task.NextAddress ä¹‹å‰101请求时存的新任务号
                        MESSendCMD sendcmd = new MESSendCMD { cmd = 201, task_id = int.Parse(task.NextAddress), status = 6 };
                        MESResponse res = ApiInvoke.SendTaskCMD(sendcmd);
                        if (res != null && res.code != 0)
                        string inparam = JsonConvert.SerializeObject(sendcmd);
                        ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"大堆垛机完成入库任务后回传MES入参:{inparam}");
                        if (task.WMSId != 3)
                        {
                            content = WebResponseContent.Instance.Error($"大堆垛机完成入库任务后回传MES失败！,任务号:【{taskNum}】,失败信息:【{res.message}】");
                            MESResponse res = ApiInvoke.SendTaskCMD(sendcmd);
                            if (res != null && res.code != 0)
                            {

                                ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"大堆垛机完成入库任务后回传MES失败！,任务号:【{taskNum}】,失败信息:【{res.message}】");
                                content = WebResponseContent.Instance.Error($"大堆垛机完成入库任务后回传MES失败！,任务号:【{taskNum}】,失败信息:【{res.message}】");
                            }
                            else
                            {
                                ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"大堆垛机完成入库任务后回传MES成功！,任务号:【{taskNum}】");
                            }
                        }

                    }
                    catch (Exception ex)
                    {
                        _unitOfWorkManage.RollbackTran();
                        ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"大堆垛机执行入库任务失败！,任务号:【{taskNum}】,失败信息:【{ex.Message}】");
                        content = WebResponseContent.Instance.Error($"大堆垛机执行入库任务失败！,任务号:【{taskNum}】,失败信息:【{ex.Message}】");
                    }
                }
@@ -902,7 +1563,7 @@
                        srcLocation.LocationStatus = (int)LocationStatusEnum.Free;

                        Dt_LocationInfo tarLocation = _locationInfoRepository.QueryFirst(x => x.LocationCode == task.TargetAddress);
                        srcLocation.LocationStatus = (int)LocationStatusEnum.InStock;
                        tarLocation.LocationStatus = (int)LocationStatusEnum.InStock;
                        UpdateTaskStatus(task.TaskId, (int)TaskOutStatusEnum.SC_OutFinish);
                        _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"堆垛机出库完成");

@@ -916,17 +1577,42 @@
                        _unitOfWorkManage.CommitTran();
                        //移库完成，回传MES
                        //回传到WMS
                        MESSendCMD sendcmd = new MESSendCMD { cmd = 201, task_id = task.TaskNum, status = 6 };
                        MESResponse res = ApiInvoke.SendTaskCMD(sendcmd);
                        if (res != null && res.code != 0)
                        if (task.WMSId != 3)
                        {
                            content = WebResponseContent.Instance.Error($"大堆垛机完成出库任务后回传MES失败！,任务号:【{taskNum}】,失败信息:【{res.message}】");
                            MESSendCMD sendcmd = new MESSendCMD { cmd = 201, task_id = task.TaskNum, status = 6 };
                            string inparam = JsonConvert.SerializeObject(sendcmd);
                            ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"大堆垛机完成出库任务后回传MES入参:{inparam}");
                            MESResponse res = ApiInvoke.SendTaskCMD(sendcmd);
                            if (res != null && res.code != 0)
                            {
                                ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"大堆垛机完成出库任务后回传MES失败！,任务号:【{taskNum}】,失败信息:【{res.message}】");
                                content = WebResponseContent.Instance.Error($"大堆垛机完成出库任务后回传MES失败！,任务号:【{taskNum}】,失败信息:【{res.message}】");
                            }
                        }
                        //if(task.TaskType== (int)TaskRelocationTypeEnum.Relocation&&!string.IsNullOrEmpty(task.Remark.Trim()))//出库任务写总层数标识
                        //{
                        //    CommonStackerCrane commonStackerCrane = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "SC01") as CommonStackerCrane;
                        //    //根据任务源地址确定写入PLC位置 Depth
                        //    Dt_LocationInfo location = _locationInfoRepository.QueryFirst(x => x.LocationCode == task.TargetAddress);
                        //    if (commonStackerCrane!=null&&location != null)
                        //    {
                        //        bool issuccess = commonStackerCrane.Communicator.Write<short>("DB28." + location.Depth + ".0", 9);
                        //        if (issuccess)
                        //        {
                        //            ServiceLogger.WriteDebug("TaskService", $"原料出库后写入标识成功！");
                        //        }
                        //        else
                        //        {
                        //            ServiceLogger.WriteDebug("TaskService", $"原料出库后写入标识失败！");
                        //        }
                        //    }
                        //}

                    }
                    catch (Exception ex)
                    {
                        _unitOfWorkManage.RollbackTran();
                        ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"大堆垛机执行出库任务失败！,任务号:【{taskNum}】,失败信息:【{ex.Message}】");
                        content = WebResponseContent.Instance.Error($"大堆垛机执行出库任务失败！,任务号:【{taskNum}】,失败信息:【{ex.Message}】");
                    }
                }
@@ -935,7 +1621,7 @@
                {
                    try
                    {
                        Dt_LocationInfo srcLocation = _locationInfoRepository.QueryFirst(x => x.LocationCode == task.SourceAddress);
                        //Dt_LocationInfo srcLocation = _locationInfoRepository.QueryFirst(x => x.LocationCode == task.SourceAddress);
                        //srcLocation.LocationStatus = (int)LocationStatusEnum.Free;
                        

@@ -950,59 +1636,72 @@
                        _unitOfWorkManage.CommitTran();
                        //上料完成，回传WMS
                        MESSendCMD sendcmd = new MESSendCMD { cmd = 201, task_id = task.TaskNum, status = 6 };
                        string inparam = JsonConvert.SerializeObject(sendcmd);
                        ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"小堆垛机执行出库任务回传MES入参{inparam}");
                        MESResponse res = ApiInvoke.SendTaskCMD(sendcmd);
                        if (res != null && res.code != 0)
                        {
                            ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"小堆垛机完成出库任务后回传MES失败！,任务号:【{taskNum}】,失败信息:【{res.message}】");
                            content = WebResponseContent.Instance.Error($"小堆垛机完成出库任务后回传MES失败！,任务号:【{taskNum}】,失败信息:【{res.message}】");
                        }
                        else
                        {
                            //判断是否完成的最后一层，自动生成空车出库任务
                            string[] Levels = task.Remark.Split("-");
                            if (Levels.Length == 2)
                            {
                                if (!string.IsNullOrEmpty(Levels[0])&& !string.IsNullOrEmpty(Levels[1]))
                                {
                                    //如果当前提取层数等于总层料，则表示料车所有的层数取完
                                    if(Convert.ToInt16(Levels[0])== Convert.ToInt16(Levels[1]))
                                    {
                                        string[] SourceCodes = task.SourceAddress.Split("-");
                                        string startPlan = "";
                                        if (SourceCodes.Length == 4)
                                        {
                                            startPlan= "101"+ SourceCodes[2].Substring(1,2);
                                        }
                                        DeliveryPlan send = new DeliveryPlan { startPlan = startPlan, isQuit = false, CarId = task.PalletCode };
                                        ApiInvoke.DeliveryPlanCMD(send);//回调MES接口生成空车出库任务
                                 
                                    }
                                   
                                }
                        //else
                        //{
                        //    //判断是否完成的最后一层，自动生成空车出库任务
                        //    string[] Levels = task.Remark.Split("-");
                        //    if (Levels.Length == 2)
                        //    {
                        //        if (!string.IsNullOrEmpty(Levels[0])&& !string.IsNullOrEmpty(Levels[1]))
                        //        {
                        //            //如果当前提取层数等于总层料，则表示料车所有的层数取完
                        //            if(Convert.ToInt16(Levels[0])== Convert.ToInt16(Levels[1]))
                        //            {
                        //                string[] SourceCodes = task.SourceAddress.Split("-");
                        //                string startPlan = "";
                        //                if (SourceCodes.Length == 4)
                        //                {
                        //                    startPlan = "101" + SourceCodes[2].Substring(1, 2);
                        //                }
                        //                DeliveryPlan send = new DeliveryPlan { startPlan = startPlan, isQuit = false, CarId = task.PalletCode };
                        //                string inparam2 = JsonConvert.SerializeObject(send);
                        //                ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"小堆垛机执行出库任务回传MES入参{inparam2}");
                        //                ApiInvoke.DeliveryPlanCMD(send);//回调MES接口生成空车出库任务
                        //                æ‰€æœ‰çš„层数都取完，需要把暂存位状态改为空闲状态
                        //                srcLocation.LocationStatus = (int)LocationStatusEnum.Free;
                        //                _locationInfoRepository.UpdateData(srcLocation);
                        //            }

                        //        }
                              
                            }
                        }
                        //    }
                        //}

                    }
                    catch (Exception ex)
                    {
                        _unitOfWorkManage.RollbackTran();
                        ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"小堆垛机执行出库任务失败！,任务号:【{taskNum}】,失败信息:【{ex.StackTrace}】");
                        content = WebResponseContent.Instance.Error($"小堆垛机执行出库任务失败！,任务号:【{taskNum}】,失败信息:【{ex.Message}】");
                    }

                }
                else
                {
                    ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"任务类型错误,未找到该任务类型,任务号:【{taskNum}】,任务类型:【{task.TaskType}】");
                    throw new Exception($"任务类型错误,未找到该任务类型,任务号:【{taskNum}】,任务类型:【{task.TaskType}】");
                }
                content = WebResponseContent.Instance.OK();
                ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"任务完成成功,任务号:【{taskNum}】");
                content = WebResponseContent.Instance.OK($"任务完成成功,任务号:【{taskNum}】");
            }
            catch (Exception ex)
            {
                content = WebResponseContent.Instance.Error($"任务完成异常,任务号:【{taskNum}】");
                ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"任务完成异常,任务号:【{taskNum}】{ex.Message}");
                content = WebResponseContent.Instance.Error($"任务完成异常,任务号:【{taskNum}】{ex.Message}");
            }
            return content;
        }



        /// <summary>
        /// æ¢å¤æŒ‚起任务
        /// </summary>