diff --git a/src/main/java/com/ffii/fpsms/modules/master/service/ItemsService.kt b/src/main/java/com/ffii/fpsms/modules/master/service/ItemsService.kt index 1de1c80..f5d0dc4 100644 --- a/src/main/java/com/ffii/fpsms/modules/master/service/ItemsService.kt +++ b/src/main/java/com/ffii/fpsms/modules/master/service/ItemsService.kt @@ -471,9 +471,14 @@ open class ItemsService( isActive = check != null ) // Create combined item } + // Fetch qcType from items_qc_category_mapping table + val qcCategoryMapping = itemsQcCategoryMappingRepository.findFirstByItemId(id) + val qcType = qcCategoryMapping?.type + val response = ItemWithQcResponse( item = item, - qcChecks = qc + qcChecks = qc, + qcType = qcType ) // TODO: Return with QC items return response diff --git a/src/main/java/com/ffii/fpsms/modules/master/web/models/ItemWithQcResponse.kt b/src/main/java/com/ffii/fpsms/modules/master/web/models/ItemWithQcResponse.kt index de05dfc..9921053 100644 --- a/src/main/java/com/ffii/fpsms/modules/master/web/models/ItemWithQcResponse.kt +++ b/src/main/java/com/ffii/fpsms/modules/master/web/models/ItemWithQcResponse.kt @@ -15,5 +15,6 @@ data class ItemQc( ) data class ItemWithQcResponse( val item: Items, - val qcChecks: List + val qcChecks: List, + val qcType: String? = null )