diff --git a/src/main/java/com/ffii/fpsms/m18/web/M18TestController.kt b/src/main/java/com/ffii/fpsms/m18/web/M18TestController.kt
index cad08c9..a563af1 100644
--- a/src/main/java/com/ffii/fpsms/m18/web/M18TestController.kt
+++ b/src/main/java/com/ffii/fpsms/m18/web/M18TestController.kt
@@ -136,7 +136,7 @@ class M18TestController (
         m18PurchaseOrderService.savePurchaseOrders(request)
     }
 
-    // --------------------------------------------- Purchase Order --------------------------------------------- ///
+    // --------------------------------------------- Delivery Order --------------------------------------------- ///
     @PostMapping("/do")
     fun m18DO(@Valid @RequestBody request: M18TestDoRequest) {
         logger.info("Access token: ${m18Config.ACCESS_TOKEN}")
diff --git a/src/main/java/com/ffii/fpsms/modules/master/entity/Bom.kt b/src/main/java/com/ffii/fpsms/modules/master/entity/Bom.kt
index 69a9898..71e41a3 100644
--- a/src/main/java/com/ffii/fpsms/modules/master/entity/Bom.kt
+++ b/src/main/java/com/ffii/fpsms/modules/master/entity/Bom.kt
@@ -21,7 +21,7 @@ open class Bom : BaseEntity<Long>() {
     @Column
     open var isDense: Int? = null
 
-    @ManyToOne
+    @OneToOne
     @JoinColumn(name = "itemId")
     open var item: Items? = null
 
diff --git a/src/main/java/com/ffii/fpsms/modules/master/entity/BomMaterialRepository.kt b/src/main/java/com/ffii/fpsms/modules/master/entity/BomMaterialRepository.kt
index 15bffcc..b6d2d8a 100644
--- a/src/main/java/com/ffii/fpsms/modules/master/entity/BomMaterialRepository.kt
+++ b/src/main/java/com/ffii/fpsms/modules/master/entity/BomMaterialRepository.kt
@@ -9,4 +9,6 @@ interface BomMaterialRepository : AbstractRepository<BomMaterial, Long> {
     fun findByIdAndDeletedIsFalse(id: Serializable): BomMaterial?
 
     fun findByM18IdAndDeletedIsFalse(m18Id: Long): BomMaterial?
+
+    fun findAllByBomItemIdAndDeletedIsFalse(itemId: Long): List<BomMaterial>
 }
\ No newline at end of file
diff --git a/src/main/java/com/ffii/fpsms/modules/master/entity/Items.kt b/src/main/java/com/ffii/fpsms/modules/master/entity/Items.kt
index 6a07e91..3213d25 100644
--- a/src/main/java/com/ffii/fpsms/modules/master/entity/Items.kt
+++ b/src/main/java/com/ffii/fpsms/modules/master/entity/Items.kt
@@ -2,6 +2,7 @@ package com.ffii.fpsms.modules.master.entity
 
 import com.fasterxml.jackson.annotation.JsonManagedReference
 import com.ffii.core.entity.BaseEntity
+import com.ffii.fpsms.modules.stock.entity.Inventory
 import jakarta.persistence.*
 import jakarta.validation.constraints.NotNull
 import java.time.LocalDateTime
@@ -45,4 +46,12 @@ open class Items : BaseEntity<Long>() {
     @JsonManagedReference
     @OneToMany(mappedBy = "item", cascade = [CascadeType.ALL], orphanRemoval = true)
     open var itemUoms: MutableList<ItemUom> = mutableListOf()
+
+    @JsonManagedReference
+    @OneToMany(mappedBy = "item", cascade = [CascadeType.ALL], orphanRemoval = true)
+    open var inventories: MutableList<Inventory> = mutableListOf()
+
+    @JsonManagedReference
+    @OneToOne(mappedBy = "item", cascade = [CascadeType.ALL], orphanRemoval = true)
+    open var bom: Bom = Bom()
 }
\ No newline at end of file