1

HuBingJie

5 天以前 7ac6ad15e5af1024f4d21d33bb3af98ffce43874

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

@@ -202,14 +202,12 @@
                        content.msg = $"任务类型错误，wcs接收到的类型为：{item.type}";
                    }
                }

                WriteLog.Write_Log("任务接收", "接收兰剑下发任务", "成功", $"接收到的数据为：{expoTask.ToJson()}");
            }
            catch (Exception ex)
            {
                content.code = 1;
                content.msg = $"数据错误，原因：{ex.Message}";

                WriteLog.Write_Log("任务接收", "接收兰剑下发任务异常", "异常", ex.Message);
            }
            return content;
@@ -291,7 +289,6 @@
                task.ModifyDate = DateTime.Now;
                BaseDal.UpdateData(task);
                _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, task.ExceptionMessage);

                content = WebResponseContent.Instance.OK();
            }
            catch (Exception ex)
@@ -1042,5 +1039,137 @@
            // åˆ›å»ºå¹¶èµ‹å€¼
            return responseContent;
        }


        /// <summary>
        /// äººå·¥æ‰‹åŠ¨å®Œæˆ
        /// </summary>
        /// <param name="ids"></param>
        /// <returns></returns>
        /// <exception cref="NotImplementedException"></exception>
        public WebResponseContent CompletedManually(int id)
        {

            var db = BaseDal.Db as SqlSugarClient;

            try
            {
                db.Ado.BeginTran();


                Dt_Task dt_task = BaseDal.QueryData().Where(x => x.TaskId == id).FirstOrDefault();
                if (dt_task == null) 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.TaskState,
                    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
                });

                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("手动完成失败！");
                }

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

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

        /// <summary>
        /// äººå·¥æ‰‹åŠ¨å–消任务
        /// </summary>
        /// <param name="id"></param>
        /// <returns></returns>
        /// <exception cref="NotImplementedException"></exception>
        public WebResponseContent MHWCSTaskCancel(int id)
        {
            var db = BaseDal.Db as SqlSugarClient;

            try
            {
                db.Ado.BeginTran();
                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.TaskState > (int)TaskInStatusEnum.RGV_InNew) return WebResponseContent.Instance.Error($"任务状态不允许取消");
                }
                else
                {
                    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
                    });
                if (res.Status == false) {
                    db.Ado.RollbackTran();
                    return WebResponseContent.Instance.Error("取消任务失败！");
                }

                var deletetask = BaseDal.DeleteData(dt_task);
                if (deletetask == false) {
                    db.Ado.RollbackTran();
                    return WebResponseContent.Instance.Error("删除任务失败所有操作回滚！");
                }
                db.Ado.CommitTran();
                return WebResponseContent.Instance.OK("取消任务成功！");
            }
            catch (Exception ex)
            {
                db.Ado.RollbackTran();
                return WebResponseContent.Instance.Error("取消任务失败！");
            }
        }
    }
}