diff --git a/app/controllers/api/orders_controller.rb b/app/controllers/api/orders_controller.rb
index e2eeb9be..e7b3215b 100755
--- a/app/controllers/api/orders_controller.rb
+++ b/app/controllers/api/orders_controller.rb
@@ -229,8 +229,11 @@ class Api::OrdersController <  Api::ApiController
 
         if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
           # print
-          assigned_item = AssignedOrderItem.find_by_instance_code(order_item.item_instance_code)  
-          assigned_items = AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'")
+          assigned_item = AssignedOrderItem.find_by_instance_code_and_order_id(order_item.item_instance_code, order_item.order_id)
+          assigned_items = nil
+          if !assigned_item.nil?
+            assigned_items = AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'")
+          end
 
           if !assigned_items.nil?
             assigned_items.each do |assign_item|
diff --git a/app/controllers/oqs/edit_controller.rb b/app/controllers/oqs/edit_controller.rb
index 89b887d5..c804d65a 100644
--- a/app/controllers/oqs/edit_controller.rb
+++ b/app/controllers/oqs/edit_controller.rb
@@ -38,7 +38,7 @@ class Oqs::EditController < BaseOqsController
 
       if ENV["SERVER_MODE"] != "cloud" && order.source == 'cashier' #no print in cloud server
         # print
-        assigned_item = AssignedOrderItem.find_by_instance_code(order_item.item_instance_code)    
+        assigned_item = AssignedOrderItem.find_by_instance_code_and_order_id(order_item.item_instance_code, order_item.order_id)    
         assigned_items = nil
         if !assigned_item.nil?
            assigned_items = AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'")