肖洋
2025-01-07 60994422d1ff27c24ed8bdf1076f50166ca638db
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
@@ -98,7 +98,7 @@
                    if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
                    {
                        // 判断任务目标地址和路径是否满足特定条件
                        if (task.TargetAddress == "002-021-001" && task.Roadway.Contains("JZ") && task.TaskType == (int)TaskOutboundTypeEnum.OutTray)
                        if ((task.TargetAddress == "002-021-001" || task.TargetAddress == "001-021-001") && task.Roadway.Contains("JZ"))
                        {
                            // 设置任务状态为出库新建
                            task.TaskState = (int)TaskOutStatusEnum.OutNew;
@@ -139,8 +139,11 @@
                    // 判断任务类型是否为入库任务
                    else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)
                    {
                        var value = _sys_ConfigService.GetByConfigKey(CateGoryConst.CONFIG_SYS_InStation, SysConfigKeyConst.JZNGInBoundStation).ConfigValue;
                        var valueList = value.Split(',').ToList();
                        // 判断源地址是否不等于"1359-4"
                        if (task.SourceAddress != "1359-4")
                        //if (task.SourceAddress != "1359-4" && task.SourceAddress != "1357-4")
                        if (!valueList.Contains(task.SourceAddress))
                        {
                            // 查询从源地址到目标地址的路由
                            List<Dt_Router> routers = _routerService.QueryNextRoutes(item.SourceAddress, item.TargetAddress);
@@ -156,8 +159,13 @@
                        }
                        else
                        {
                            // 设置当前地址为"002-021-001"
                            task.CurrentAddress = "002-021-001";
                            task.CurrentAddress = string.Empty;
                            if (task.SourceAddress == "1325-6")
                                // 设置当前地址为"001-021-001"
                                task.CurrentAddress = "001-021-001";
                            else
                                // 设置当前地址为"002-021-001"
                                task.CurrentAddress = "002-021-001";
                            // 设置下一个地址为目标地址
                            task.NextAddress = item.TargetAddress;
                        }
@@ -562,6 +570,13 @@
                    }
                    else if (task.TaskState == (int)TaskInStatusEnum.SC_InFinish)
                    {
                        if (App.User.UserId > 0)
                        {
                            content = StackCraneTaskCompleted(task.TaskNum);
                            return content;
                        }
                        task.ModifyDate = DateTime.Now;
                        task.Modifier = "System";