1

xby-y

2026-01-12 c1eac732fc3ef407d51b76d288f311d2fa43e618

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

@@ -47,7 +47,8 @@
        private readonly IRepository<Dt_Router> _routerRepository;
        private readonly IRepository<Dt_StationManger> _stationMangerRepository;
        private readonly IMapper _mapper;
        
        private readonly ITaskHtyService _taskHtyService;


        private Dictionary<string, OrderByType> _taskOrderBy = new()
            {
@@ -69,7 +70,7 @@
        /// </summary>
        public IRepository<Dt_Task> Repository => BaseDal;

        public TaskService(IRepository<Dt_Task> BaseDal, IRouterService routerService, IUnitOfWorkManage unitOfWorkManage, ITaskExecuteDetailService taskExecuteDetailService, IRepository<Dt_TaskExecuteDetail> taskExecuteDetailRepository, IMapper mapper, IRepository<Dt_Router> routerRepository, IRepository<Dt_StationManger> stationMangerRepository) : base(BaseDal)
        public TaskService(IRepository<Dt_Task> BaseDal, IRouterService routerService, IUnitOfWorkManage unitOfWorkManage, ITaskExecuteDetailService taskExecuteDetailService, IRepository<Dt_TaskExecuteDetail> taskExecuteDetailRepository, IMapper mapper, IRepository<Dt_Router> routerRepository, IRepository<Dt_StationManger> stationMangerRepository, ITaskHtyService taskHtyService) : base(BaseDal)
        {
            _routerService = routerService;
            _taskExecuteDetailService = taskExecuteDetailService;
@@ -78,6 +79,7 @@
            _mapper = mapper;
            _routerRepository = routerRepository;
            _stationMangerRepository = stationMangerRepository;
            _taskHtyService = taskHtyService;
        }

        /// <summary>
@@ -654,9 +656,8 @@
            BaseDal.UpdateData(task);

            // æ·»åŠ å…¥åº“历史记录
            // _task_HtyService.AddTaskHty(task);
            _taskHtyService.AddTaskHistory(task);
            _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, "入库完成");
            //AddTaskHistory(task);

            // å…¥åº“完成后删除任务
            bool res = BaseDal.DeleteData(task);
@@ -874,8 +875,8 @@
        public WebResponseContent WCSCancelinventory(int taskNum)
        {
            //查询任务信息
            Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
            if (task == null) return WebResponseContent.Instance.Error($"未找到该任务信息,任务号:【{taskNum}】");
            Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum && (x.TaskState == TaskOutStatusEnum.OutNew.ObjToInt() || x.TaskState == TaskRelocationStatusEnum.RelocationNew.ObjToInt() || x.TaskState == TaskInStatusEnum.Line_InExecuting.ObjToInt()));
            if (task == null) return WebResponseContent.Instance.Error($"未找到该任务信息,任务号:【{taskNum}或状态不对】");
            bool taskmsseg = BaseDal.DeleteData(task);
            bool res = AddTaskHistory(task,"手动取消");
            return taskmsseg && res ? WebResponseContent.Instance.OK() : WebResponseContent.Instance.Error();
@@ -887,7 +888,7 @@
        /// </summary>
        /// <param name="task">任务对象</param>
        /// <returns>是否添加成功</returns>
        public static bool AddTaskHistory(Dt_Task task,string operateType)
        public bool AddTaskHistory(Dt_Task task,string operateType)
        {
            try
            {
@@ -897,14 +898,14 @@
                }

                // åˆ›å»ºä»»åŠ¡åŽ†å²æœåŠ¡å®žä¾‹
                var taskHtyService = App.GetService<ITaskHtyService>();
                if (taskHtyService == null)
                {
                    return false;
                }
                //var taskHtyService = App.GetService<ITaskHtyService>();
                //if (taskHtyService == null)
                //{
                //    return false;
                //}

                // æ·»åŠ åŽ†å²è®°å½•
                bool result = taskHtyService.AddTaskHistory(task, operateType);
                bool result = _taskHtyService.AddTaskHistory(task, operateType);
                
                return result;
            }
@@ -928,7 +929,7 @@
        {
            //查询任务信息
            Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
            if (task == null) return WebResponseContent.Instance.Error($"未找到该任务信息,任务号:【{taskNum}】");
            if (task == null) return WebResponseContent.Instance.OK();
            bool taskmsseg = BaseDal.DeleteData(task);
            bool res = AddTaskHistory(task, "手动完成");
            return taskmsseg && res ? WebResponseContent.Instance.OK() : WebResponseContent.Instance.Error();