diff --git a/app/models/order_queue_station.rb b/app/models/order_queue_station.rb
index 6e347ada..cfa44968 100755
--- a/app/models/order_queue_station.rb
+++ b/app/models/order_queue_station.rb
@@ -47,7 +47,7 @@ class OrderQueueStation < ApplicationRecord
                 #   AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs) 
                 # else
                               
-                   if (order_item.qty > 0)
+                   if (order_item.qty > 0) && (pdf_status.nil?)
                     AssignedOrderItem.assigned_order_item(order, order_item.item_code, order_item.item_instance_code, oqs) 
                     oqs_order_items.push(order_item)
                    end
@@ -86,7 +86,7 @@ class OrderQueueStation < ApplicationRecord
                 #   AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs) 
                 # else
                               
-                  if (order_item.qty > 0)
+                  if (order_item.qty > 0) && (pdf_status.nil?)
                     AssignedOrderItem.assigned_order_item(order, order_item.item_code, order_item.item_instance_code, oqs) 
                     oqs_order_items.push(order_item)
                   end
@@ -233,14 +233,12 @@ class OrderQueueStation < ApplicationRecord
       print_settings=PrintSetting.find_by_unique_code(unique_code)
       order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
       order_queue_printer.print_order_summary(print_settings, oqs,order.order_id, order_items, print_status="")
-
-      assigned =AssignedOrderItem.where("order_id = '#{ order.order_id }'").pluck(:assigned_order_item_id)
-      AssignedOrderItem.where('assigned_order_item_id IN (?)', assigned).update_all(print_status: true)
-  
     else
       move_print_pdf(change_to,current_user,table_id,order_items,oqs)
     end
-     
+    
+    assigned =AssignedOrderItem.where("order_id = '#{ order.order_id }'").pluck(:assigned_order_item_id)
+    AssignedOrderItem.where('assigned_order_item_id IN (?)', assigned).update_all(print_status: true)
   end
 
   #Print order_item in 1 slip per item
@@ -277,13 +275,12 @@ class OrderQueueStation < ApplicationRecord
           order_queue_printer.print_order_item(print_settings, oqs,order_item.order_id, order_item.order_items_id, print_status="" )
         end
       end
-      
-      assigned =AssignedOrderItem.where("order_id = '#{ order.order_id }'").pluck(:assigned_order_item_id)
-      AssignedOrderItem.where('assigned_order_item_id IN (?)', assigned).update_all(print_status: true)
     else
       move_print_pdf(change_to,current_user,table_id,assigned_items,oqs)
     end
     
+    assigned =AssignedOrderItem.where("order_id = '#{ order.order_id }'").pluck(:assigned_order_item_id)
+    AssignedOrderItem.where('assigned_order_item_id IN (?)', assigned).update_all(print_status: true)
   end
 
   def move_print_pdf(change_to,current_user,change_from,order_items,oqs)