diff --git a/src/api/ADempiere/field/locator.js b/src/api/ADempiere/field/locator.js
index c8ce7c9e..11e8e8d2 100644
--- a/src/api/ADempiere/field/locator.js
+++ b/src/api/ADempiere/field/locator.js
@@ -1,12 +1,31 @@
+// API used for get information of locator from server API,
+// please don't change it if is not related to locator field
 const tableName = 'M_Locator'
 
-export function requestLocatorList({
+// Get Locator list based on warehouse ID
+export function getLocatorList({
   warehouseId
 }) {
   const { requestListEntities } = require('@/api/ADempiere/persistence.js')
-
-  return requestListEntities({
-    tableName,
-    whereClause: `M_Warehouse_ID = ${warehouseId}`
+  return new Promise(resolve => {
+    requestListEntities({
+      tableName,
+      whereClause: `M_Warehouse_ID = ${warehouseId}`
+    }).then(locatorData => {
+      var locatorList = []
+      if (locatorData) {
+        locatorData.recordsList.map(record => {
+          locatorList.push({
+            id: record.id,
+            value: record.attributes.Value,
+            warehouseId: record.attributes.M_Warehouse_ID,
+            rack: record.attributes.X,
+            column: record.attributes.Y,
+            level: record.attributes.Z
+          })
+        })
+      }
+      resolve(locatorList)
+    })
   })
 }
diff --git a/src/components/ADempiere/Field/FieldLocator.vue b/src/components/ADempiere/Field/FieldLocator.vue
index 67e18757..26000bb3 100644
--- a/src/components/ADempiere/Field/FieldLocator.vue
+++ b/src/components/ADempiere/Field/FieldLocator.vue
@@ -18,7 +18,7 @@
 
 <script>
 import fieldMixin from '@/components/ADempiere/Field/mixin/mixinField.js'
-import { requestLocatorList } from '@/api/ADempiere/field/locator.js'
+import { getLocatorList } from '@/api/ADempiere/field/locator.js'
 
 export default {
   name: 'FieldLocation',
@@ -67,34 +67,20 @@ export default {
       this.value = value
     },
     searchLocatorByWarehouse(node, resolve) {
-      requestLocatorList({
+      getLocatorList({
         warehouseId: node.value
       })
-        .then(responseData => {
-          const data = responseData.recordsList[this.level]
-          const locatorList = [
-            {
-              value: data.id,
-              label: data.attributes.Value,
-              warehouse: data.id,
+        .then(locators => {
+          const locatorList = []
+          locators.map(locator => {
+            locatorList.push({
+              value: locator.id,
+              label: locator.value,
+              warehouse: locator.warehouseId,
               leaf: true
-            }, {
-              value: data.id,
-              label: data.attributes.X,
-              warehouse: data.id,
-              leaf: true
-            }, {
-              value: data.id,
-              label: data.attributes.Y,
-              warehouse: data.id,
-              leaf: true
-            }, {
-              value: data.id,
-              label: data.attributes.Z,
-              warehouse: data.id,
-              leaf: true
-            }
-          ]
+            })
+          })
+          //  Resolve this
           resolve(locatorList)
         })
         .catch(error => {