Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

wangxinhui

2025-04-29 c38154df95a2c2fa1bd32c45f6be9c0d98e37440

 代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/板材仓/RGVJob_BC.cs

@@ -146,7 +146,7 @@
                            else if (!conveyorLineSignalRead.STB && conveyorLineSignalWrite.ACK && !conveyorLineStatus.Alarm)
                            {
                                Dt_Task task = _taskRepository.QueryFirst(x => x.PalletCode == conveyorLineInfoRead.Barcode);
                                if (task!=null && task.TaskType==TaskTypeEnum.MesPalletReturn.ObjToInt())
                                if (task!=null && (task.TaskType == TaskTypeEnum.MesPalletLargeReturn.ObjToInt() || task.TaskType == TaskTypeEnum.MesPalletSmallReturn.ObjToInt()))
                                {
                                    _taskService.TaskCompleted(task.TaskNum);
                                }