同步

陈勇

2026-03-17 40ef2cb3dd897dfc74d9576d0973517b24cc9367

 ÏîÄ¿´úÂë/WCS/WCSServer/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs

@@ -73,8 +73,8 @@
                    if (commonStackerCrane.GetValue<StackerCraneDBName, bool>(StackerCraneDBName.Online)        //在线
                        && commonStackerCrane.GetValue<StackerCraneDBName, bool>(StackerCraneDBName.Free)     //空闲
                        && !commonStackerCrane.GetValue<StackerCraneDBName, bool>(StackerCraneDBName.Alarm)     //无报警
                        && !commonStackerCrane.GetValue<StackerCraneDBName, bool>(StackerCraneDBName.Goods)    //载货台无货
                        && commonStackerCrane.GetValue<StackerCraneDBName, bool>(StackerCraneDBName.Flag)      //货叉启用
                        && !commonStackerCrane.GetValue<StackerCraneDBName, bool>(StackerCraneDBName.ForkGoods)    //载货台无货
                        && commonStackerCrane.GetValue<StackerCraneDBName, bool>(StackerCraneDBName.ForkFlag)      //货叉启用
                        )
                    {
                        commonStackerCrane.CheckStackerCraneTaskCompleted();//防止任务完成事件监测超时，再手动触发一次
@@ -87,7 +87,7 @@
                                StackerCraneTaskCommand? stackerCraneTaskCommand = ConvertToStackerCraneTaskCommand(task);
                                if (stackerCraneTaskCommand != null)
                                {
                                    var taskNum = commonStackerCrane.GetValue<StackerCraneDBName, int>(StackerCraneDBName.CurrentTaskNum);
                                    var taskNum = commonStackerCrane.GetValue<StackerCraneDBName, int>(StackerCraneDBName.TaskNum);
                                    //var taskBarCode = commonStackerCrane.GetValue<StackerCraneDBName, string>(StackerCraneDBName.Barcode);
                                    ConsoleHelper.WriteColorLine($"【{commonStackerCrane.DeviceName}】堆垛机任务号：【{taskNum}】任务任务号：【{task.TaskNum}】", ConsoleColor.DarkBlue);
                                    if (taskNum == 0)
@@ -184,7 +184,7 @@
                    {
                        var content = _taskService.StackCraneTaskCompleted(e.TaskNum);

                        var isWorkType = commonStackerCrane.SetValue(StackerCraneDBName.WorkType, 2);
                        var isWorkType = commonStackerCrane.SetValue(StackerCraneDBName.CMD, 2);
                        str = $"【{commonStackerCrane.DeviceName}】WMS|WCS任务完成：【{content.Status}】,堆垛机完成信号写入：【{isWorkType}】,任务号：【{e.TaskNum}】时间【{DateTime.Now}】";
                        WriteInfo(commonStackerCrane.DeviceName, str);
                        ConsoleHelper.WriteColorLine(str, ConsoleColor.Blue);
@@ -269,15 +269,15 @@
                task = _taskService.QueryStackerCraneInTask(commonStackerCrane.DeviceCode);
            }

            if (task != null && task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)
            {
                var relocation = _taskService.InBeforeCheck(task.TaskNum);
            //if (task != null && task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)
            //{
            //    var relocation = _taskService.InBeforeCheck(task.TaskNum);

                if (relocation != null)
                {
                    return relocation;
                }
            }
            //    if (relocation != null)
            //    {
            //        return relocation;
            //    }
            //}
            return task;
        }