合并冲突

wanshenmean

2024-11-07 959aa7cefa8f416452444160cdd4edbea2cadae7

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs

@@ -183,7 +183,7 @@
            HandleTaskOut(conveyorLine, command, childDeviceCode, ProtocalDetailValue, task);

            // 如果没有出库任务，处理新任务
            if (task == null)
            if (task == null && command.Barcode != "NoRead")
            {
                HandleNewTask(conveyorLine, command, childDeviceCode, ProtocalDetailValue);
            }