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 c6b30ea..6c2ca47 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
@@ -41,7 +41,7 @@ interface JobOrderRepository : AbstractRepository<JobOrder, Long> {
             select
                 jo.id,
                 jo.code,
-                i.code as itemCode,
+                bi.code as itemCode,
                 b.name,
                 jo.reqQty,
                 -- b.outputQtyUom,
@@ -63,13 +63,14 @@ interface JobOrderRepository : AbstractRepository<JobOrder, Long> {
             from job_order jo
             left join bom b on b.id = jo.bomId
             left join item_uom iu on b.itemId = iu.itemId and iu.salesUnit = true
+            left join items bi on bi.id = b.itemId
             left join uom_conversion uc2 on uc2.id = iu.uomId
             left join job_order_bom_material jobm on jo.id = jobm.jobOrderId
             left join items i on i.id = jobm.itemId
             left join uom_conversion uc on uc.id = jobm.uomId
             left join picked_lot_no pln on pln.itemId = jobm.itemId and pln.joId = jo.id
             where jo.id = :id
-            group by jo.id, uc2.udfudesc, uc2.udfShortDesc, i.code
+            group by jo.id, uc2.udfudesc, uc2.udfShortDesc
             limit 1
         """
     )