diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js
index 77ea81b5..7967f8a1 100755
--- a/app/assets/javascripts/OQS.js
+++ b/app/assets/javascripts/OQS.js
@@ -151,9 +151,22 @@ $(document).on('turbolinks:load', function() {
 	    	url: '/oqs/' + orderNo,
 	    	data: { 'status' : order_status },
 	    	success: function(res){
-	    		for (i = 0; i < res.length; i++) {	    			
-	    			var data = JSON.stringify(res[i]);	
+	    		// console.log(res);
+	    		for (i = 0; i < res["items"].length; i++) {	    			
+	    			var data = JSON.stringify(res["items"][i]);	
         			var parse_data = JSON.parse(data); 
+        			var assigned_order_items = {}; 
+        			var assigned_order_item_id = '';
+        			if(res["assigned_order_items"]!= undefined && res["assigned_order_items"]!=''){
+        				assigned_order_items = JSON.parse(JSON.stringify(res["assigned_order_items"]));
+        				$.each(assigned_order_items,function(key,value){
+        					if(value[parse_data.order_items_id] != undefined){
+        						assigned_order_item_id = value[parse_data.order_items_id];
+        					}
+        				});
+        			}
+        			// console.log(assigned_order_item_id);
+        			
         			var set_menu_items = parse_data.set_menu_items;
         			var set_instance_items = "";
         			if(set_menu_items!=null){
@@ -165,7 +178,7 @@ $(document).on('turbolinks:load', function() {
         			}
 
         			if (oqs_id > 0){
-        				var order_item_row = "<tr id='edit_"+assigned_item_id+"' class='order-item-edit'>" +
+        				var order_item_row = "<tr id='edit_"+assigned_order_item_id+"' class='order-item-edit'>" +
 							                "<td class='order-items' style='width:80%; text-align:left'>" + parse_data.item_name + set_instance_items + "</td>" +
 							                "<td class='order-qty' style='width:20%; text-align:right'>" + parse_data.qty + "</td>" +
               						 	 "</tr>";
diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb
index 371425ca..ad430e49 100755
--- a/app/controllers/oqs/home_controller.rb
+++ b/app/controllers/oqs/home_controller.rb
@@ -60,6 +60,7 @@ class Oqs::HomeController < BaseOqsController
   # Get Order items
   def get_order_items
     items = []
+    assigned_items = []
     order_no = params[:order_no]
     status = params[:status]
     # dining = DiningFacility.find_by_name(table_name);
@@ -90,6 +91,11 @@ class Oqs::HomeController < BaseOqsController
 
     if !items.empty?
       items.each do |item|
+        assigned_order_items = AssignedOrderItem.find_by_item_code_and_instance_code_and_order_id(item.item_code,item.item_instance_code,item.order_id)
+        if !assigned_order_items.nil?
+          assigned_items.push({item.order_items_id => assigned_order_items.assigned_order_item_id})
+        end
+
         if !item.set_menu_items.nil?
           instance_item_sets = JSON.parse(item.set_menu_items)
           arr_instance_item_sets = Array.new
@@ -101,7 +107,7 @@ class Oqs::HomeController < BaseOqsController
         end
       end
     end
-    render :json => items.to_json
+    render :json => {'items' => items, 'assigned_order_items' => assigned_items }
   end
 
   def get_items_by_oqs