1

Admin

2025-11-25 627bfedc5739855b6d2e829a115c3b64134ef868

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs

@@ -65,6 +65,7 @@
using WIDESEAWCS_QuartzJob.Models;
using WIDESEAWCS_QuartzJob.Repository;
using WIDESEAWCS_QuartzJob.Service;
using WIDESEAWCS_TaskInfoRepository;
using static Microsoft.IO.RecyclableMemoryStreamManager;
using static System.Net.Mime.MediaTypeNames;

@@ -144,7 +145,7 @@
                    if (item.type == 1)     //入库
                    {
                        Dt_Task dt_Task = new Dt_Task();
                        dt_Task.TaskNum = item.taskNo;
                        dt_Task.TaskNum = BaseDal.GetTaskNo().Result;
                        dt_Task.PalletCode = item.containerNo;    //暂无
                        dt_Task.Roadway = "RGV101";
                        dt_Task.TaskType = (int)TaskInboundTypeEnum.Inbound;
@@ -157,6 +158,7 @@
                        dt_Task.NextAddress = "";   //目前暂无
                        dt_Task.Grade = item.priority;
                        dt_Task.WMSId = 0;   //目前暂无
                        dt_Task.LJTaskNum= item.taskNo;
                        BaseDal.AddData(dt_Task);
                        content.code = 0;

@@ -185,7 +187,7 @@
                        AGVStation gVStation = _gvStationService.Corridorequipment(roadway);

                        Dt_Task dt_Task = new Dt_Task();
                        dt_Task.TaskNum = item.taskNo;
                        dt_Task.TaskNum = BaseDal.GetTaskNo().Result;
                        dt_Task.PalletCode = item.containerNo;    //暂无
                        dt_Task.Roadway = roadway;
                        dt_Task.TaskType = (int)TaskOutboundTypeEnum.Outbound;
@@ -198,6 +200,7 @@
                        dt_Task.NextAddress = gVStation.ZicheMotherinlaw.ToString();   //目前暂无
                        dt_Task.Grade = item.priority;
                        dt_Task.WMSId = 0;   //目前暂无
                        dt_Task.LJTaskNum = item.taskNo;
                        BaseDal.AddData(dt_Task);
                        content.code = 0;

@@ -876,7 +879,7 @@
                    if (task.NextAddress == "1001" || task.NextAddress == "1002")
                    {
                        //异常排除任务时，异常上报
                        TaskResultIn(task.TaskNum.ToString(), task.NextAddress, 3, "");
                        TaskResultIn(task.LJTaskNum.ToString(), task.NextAddress, 3, "");
                        AutomaticTaskCompleted(task);   //任务完成
                        BaseDal.DeleteData(task);
                    }
@@ -885,11 +888,11 @@

                        if(task.TaskType == (int)TaskInboundTypeEnum.Inbound && task.NextAddress != "1001" && task.NextAddress != "1002")
                        {
                            TaskResultIn(task.TaskNum.ToString(), "", 2, "");
                            TaskResultIn(task.LJTaskNum.ToString(), "", 2, "");
                        }
                        else if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
                        {
                            TaskResultOut(task.TaskNum.ToString(), task.NextAddress, 2, "");
                            TaskResultOut(task.LJTaskNum.ToString(), task.NextAddress, 2, "");
                        }
                    }

@@ -1389,7 +1392,7 @@
                            _task_HtyService.AddTaskHty(dt_Task);
                            BaseDal.DeleteData(dt_Task);
                            expoReverse.code = 0;
                            WriteLog.Write_Log("任务取消信息", "任务取消", "信息", $"任务号：{dt_Task.TaskNum}，已取消");
                            WriteLog.Write_Log("兰剑调取任务取消信息", "任务取消", "信息", $"任务号：{dt_Task.TaskNum}，已取消");
                        }
                        else
                        {
@@ -1464,10 +1467,12 @@
            StkRunStatusReturns LJReturns = HttpHelper.Post<StkRunStatusReturns>(urlLanJianWCSAPI + LanJiantaskResult, reception, "任务反馈接口");
            if (LJReturns.code == 0)
            {
                WriteLog.Write_Log("入库任务上传情况", "正常上传", "内容信息", $"任务编号：{taskNo},目标地址：{finalAddress}，上传状态：{status}，信息内容：{remark}");
                responseContent.OK("上传成功");
            }
            else
            {
                WriteLog.Write_Log("入库任务上传情况", "上传失败", "内容信息", $"任务编号：{taskNo},目标地址：{finalAddress}，上传状态：{status}，信息内容：{remark}=====》上传失败，原因：{LJReturns.msg}");
                responseContent.OK("上传失败，原因：" + LJReturns.msg);
            }
            // åˆ›å»ºå¹¶èµ‹å€¼
@@ -1487,10 +1492,12 @@
            StkRunStatusReturns LJReturns = HttpHelper.Post<StkRunStatusReturns>(urlLanJianWCSAPI + LanJiantaskResult, reception, "任务反馈接口");
            if (LJReturns.code == 0)
            {
                WriteLog.Write_Log("出库任务上传情况", "正常上传", "内容信息", $"任务编号：{taskNo},目标地址：{finalAddress}，上传状态：{status}，信息内容：{remark}");
                responseContent.OK("上传成功");
            }
            else
            {
                WriteLog.Write_Log("出库任务上传情况", "上传失败", "内容信息", $"任务编号：{taskNo},目标地址：{finalAddress}，上传状态：{status}，信息内容：{remark}=====》上传失败，原因：{LJReturns.msg}");
                responseContent.OK("上传失败，原因：" + LJReturns.msg);
            }
            // åˆ›å»ºå¹¶èµ‹å€¼
@@ -1584,18 +1591,18 @@
                if (dt_task.NextAddress == "1001" || dt_task.NextAddress == "1002")
                {
                    //异常排除任务时，异常上报
                    TaskResultIn(dt_task.TaskNum.ToString(), dt_task.NextAddress, 3, "手动完成");
                    TaskResultIn(dt_task.LJTaskNum.ToString(), dt_task.NextAddress, 3, "手动完成");
                }
                else
                {

                    if (dt_task.TaskType == (int)TaskInboundTypeEnum.Inbound && dt_task.NextAddress != "1001" && dt_task.NextAddress != "1002")
                    {
                        TaskResultIn(dt_task.TaskNum.ToString(), "", 2, "手动完成");
                        TaskResultIn(dt_task.LJTaskNum.ToString(), "", 2, "手动完成");
                    }
                    else if(dt_task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
                    {
                        TaskResultOut(dt_task.TaskNum.ToString(), dt_task.NextAddress, 2, "手动完成");
                        TaskResultOut(dt_task.LJTaskNum.ToString(), dt_task.NextAddress, 2, "手动完成");
                    }

                }
@@ -1673,18 +1680,18 @@
                if (dt_task.NextAddress == "1001" || dt_task.NextAddress == "1002")
                {
                    //异常排除任务时，异常上报
                    TaskResultIn(dt_task.TaskNum.ToString(), dt_task.NextAddress, 3, "任务取消");
                    TaskResultIn(dt_task.LJTaskNum.ToString(), dt_task.NextAddress, 3, "任务取消");
                }
                else
                {

                    if (dt_task.TaskType == (int)TaskInboundTypeEnum.Inbound)
                    {
                        TaskResultIn(dt_task.TaskNum.ToString(), "", 3, "任务取消");
                        TaskResultIn(dt_task.LJTaskNum.ToString(), "", 3, "任务取消");
                    }
                    else
                    {
                        TaskResultOut(dt_task.TaskNum.ToString(), dt_task.NextAddress, 3, "任务取消");
                        TaskResultOut(dt_task.LJTaskNum.ToString(), dt_task.NextAddress, 3, "任务取消");
                    }

                }