取消，异常流程，修改

海波 张

2 天以前 30b008a25cc30a32f1e2fdee4a34ae71146e990e

 api/MoboxController.cs

@@ -61,7 +61,7 @@
            return result;
        }

        internal static Result cancelTask1(cancleTaskParme model)
        internal static Result cancelTask1(MoboxTaskBase model)
        {
            var result = new Result();
            LogHelper.Info("cancelTask1取消任务信息：" + JsonConvert.SerializeObject(model), "取消");
@@ -75,9 +75,9 @@

            try
            {
                var task = TaskHelper.GetTaskByWorkNo(model.task_no, "agv");
                var task = TaskHelper.GetTaskByWorkNo(model.TaskNo, "agv");

                var wcsTask = TaskHelper.GetTaskByWorkNo(model.task_no, "wcs");
                var wcsTask = TaskHelper.GetTaskByWorkNo(model.TaskNo, "wcs");

                if (task != null)
                {
@@ -141,8 +141,9 @@
                else
                {
                    result.errCode = 1;
                    result.errMsg = $"{model.task_no}任务不存在";
                    result.errMsg = $"{model.TaskNo}任务不存在";
                    result.success = false;
                    return result;
                }

                if (wcsTask != null)
@@ -230,9 +231,7 @@
                        WmsTaskAction ac4 = TaskHelper.GetActionRecord(task.S_CODE, "4");
                        if (ac4 != null)
                        {

                            LogHelper.Info("CompleteTask agv任务已经取货完成,任务强制完成处理", "强制完成");


                            TaskHelper.UpdateStatus(task, "卸货完成");
                            LocationHelper.UnLockLoc(task.S_END_LOC);
@@ -249,7 +248,6 @@
                        }
                        else
                        {

                            LogHelper.Info("CompleteTask agv任务没有取货完成,任务取消处理", "强制完成");
                            var cancle = new cancleTaskParme();
                            cancle.task_no = task.S_CODE;