huanghongfeng
2025-01-24 829eabf256e29392ca63f6da48829dba3b075dfe
´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
@@ -85,7 +85,6 @@
        public string urlWMSTask = WIDESEAWCS_Core.Helper.AppSettings.Configuration["urlWMSTask"];
        public string urlTaskCompleted = WIDESEAWCS_Core.Helper.AppSettings.Configuration["urlTaskCompleted"];
        public string urlWMSMovelibraryTask = WIDESEAWCS_Core.Helper.AppSettings.Configuration["urlWMSMovelibraryTask"];
        public string urlRelocationTaskCompleted = WIDESEAWCS_Core.Helper.AppSettings.Configuration["urlRelocationTaskCompleted"];
        public string urlQueryinventory = WIDESEAWCS_Core.Helper.AppSettings.Configuration["urlQueryinventory"];
        public string urlEmptyOutbound = WIDESEAWCS_Core.Helper.AppSettings.Configuration["urlEmptyOutbound"];
        public string urlRawmaterialout = WIDESEAWCS_Core.Helper.AppSettings.Configuration["urlRawmaterialout"];
@@ -707,7 +706,7 @@
                    /*List<Dt_Router> routers = _routerService.QueryNextRoutes(task.NextAddress, task.TargetAddress);
                    if (!routers.Any()) return WebResponseContent.Instance.Error($"未找到设备路由信息");*/
                    content = HttpHelper.Get<WebResponseContent>($"{urlTaskCompleted}?TaskNum={task.TaskNum}");
                    content = HttpHelper.Get<WebResponseContent>($"{urlTaskCompleted}?TaskNum={task.TaskNum}&HowWorks=2");
                    task.TaskState = (int)TaskOutStatusEnum.OutFinish;
                    task.ModifyDate = DateTime.Now;
                    BaseDal.DeleteData(task);
@@ -719,7 +718,7 @@
                }
                else if (task.TaskType == (int)TaskInboundTypeEnum.Inbound && task.TaskState == (int)TaskInStatusEnum.SC_InExecuting)
                {
                    content = HttpHelper.Get<WebResponseContent>($"{urlTaskCompleted}?TaskNum={task.TaskNum}");
                    content = HttpHelper.Get<WebResponseContent>($"{urlTaskCompleted}?TaskNum={task.TaskNum}&HowWorks=2");
                    //todo 
                    //int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskInStatusEnum>();
                    task.TaskState = (int)TaskInStatusEnum.InFinish;
@@ -732,14 +731,15 @@
                }
                else if (task.TaskType == (int)TaskRelocationTypeEnum.Relocation)
                {
                    GenerateInv2 generate = new GenerateInv2()
                    /*GenerateInv2 generate = new GenerateInv2()
                    {
                        PalletCode = task.PalletCode,
                        SourceAddress = task.SourceAddress,
                        TargetAddress = task.TargetAddress
                    };
                    content = HttpHelper.Post<WebResponseContent>($"{urlRelocationTaskCompleted}", generate);
                    content = HttpHelper.Post<WebResponseContent>($"{urlTaskCompleted}", generate);*/
                    content = HttpHelper.Get<WebResponseContent>($"{urlTaskCompleted}?TaskNum={task.TaskNum}&HowWorks=2");
                    task.TaskState = (int)TaskOutStatusEnum.SC_OutFinish;
                    task.ModifyDate = DateTime.Now;
                    BaseDal.DeleteData(task);
@@ -909,7 +909,23 @@
            }
        }
        public WebResponseContent ReceiveWCSTask(int tasknum)
        {
            Dt_Task tasks = BaseDal.QueryFirst(x => x.TaskNum == tasknum);
            try
            {
                _task_HtyService.AddTaskHty(tasks);
                BaseDal.DeleteData(tasks);
                WriteLog.Write_Log("WMS手动删除任务", "删除成功", $"申请删除的条码:{tasks.TaskNum},托盘条码:{tasks.PalletCode}", new { ä¿¡æ¯ = "删除成功" });
                return WebResponseContent.Instance.OK();
            }
            catch (Exception ex)
            {
                WriteLog.Write_Log("WMS手动删除任务","删除失败", $"申请删除的条码:{tasks.TaskNum},托盘条码:{tasks.PalletCode}", new { ä¿¡æ¯ = ex.Message });
                return WebResponseContent.Instance.Error();
            }
        }
    }
}