dengjunjie
4 天以前 fb79dc54d6484146b74d29bf5644df880fc1fa01
´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
@@ -117,14 +117,14 @@
                        content = RelocationTaskCompleted(task);
                        break;
                    case TaskTypeEnum.AGVCarry:
                        content = AGVCarryTaskCompleted(task);
                        break;
                    default:
                        return content = WebResponseContent.Instance.Error("未找到任务类型对应业务处理逻辑");
                }
                if (content.Status)
                {
                    if (App.User.UserId > 0)
                    if (App.User.UserId > 0 && task.TaskType != TaskTypeEnum.AGVCarry.ObjToInt())
                    {
                        content = HttpHelper.Post<WebResponseContent>(url + "StackCraneTaskCompleted?taskNum=" + task.TaskNum, "", "任务完成");
                        if (!content.Status) throw new Exception(content.Message);
@@ -160,31 +160,41 @@
                    return content = WebResponseContent.Instance.Error("未找到任务信息");
                }
                _unitOfWorkManage.BeginTran();
                MethodInfo? methodInfo = GetType().GetMethod(((TaskTypeEnum)task.TaskType) + "TaskCancel");
                if (methodInfo != null)
                #region MyRegion
                switch ((TaskTypeEnum)task.TaskType)
                {
                    WebResponseContent? responseContent = (WebResponseContent?)methodInfo.Invoke(this, new object[] { task });
                    if (responseContent != null)
                    {
                        if (responseContent != null)
                        {
                            if (App.User.UserId > 0)
                            {
                                var response = HttpHelper.Post<WebResponseContent>(url + "TaskCancel?taskNum=" + task.TaskNum, "", "任务取消");
                                if (!response.Status)
                                {
                                    _unitOfWorkManage.RollbackTran();
                                    return content = WebResponseContent.Instance.Error(response.Message);
                                }
                                _unitOfWorkManage.CommitTran();
                                return content = responseContent;
                            }
                            _unitOfWorkManage.CommitTran();
                            return content = responseContent;
                        }
                    }
                    case TaskTypeEnum.Inbound:
                        content = InboundTaskCancel(task);
                        break;
                    case TaskTypeEnum.Outbound:
                        content = OutboundTaskCancel(task);
                        break;
                    case TaskTypeEnum.PalletInbound:
                        content = PalletInboundTaskCancel(task);
                        break;
                    case TaskTypeEnum.PalletOutbound:
                        content = PalletOutboundTaskCancel(task);
                        break;
                    case TaskTypeEnum.Relocation:
                        content = RelocationTaskCancel(task);
                        break;
                    case TaskTypeEnum.AGVCarry:
                        content = AGVCarryTaskCompleted(task);
                        break;
                    default:
                        return content = WebResponseContent.Instance.Error("未找到任务类型对应业务处理逻辑");
                }
                return content = WebResponseContent.Instance.Error("未找到任务类型对应业务处理逻辑");
                if (content.Status)
                {
                    if (App.User.UserId > 0 && task.TaskType != TaskTypeEnum.AGVCarry.ObjToInt())
                    {
                        content = HttpHelper.Post<WebResponseContent>(url + "TaskCancel?taskNum=" + task.TaskNum, "", "任务取消");
                        if (!content.Status) throw new Exception(content.Message);
                    }
                    _unitOfWorkManage.CommitTran();
                }
                return content;
                #endregion
            }
            catch (Exception ex)
            {
@@ -499,6 +509,18 @@
                return WebResponseContent.Instance.Error(ex.Message);
            }
        }
        public WebResponseContent AGVCarryTaskCompleted(Dt_Task task)
        {
            try
            {
                BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateType.自动完成 : OperateType.人工完成);
                return WebResponseContent.Instance.OK();
            }
            catch (Exception ex)
            {
                return WebResponseContent.Instance.Error(ex.Message);
            }
        }
        public WebResponseContent InboundTaskCancel(Dt_Task task)
        {