diff --git a/app/models/order_queue_station.rb b/app/models/order_queue_station.rb
index cfa44968..42891015 100755
--- a/app/models/order_queue_station.rb
+++ b/app/models/order_queue_station.rb
@@ -47,8 +47,10 @@ class OrderQueueStation < ApplicationRecord
                 #   AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs) 
                 # else
                               
-                   if (order_item.qty > 0) && (pdf_status.nil?)
-                    AssignedOrderItem.assigned_order_item(order, order_item.item_code, order_item.item_instance_code, oqs) 
+                   if (order_item.qty > 0)
+                    if pdf_status.nil?
+                      AssignedOrderItem.assigned_order_item(order, order_item.item_code, order_item.item_instance_code, oqs) 
+                    end
                     oqs_order_items.push(order_item)
                    end
                 # end                                           
@@ -86,8 +88,10 @@ class OrderQueueStation < ApplicationRecord
                 #   AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs) 
                 # else
                               
-                  if (order_item.qty > 0) && (pdf_status.nil?)
-                    AssignedOrderItem.assigned_order_item(order, order_item.item_code, order_item.item_instance_code, oqs) 
+                  if (order_item.qty > 0)
+                    if pdf_status.nil?
+                      AssignedOrderItem.assigned_order_item(order, order_item.item_code, order_item.item_instance_code, oqs) 
+                    end
                     oqs_order_items.push(order_item)
                   end
                 # end