duyongjia
2025-01-07 48091350d466941e7d1a6a9c803ad4205d8c3d86
ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
@@ -29,6 +29,7 @@
using System.Text;
using System.Threading.Tasks;
using WIDESEAWCS_Common.Http;
using WIDESEAWCS_Common.ServiceLog;
using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseRepository;
@@ -480,7 +481,16 @@
                        _unitOfWorkManage.BeginTran();
                        UpdateTaskStatus(task.TaskId, (int)TaskOutStatusEnum.SC_OutFinish);
                        _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"堆垛机出库完成");
                        HttpHelpers.Post<WebResponseContent>(url.Replace("PDA", "Task") + "UpdateTaskStatus?taskNum=" + task.TaskNum, "", "更新任务状态");
                        ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"堆垛机出库完成状态回写WMS");
                        var response = HttpHelpers.Post<WebResponseContent>(url.Replace("PDA", "Task") + "UpdateTaskStatus?taskNum=" + task.TaskNum, "", "更新任务状态");
                        if(response.Status)
                        {
                            ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"堆垛机出库完成状态回写WMS成功");
                        }
                        else
                        {
                            ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"堆垛机出库完成状态回写WMS失败");
                        }
                        _unitOfWorkManage.CommitTran();
                        return content.OK();
                    }
@@ -498,23 +508,36 @@
                    _unitOfWorkManage.BeginTran();
                    UpdateTaskStatus(task.TaskId, (int)TaskInStatusEnum.SC_InFinish);
                    _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"堆垛机入库完成");
                    HttpHelpers.Post<WebResponseContent>(url.Replace("PDA", "Task") + "UpdateTaskStatus?taskNum=" + task.TaskNum, "", "更新任务状态");
                    ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"堆垛机入库完成状态回写WMS");
                    var response= HttpHelpers.Post<WebResponseContent>(url.Replace("PDA", "Task") + "UpdateTaskStatus?taskNum=" + task.TaskNum, "", "更新任务状态");
                    if(response.Status)
                    {
                        ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"堆垛机入库完成状态回写WMS成功");
                    }
                    else
                    {
                        ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"堆垛机入库完成状态回写WMS失败");
                    }
                    UpdateTaskStatus(task.TaskId, (int)TaskInStatusEnum.InFinish);
                    _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"入库任务完成");
                    //if (App.User.UserId > 0)
                    //{
                        task.Modifier = "System";
                        var response = HttpHelpers.Post<WebResponseContent>(url.Replace("PDA", "Task") + "TaskCompleted?taskNum=" + task.TaskNum, "", "任务完成");
                        if (response.Status)
                        {
                            _unitOfWorkManage.CommitTran();
                            return content.OK();
                        }
                        else
                        {
                            _unitOfWorkManage.RollbackTran();
                            return content = WebResponseContent.Instance.Error(response.Message);
                        }
                    task.Modifier = "System";
                    ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"入库任务完成回写WMS");
                    var response2 = HttpHelpers.Post<WebResponseContent>(url.Replace("PDA", "Task") + "TaskCompleted?taskNum=" + task.TaskNum, "", "任务完成");
                    if (response2.Status)
                    {
                        ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"入库任务完成回写WMS成功");
                        _unitOfWorkManage.CommitTran();
                        return content.OK();
                    }
                    else
                    {
                        ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"入库任务完成回写WMS失败");
                        _unitOfWorkManage.RollbackTran();
                        return content = WebResponseContent.Instance.Error(response.Message);
                    }
                    //}
                    //_unitOfWorkManage.CommitTran();
                    //return content.OK();
@@ -528,6 +551,7 @@
            {
                _unitOfWorkManage.RollbackTran();
                content = WebResponseContent.Instance.Error($"任务完成异常,任务号:【{taskNum}】,异常信息:{ex.Message}");
                ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"任务完成异常,任务号:【{taskNum}】,异常信息:{ex.Message}");
            }
            finally
            {
@@ -570,14 +594,17 @@
        public WebResponseContent OutBoundTaskByWMS(int taskNum)
        {
            WebResponseContent content = new WebResponseContent();
            ServiceLogger.WriteDebug("OutBoundTaskByWMS", $"出库任务完成回写WMS");
            var response = HttpHelpers.Post<WebResponseContent>(url.Replace("PDA", "Task") + "TaskCompleted?taskNum=" + taskNum, "", "任务完成");
            if (response.Status)
            {
                ServiceLogger.WriteDebug("OutBoundTaskByWMS", $"出库任务完成回写WMS成功");
                _unitOfWorkManage.CommitTran();
                return content.OK();
            }
            else
            {
                ServiceLogger.WriteDebug("OutBoundTaskByWMS", $"出库任务完成回写WMS失败");
                _unitOfWorkManage.RollbackTran();
                return content = WebResponseContent.Instance.Error(response.Message);
            }