Tommy\2Fi-Staff 2 недель назад
Родитель
Сommit
701fd179d7
2 измененных файлов: 8 добавлений и 2 удалений
  1. +6
    -1
      src/main/java/com/ffii/fpsms/modules/master/service/ItemsService.kt
  2. +2
    -1
      src/main/java/com/ffii/fpsms/modules/master/web/models/ItemWithQcResponse.kt

+ 6
- 1
src/main/java/com/ffii/fpsms/modules/master/service/ItemsService.kt Просмотреть файл

@@ -471,9 +471,14 @@ open class ItemsService(
isActive = check != null isActive = check != null
) // Create combined item ) // Create combined item
} }
// Fetch qcType from items_qc_category_mapping table
val qcCategoryMapping = itemsQcCategoryMappingRepository.findFirstByItemId(id)
val qcType = qcCategoryMapping?.type
val response = ItemWithQcResponse( val response = ItemWithQcResponse(
item = item, item = item,
qcChecks = qc
qcChecks = qc,
qcType = qcType
) )
// TODO: Return with QC items // TODO: Return with QC items
return response return response


+ 2
- 1
src/main/java/com/ffii/fpsms/modules/master/web/models/ItemWithQcResponse.kt Просмотреть файл

@@ -15,5 +15,6 @@ data class ItemQc(
) )
data class ItemWithQcResponse( data class ItemWithQcResponse(
val item: Items, val item: Items,
val qcChecks: List<ItemQc>
val qcChecks: List<ItemQc>,
val qcType: String? = null
) )

Загрузка…
Отмена
Сохранить