1

huanghongfeng

2025-02-28 3163fec4985ebc87ea859087cdedacad749096d9

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

@@ -199,23 +199,9 @@

                throw;
            }

            /*WebResponseContent content = new WebResponseContent();
            GenerateInv generate = new GenerateInv()
            {
                SourceAddress = "",
                PalletCode = palletCode
            };
            content = HttpHelper.Post<WebResponseContent>($"{urlQueryinventory}", generate);
            if (content != null)
            {
                if (content.Status)
                {
                    return content;
                }
            }
            return content = WebResponseContent.Instance.Error();*/
        }

            

        /// <summary>
        /// æ ¹æ®æ‰˜ç›˜å·ã€èµ·å§‹åœ°å€å‘WMS请求任务
@@ -336,7 +322,7 @@
                        task = JsonConvert.DeserializeObject<Dt_Task>(content.Data.ToString());
                        if (task.TaskNum != _Task.TaskNum)
                        {

                            WriteLog.GetLog("接收任务").Write("移库任务："+JsonConvert.SerializeObject(task), "接收任务");
                            task.TaskState = (int)TaskRelocationTypeEnum.Relocation;
                            task.Roadway = task.Roadway == "1" ? task.Roadway = "SC01" : task.Roadway = "SC02";
                            task.TaskNum = task.TaskNum;
@@ -349,8 +335,9 @@
                }
                else
                {
                    return null;
                    WriteLog.GetLog("PLC日志").Write($"失败信息：{content.Message}", "移库信息");
                    return null;
                    
                }
            }

@@ -731,16 +718,11 @@
                }
                else if (task.TaskType == (int)TaskRelocationTypeEnum.Relocation)
                {
                    /*GenerateInv2 generate = new GenerateInv2()
                    {
                        PalletCode = task.PalletCode,
                        SourceAddress = task.SourceAddress,
                        TargetAddress = task.TargetAddress
                    task.TaskState = (int)TaskOutStatusEnum.OutRest;
                    BaseDal.UpdateData(task);

                    };
                    content = HttpHelper.Post<WebResponseContent>($"{urlTaskCompleted}", generate);*/
                    content = HttpHelper.Get<WebResponseContent>($"{urlTaskCompleted}?TaskNum={task.TaskNum}&HowWorks=2");
                    task.TaskState = (int)TaskOutStatusEnum.SC_OutFinish;
                    task.TaskState = (int)TaskOutStatusEnum.OutRest;
                    task.ModifyDate = DateTime.Now;
                    BaseDal.DeleteData(task);
                    _task_HtyService.AddTaskHty(task);
@@ -912,19 +894,27 @@
        public WebResponseContent ReceiveWCSTask(int tasknum)
        {
            Dt_Task tasks = BaseDal.QueryFirst(x => x.TaskNum == tasknum);
            try
            if(tasks == null)
            {
                _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();
            }
            else
            {
                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();
                }
            }
            
        }

    }