数据库脚本提交

duyongjia

2025-02-28 cb385f0b515c738b503c5c75c9d7efcec323716d

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

@@ -1107,8 +1107,14 @@


                        }
                        else
                        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($"上料任务不允计强制完成！");
                        }
                    }
@@ -1149,6 +1155,26 @@
        }

        /// <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>
@@ -1162,6 +1188,12 @@
                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;