1

huanghongfeng

2 天以前 a34059e688e947a2ea079a0646872f1a21089940

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

@@ -3,6 +3,7 @@
using MoYu.Localization;
using Newtonsoft.Json;
using System.Diagnostics.CodeAnalysis;
using System.Threading.Tasks;
using WIDESEAWCS_Common;
using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Core;
@@ -50,6 +51,14 @@
                var task = JsonConvert.DeserializeObject<Dt_Task>(content.Data.ToString());

                Dt_Task? Relocationtask = null;

                //如查询移库任务时存在内侧出库任务则直接执行内侧出库任务
                var currentExistOutTask = BaseDal.QueryFirst(x => x.TaskNum == task.TaskNum && task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup);
                if (currentExistOutTask != null )
                {
                    return currentExistOutTask;
                }

                if (task.TaskNum != taskNum)
                {

@@ -224,9 +233,21 @@
            WebResponseContent content = new WebResponseContent();
            Dt_Task_Hty dt_Task_Hty = _taskHtyRepository.QueryFirst(x => x.task_CZInfo == czCode && x.CreateDate >= DateTime.Now.AddMinutes(-30));
            if (dt_Task_Hty == null) return null;
            if (dt_Task_Hty.Towhereabouts == null && dt_Task_Hty.Towhereabouts == "") return null;

            return dt_Task_Hty.Towhereabouts;
            if (dt_Task_Hty.Towhereabouts == "2032" || dt_Task_Hty.Towhereabouts == "2042")
            {
                return dt_Task_Hty.Towhereabouts;

            }else if(dt_Task_Hty.TargetAddress == "2032" || dt_Task_Hty.TargetAddress == "2042")
            {
                return dt_Task_Hty.TargetAddress;
            }
            else
            {
                return null;
            }

                
        }

        // æ£€æŸ¥å½“前托盘是否存在任务
@@ -285,6 +306,10 @@
                task.wheels_mttype = taskDTO.wheels_mttype;
                task.WheelsNewOrOld = taskDTO.WheelsNewOrOld;
                task.WheelsLX = taskDTO.WheelsLX;
                if(taskDTO.axle_czh !=null && taskDTO.axle_czh != "")
                {
                    task.axle_czh = taskDTO.axle_czh;
                }

                if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
                {