1

HuBingJie

5 天以前 99d55d437cc924429bb9589d5afe24f386cf8342

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

@@ -1133,29 +1133,36 @@
                    if (dt_task.TaskState > (int)TaskOutStatusEnum.OutNew) return WebResponseContent.Instance.Error($"任务状态不允许取消");

                }
                var res = _task_HtyService.AddData(new Dt_Task_hty
                    {
                        TaskNum = dt_task.TaskNum,
                        PalletCode = dt_task.PalletCode,
                        Roadway = dt_task.Roadway,
                        TaskType = dt_task.TaskType,
                        TaskState = dt_task.TaskType >= (int)TaskInboundTypeEnum.Inbound ? (int)TaskInStatusEnum.InCancel : (int)TaskOutStatusEnum.OutCancel,
                        SourceAddress = dt_task.SourceAddress,
                        TargetAddress = dt_task.TargetAddress,
                        CurrentAddress = dt_task.CurrentAddress,
                        NextAddress = dt_task.NextAddress,
                        WMSId = dt_task.WMSId,
                        Dispatchertime = dt_task.Dispatchertime,
                        Remark = "人工手动取消任务",
                        Creater = App.User.UserName,
                        CreateDate = DateTime.Now,
                        RGVTaskType = dt_task.RGVTaskType,
                        RGVCurrentexecution = dt_task.RGVCurrentexecution
                    });

                Dt_Task_hty dt_Task_Hty = new Dt_Task_hty
                {
                    TaskNum = dt_task.TaskNum,
                    PalletCode = dt_task.PalletCode,
                    Roadway = dt_task.Roadway,
                    TaskType = dt_task.TaskType,
                    TaskState = dt_task.TaskType >= (int)TaskInboundTypeEnum.Inbound ? (int)TaskInStatusEnum.InCancel : (int)TaskOutStatusEnum.OutCancel,
                    SourceAddress = dt_task.SourceAddress,
                    TargetAddress = dt_task.TargetAddress,
                    CurrentAddress = dt_task.CurrentAddress,
                    NextAddress = dt_task.NextAddress,
                    WMSId = dt_task.WMSId,
                    Dispatchertime = dt_task.Dispatchertime,
                    Remark = "人工手动取消任务",
                    Creater = App.User.UserName,
                    CreateDate = DateTime.Now,
                    RGVTaskType = dt_task.RGVTaskType,
                    RGVCurrentexecution = dt_task.RGVCurrentexecution
                };
                var res = _task_HtyService.AddData(dt_Task_Hty);
                if (res.Status == false) {
                    db.Ado.RollbackTran();
                    return WebResponseContent.Instance.Error("取消任务失败！");
                }
                int oldState = dt_task.TaskState;
                _taskExecuteDetailService.AddTaskExecuteDetail(
    dt_task.TaskId,
    $"自动任务状态从【{oldState}】进入到【{dt_Task_Hty.TaskState}】"
);

                var deletetask = BaseDal.DeleteData(dt_task);
                if (deletetask == false) {