diff --git a/src/main/java/com/ffii/fpsms/modules/jobOrder/entity/JobOrderRepository.kt b/src/main/java/com/ffii/fpsms/modules/jobOrder/entity/JobOrderRepository.kt
index dd9f89a..8c78b73 100644
--- a/src/main/java/com/ffii/fpsms/modules/jobOrder/entity/JobOrderRepository.kt
+++ b/src/main/java/com/ffii/fpsms/modules/jobOrder/entity/JobOrderRepository.kt
@@ -46,6 +46,7 @@ interface JobOrderRepository : AbstractRepository<JobOrder, Long> {
                 b.code as itemCode,
                 b.name,
                 jo.reqQty,
+                jo.bomId,
                 b.outputQtyUom as unit,
                 uc2.udfudesc as uom,
                 COALESCE(uc2.udfShortDesc, uc2.udfudesc) as shortUom,
diff --git a/src/main/java/com/ffii/fpsms/modules/jobOrder/entity/projections/JobOrderInfo.kt b/src/main/java/com/ffii/fpsms/modules/jobOrder/entity/projections/JobOrderInfo.kt
index 5f67a5f..4e7a77c 100644
--- a/src/main/java/com/ffii/fpsms/modules/jobOrder/entity/projections/JobOrderInfo.kt
+++ b/src/main/java/com/ffii/fpsms/modules/jobOrder/entity/projections/JobOrderInfo.kt
@@ -76,6 +76,7 @@ interface JobOrderDetailWithJsonString {
     val code: String?;
     val itemCode: String?;
     val name: String?;
+    val bomId: Long?;
     val itemId: Long?;
     val reqQty: BigDecimal?;
     val uom: String?;
@@ -115,6 +116,7 @@ data class JobOrderDetail(
     val code: String?,
     val itemCode: String?,
     val name: String?,
+    val bomId: Long?,
     val reqQty: BigDecimal?,
     val uom: String?,
     val shortUom: String?,
diff --git a/src/main/java/com/ffii/fpsms/modules/jobOrder/service/JobOrderService.kt b/src/main/java/com/ffii/fpsms/modules/jobOrder/service/JobOrderService.kt
index 2c70071..60f90de 100644
--- a/src/main/java/com/ffii/fpsms/modules/jobOrder/service/JobOrderService.kt
+++ b/src/main/java/com/ffii/fpsms/modules/jobOrder/service/JobOrderService.kt
@@ -334,6 +334,7 @@ open class JobOrderService(
             name = sqlResult.name,
             reqQty = sqlResult.reqQty,
             uom = sqlResult.uom,
+            bomId = sqlResult.bomId,
             pickLines = jsonResult,
             status = sqlResult.status,
             shortUom = sqlResult.shortUom
@@ -352,6 +353,7 @@ open class JobOrderService(
             name = sqlResult.name,
             reqQty = sqlResult.reqQty,
             uom = sqlResult.uom,
+            bomId = sqlResult.bomId,
             pickLines = jsonResult,
             status = sqlResult.status,
             shortUom = sqlResult.shortUom
@@ -371,6 +373,7 @@ open class JobOrderService(
             code = sqlResult.code,
             itemCode = sqlResult.itemCode,
             name = sqlResult.name,
+            bomId = sqlResult.bomId,
             reqQty = sqlResult.reqQty,
             uom = sqlResult.uom,
             pickLines = jsonResult,
@@ -390,6 +393,7 @@ open class JobOrderService(
             code = sqlResult.code,
             itemCode = sqlResult.itemCode,
             name = sqlResult.name,
+            bomId = sqlResult.bomId,
             reqQty = sqlResult.reqQty,
             uom = sqlResult.uom,
             pickLines = jsonResult,