1

huanghongfeng

8 小时以前 9c3ee278c31a79e2e36b635651cef0b2dd431260

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

@@ -60,6 +60,7 @@
using WIDESEAWCS_QuartzJob.Repository;
using WIDESEAWCS_QuartzJob.Service;
using static Microsoft.IO.RecyclableMemoryStreamManager;
using static System.Net.Mime.MediaTypeNames;

namespace WIDESEAWCS_TaskInfoService
{
@@ -149,11 +150,14 @@
                        dt_Task.SourceAddress = item.startAddress;
                        dt_Task.TargetAddress = item.endAddress;
                        dt_Task.CurrentAddress = item.startAddress;
                        dt_Task.NextAddress = "0";   //目前暂无
                        dt_Task.NextAddress = "1021";   //目前暂无
                        dt_Task.Grade = item.priority;
                        dt_Task.WMSId = 0;   //目前暂无
                        BaseDal.AddData(dt_Task);
                        content.code = 0;

                        int taskidt= BaseDal.QueryFirst(x=>x.TaskNum== dt_Task.TaskNum).TaskId;
                        _taskExecuteDetailService.AddTaskExecuteDetail(taskidt, $"系统自动流程，创建任务");
                    }
                    else if (item.type == 2)    //出库
                    {
@@ -195,6 +199,8 @@
                        dt_Task.WMSId = 0;   //目前暂无
                        BaseDal.AddData(dt_Task);
                        content.code = 0;

                        _taskExecuteDetailService.AddTaskExecuteDetail(dt_Task.TaskId,$"系统自动流程，创建任务");
                    }
                    else
                    {
@@ -250,8 +256,6 @@
                }
                task.RGVTaskType = RGvtype;
                bool updatesta = BaseDal.UpdateData(task);
                string Meesgt = $"目标地址：{task.CurrentAddress},任务类型：{rwlx}，修改状态：{updatesta}";
                _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, Meesgt);

                content = WebResponseContent.Instance.OK();
            }
@@ -288,7 +292,7 @@
                task.ExceptionMessage = message;
                task.ModifyDate = DateTime.Now;
                BaseDal.UpdateData(task);
                _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, task.ExceptionMessage);
                _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, "更新任务异常："+task.ExceptionMessage);
                content = WebResponseContent.Instance.OK();
            }
            catch (Exception ex)
@@ -346,7 +350,14 @@
                task.Modifier = "System";
                BaseDal.UpdateData(task);

                _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, App.User.UserId > 0 ? $"人工手动将任务状态从【{oldState}】跳转到【{task.TaskState}】" : $"系统自动流程，任务状态从【{oldState}】转到【{task.TaskState}】");
                string oldstaterem = _taskExecuteDetailService.GetEnumDescription(oldState); //前一个状态
                string afterstaterem = _taskExecuteDetailService.GetEnumDescription(task.TaskState); //后一个状态

                string rgvtyperem = _taskExecuteDetailService.GetEnumDescription2(task.RGVTaskType); //后一个状态

                _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, App.User.UserId > 0 ? 
                    $"人工手动将任务状态从【{oldstaterem}】跳转到【{afterstaterem}】" 
                    : $"系统自动流程，任务状态从【{oldstaterem}】转到【{afterstaterem}】");

                content = WebResponseContent.Instance.OK();
            }
@@ -396,7 +407,9 @@

                BaseDal.UpdateData(task);

                _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"人工恢复挂起任务,恢复挂起时任务状态【{task.TaskState}】");
                string afterstaterem = _taskExecuteDetailService.GetEnumDescription(task.TaskState); //后一个状态

                _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"人工恢复挂起任务,恢复挂起时任务状态【{afterstaterem}】");

                content = WebResponseContent.Instance.OK();
            }
@@ -421,7 +434,20 @@
                if (task == null) return WebResponseContent.Instance.Error($"未找到该任务信息,任务号:【{taskNum}】");

                int oldState = task.TaskState;
                Dt_TaskExecuteDetail taskExecuteDetail = _taskExecuteDetailRepository.QueryFirst(x => x.TaskId == task.TaskId && x.TaskState < task.TaskState && x.TaskState > 0, new Dictionary<string, OrderByType> { { nameof(Dt_TaskExecuteDetail.TaskDetailId), OrderByType.Desc } });
                Dt_TaskExecuteDetail taskExecuteDetail = null;
                
                if (task.CurrentAddress == "1061")
                {
                    taskExecuteDetail = _taskExecuteDetailRepository.QueryFirst(x => x.TaskId == task.TaskId && x.TaskState > task.TaskState && x.TaskState > 0, new Dictionary<string, OrderByType> { { nameof(Dt_TaskExecuteDetail.TaskDetailId), OrderByType.Desc } });
                }
                else
                {
                    taskExecuteDetail = _taskExecuteDetailRepository.QueryFirst(x => x.TaskId == task.TaskId && x.TaskState < task.TaskState && x.TaskState > 0, new Dictionary<string, OrderByType> { { nameof(Dt_TaskExecuteDetail.TaskDetailId), OrderByType.Desc } });

                }
                
                

                if (taskExecuteDetail != null)
                {
                    task.TaskState = taskExecuteDetail.TaskState;
@@ -437,7 +463,13 @@

                BaseDal.UpdateData(task);

                _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"人工将任务状态从【{oldState}】回滚到【{task.TaskState}】");
                string oldstaterem = _taskExecuteDetailService.GetEnumDescription(oldState); //前一个状态
                string afterstaterem = _taskExecuteDetailService.GetEnumDescription(task.TaskState); //后一个状态

                string rgvtyperem = _taskExecuteDetailService.GetEnumDescription2(task.RGVTaskType); //后一个状态

                _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId,
                    $"人工手动将任务状态从【{oldstaterem}】回归到【{afterstaterem}】");

                content = WebResponseContent.Instance.OK();
            }
@@ -509,7 +541,7 @@
        /// </summary>
        /// <param name="taskNum">任务编号</param>
        /// <returns>返回处理结果</returns>
        public WebResponseContent UpdateTaskStatus(int taskNum)
        public WebResponseContent UpdateTaskStatus(int taskNum, int Completetype)
        {
            WebResponseContent content = new WebResponseContent();

@@ -537,10 +569,19 @@
                task.ExceptionMessage = string.Empty;
                BaseDal.UpdateData(task);

                _taskExecuteDetailService.AddTaskExecuteDetail(
                    task.TaskId,
                    $"自动任务状态从【{oldState}】进入到【{task.TaskState}】"
                );
                string oldstaterem = _taskExecuteDetailService.GetEnumDescription(oldState); //前一个状态
                string afterstaterem = _taskExecuteDetailService.GetEnumDescription(task.TaskState); //后一个状态

                string rgvtyperem = _taskExecuteDetailService.GetEnumDescription2(task.RGVTaskType); //后一个状态
                _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, App.User.UserId > 0 ?
                    $"人工手动将任务状态从【{oldstaterem}】跳转到【{afterstaterem}】"
                    : $"系统自动流程，任务状态从【{oldstaterem}】转到【{afterstaterem}】");


                if (task.TaskState == (int)TaskInStatusEnum.RGV_InMothercarFinish && Completetype==2)   //入库任务完成
                {
                    CompletedManually(task.TaskId, Completetype);
                }

                return WebResponseContent.Instance.OK();
            }
@@ -614,20 +655,42 @@

        private void HandleInboundZichemove(Dt_Task task)
        {
            var route = _routerRepository.QueryFirst(x =>
                x.IsEnd == true &&
                x.ChildPosi == task.NextAddress &&
                x.InOutType == 1
            );
            try
            {
                Dt_Router dt_Router = null;
                task.TaskState = (int)TaskInStatusEnum.RGV_InZichemoveFinish;
                if (task.TargetAddress == "4" || task.TargetAddress == "3")
                {
                    dt_Router = _routerRepository.QueryFirst(x =>
                    x.StartPosi == task.NextAddress &&
                    x.InOutType == 1);
                    if (task.CurrentAddress != "1061") task.TaskState = (int)TaskInStatusEnum.RGV_InReleaseFinish;

            if (route == null)
                throw new InvalidOperationException("未找到对应的结束路由");
                }
                else
                {
                    dt_Router = _routerRepository.QueryFirst(x =>
                    x.IsEnd == true &&
                    x.ChildPosi == task.NextAddress &&
                    x.InOutType == 1);
                }

            task.TaskState = (int)TaskInStatusEnum.RGV_InZichemoveFinish;
            task.RGVTaskType = (int)RGVTaskTypeEnum.TravelingOnly;
            task.CurrentAddress = route.StartPosi;
            task.NextAddress = route.NextPosi;
            task.Roadway = route.ChildPosiDeviceCode;

                if (dt_Router == null)
                    throw new InvalidOperationException("未找到对应的结束路由");



                task.RGVTaskType = (int)RGVTaskTypeEnum.PickingUp;
                task.CurrentAddress = dt_Router.StartPosi;
                task.NextAddress = dt_Router.NextPosi;
                task.Roadway = dt_Router.ChildPosiDeviceCode;
            }
            catch (Exception ex)
            {

                throw;
            }
        }
        #endregion

@@ -1047,7 +1110,13 @@
        /// <param name="ids"></param>
        /// <returns></returns>
        /// <exception cref="NotImplementedException"></exception>
        public WebResponseContent CompletedManually(int id)
        /// <summary>
        /// äººå·¥æ‰‹åŠ¨å®Œæˆ
        /// </summary>
        /// <param name="ids"></param>
        /// <returns></returns>
        /// <exception cref="NotImplementedException"></exception>
        public WebResponseContent CompletedManually(int id, int CompletionType)
        {

            var db = BaseDal.Db as SqlSugarClient;
@@ -1059,6 +1128,8 @@

                Dt_Task dt_task = BaseDal.QueryData().Where(x => x.TaskId == id).FirstOrDefault();
                if (dt_task == null) return WebResponseContent.Instance.Error($"未查询到任务");
                string Remark = CompletionType == 1 ? "人工手动完成" : "自动完成";


                var res = _task_HtyService.AddData(new Dt_Task_hty
                {
@@ -1073,38 +1144,33 @@
                    NextAddress = dt_task.NextAddress,
                    WMSId = dt_task.WMSId,
                    Dispatchertime = dt_task.Dispatchertime,
                    Remark = "人工手动完成",
                    Remark = Remark,
                    Creater = App.User.UserName,
                    CreateDate = DateTime.Now,
                    RGVTaskType = dt_task.RGVTaskType,
                    RGVCurrentexecution = dt_task.RGVCurrentexecution
                });

                int oldState = dt_task.TaskState;
                _taskExecuteDetailService.AddTaskExecuteDetail(
    dt_task.TaskId,
    $"自动任务状态从【{oldState}】进入到【{dt_task.TaskState}】"
);

                if (res.Status == false)
                {
                    db.Ado.RollbackTran();
                    return WebResponseContent.Instance.Error("手动完成失败！");
                    return WebResponseContent.Instance.Error($"{Remark}失败！");
                }

                var deletetask = BaseDal.DeleteData(dt_task);
                if (deletetask == false) { 
                if (deletetask == false)
                {
                    db.Ado.RollbackTran();
                    return WebResponseContent.Instance.Error("删除任务失败所有操作回滚！"); 
                    return WebResponseContent.Instance.Error("删除任务失败所有操作回滚！");
                }
                db.Ado.CommitTran();
                return WebResponseContent.Instance.OK("手动完成成功！");
                return WebResponseContent.Instance.OK($"{Remark}成功！");

            }
            catch (Exception ex)
            {
                db.Ado.RollbackTran();
                return WebResponseContent.Instance.Error("手动完成失败！");
                return WebResponseContent.Instance.Error("任务完成失败！");
            }
        }

@@ -1124,7 +1190,7 @@
                Dt_Task dt_task = BaseDal.QueryData().Where(x => x.TaskId == id).FirstOrDefault();
                if (dt_task == null) return WebResponseContent.Instance.Error($"未查询到任务");
                //if (dt_task.TaskState > (int)TaskInStatusEnum.RGV_InNew || dt_task.TaskState > (int)TaskOutStatusEnum.OutNew) return WebResponseContent.Instance.Error($"任务状态不允许取消");
                if (dt_task.TaskType >= 200 && dt_task.TaskType <= 203)
                /*if (dt_task.TaskType >= 200 && dt_task.TaskType <= 203)
                {
                    if (dt_task.TaskState > (int)TaskInStatusEnum.RGV_InNew) return WebResponseContent.Instance.Error($"任务状态不允许取消");
                }
@@ -1132,7 +1198,7 @@
                {
                    if (dt_task.TaskState > (int)TaskOutStatusEnum.OutNew) return WebResponseContent.Instance.Error($"任务状态不允许取消");

                }
                }*/

                Dt_Task_hty dt_Task_Hty = new Dt_Task_hty
                {
@@ -1158,14 +1224,14 @@
                    db.Ado.RollbackTran();
                    return WebResponseContent.Instance.Error("取消任务失败！");
                }
                int oldState = dt_task.TaskState;
                /*int oldState = dt_task.TaskState;
                _taskExecuteDetailService.AddTaskExecuteDetail(
    dt_task.TaskId,
    $"自动任务状态从【{oldState}】进入到【{dt_Task_Hty.TaskState}】"
);
);*/

                var deletetask = BaseDal.DeleteData(dt_task);
                if (deletetask == false) {
                bool deletetask = BaseDal.DeleteData(dt_task);
                if (!deletetask) {
                    db.Ado.RollbackTran();
                    return WebResponseContent.Instance.Error("删除任务失败所有操作回滚！");
                }
@@ -1178,5 +1244,67 @@
                return WebResponseContent.Instance.Error("取消任务失败！");
            }
        }




        /// <summary>
        /// ä»»åŠ¡ä¸‹ä¸€æ­¥æ‰§è¡Œ
        /// </summary>
        /// <param name="sCErrorStatus"></param>
        /// <returns></returns>
        public WebResponseContent NextStepeXecuted(int taskid)
        {
            WebResponseContent responseContent = new WebResponseContent();
            Dt_Task task = BaseDal.QueryData().Where(x => x.TaskNum == taskid).FirstOrDefault();
            if (task == null) return WebResponseContent.Instance.Error($"未查询到任务");
            switch (task.TaskState)
            {
                //入库状态
                case (int)TaskInStatusEnum.RGV_InNew:
                case (int)TaskInStatusEnum.RGV_InPickupFinish:
                case (int)TaskInStatusEnum.RGV_InReleaseFinish:
                case (int)TaskInStatusEnum.RGV_InZicheFinish:
                case (int)TaskInStatusEnum.RGV_InZicheReleaseFinish:
                case (int)TaskInStatusEnum.RGV_InZichemoveFinish:
                //入库状态
                //出库状态
                case (int)TaskOutStatusEnum.OutNew:
                case (int)TaskOutStatusEnum.RGV_OutMothercarFinish:
                case (int)TaskOutStatusEnum.RGV_OutZicheFinish:
                case (int)TaskOutStatusEnum.RGV_OutZicheReleaseFinish:
                case (int)TaskOutStatusEnum.RGV_OutPickupFinish:
                    //出库状态
                    //调取下发的接口
                    responseContent = UpdateTaskStatusToNext(task);
                    break;


                //入库状态
                case (int)TaskInStatusEnum.RGV_InPickupExecuting:
                case (int)TaskInStatusEnum.RGV_InReleaseExecuting:
                case (int)TaskInStatusEnum.RGV_InZicheExecuting:
                case (int)TaskInStatusEnum.RGV_InZicheReleaseExecuting:
                case (int)TaskInStatusEnum.RGV_InZichemoveExecuting:
                case (int)TaskInStatusEnum.RGV_InMothercarExecuting:
                //入库状态
                //出库状态
                case (int)TaskOutStatusEnum.RGV_OutMothercarExecuting:
                case (int)TaskOutStatusEnum.RGV_OutZicheExecuting:
                case (int)TaskOutStatusEnum.RGV_OutZicheReleaseExecuting:
                case (int)TaskOutStatusEnum.RGV_OutPickupExecuting:
                case (int)TaskOutStatusEnum.RGV_OutReleaseExecuting:
                    //出库状态
                    //调取完成接口
                    responseContent = UpdateTaskStatus(task.TaskNum, 1);
                    break;
                case (int)TaskInStatusEnum.RGV_InMothercarFinish:
                    return WebResponseContent.Instance.Error("任务已");
                default:
                    return WebResponseContent.Instance.Error("任务状态错误，执行下一步失败");
            }
            // åˆ›å»ºå¹¶èµ‹å€¼
            return responseContent;
        }
    }
}