添加日志信息

xby-y

7 天以前 b3ff80e45d24a821ca0731983b1546b48570cdf1

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

@@ -640,10 +640,12 @@
        {
            task.TaskState = (int)TaskOutStatusEnum.SC_OutFinish;
            bool res = BaseDal.UpdateData(task);
            // æ·»åŠ å…¥åº“历史记录
            //AddTaskHistory(task);


            //task.TaskState = (int)TaskOutStatusEnum.SC_OutFinish;
            //BaseDal.UpdateData(task);
            //// æ·»åŠ å‡ºåº“历史记录
            //_taskHtyService.AddTaskHistory(task);
            //_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, "自动完成");
            //bool res = BaseDal.DeleteData(task);
            return res;
        }

@@ -831,42 +833,29 @@
        public Dt_Task RequestWMSTaskMovelibrary(Dt_Task _Task)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                content = HttpHelperh.Get<WebResponseContent>($"{urlWMSMovelibraryTask}?TaskNum={_Task.TaskNum}");
                Dt_Task task = new Dt_Task();
                if (content.Status)
                {
                    if (content.Data != null)
                    {
                        //task = JsonConvert.DeserializeObject<Dt_Task>(content.Data.ToString());
                        WMSTaskDTO dto = JsonConvert.DeserializeObject<WMSTaskDTO>(content.Data.ToString());
                        if (dto != null)
                        {
                            // è½¬æ¢ä¸ºDt_Task
                            task = _mapper.Map<Dt_Task>(dto);
                            task.TaskState = dto.TaskStatus;

                            if (task.TaskNum != _Task.TaskNum)
                            {
                                task.Grade = 3;
                                BaseDal.AddData(task);
                                return task;
                            }
                            else
                            {
                                return _Task;
                            }
                        }
            content = HttpHelperh.Get<WebResponseContent>($"{urlWMSMovelibraryTask}?TaskNum={_Task.TaskNum}");
            Dt_Task task = new Dt_Task();
            if (content.Status)
            {
                if (content.Data != null)
                {
                    task = JsonConvert.DeserializeObject<Dt_Task>(content.Data.ToString());
                    if (task.TaskNum != _Task.TaskNum)
                    {
                        task.Grade = 3;
                        task.TaskState = TaskRelocationStatusEnum.RelocationNew.ObjToInt();
                        BaseDal.AddData(task);
                        return task;
                    }
                    else
                    {
                        return _Task;
                    }
                }
                return null;
            }
            catch (Exception ex)
            {
                Console.WriteLine($"移库操作异常：{ex.Message}");
                return null; 
            }
            return null;

        }


@@ -977,7 +966,7 @@
                    return WebResponseContent.Instance.Error("巷道编号不能为空");
                }
                // 2. ä¸€æ¬¡æŸ¥è¯¢ï¼Œé¿å…å¤šæ¬¡æ•°æ®åº“/内存遍历
                List<Dt_Task> taskList = BaseDal.QueryData(x => x.Roadway == roadway).ToList();
               List<Dt_Task> taskList = BaseDal.QueryData(x => x.Roadway == roadway).ToList();

                int totalTasks = taskList.Count;
                int inProgressTasks = 0;