diff --git a/src/main/java/com/ffii/fpsms/modules/pickOrder/service/PickOrderService.kt b/src/main/java/com/ffii/fpsms/modules/pickOrder/service/PickOrderService.kt index 17fd78a..d3dadf4 100644 --- a/src/main/java/com/ffii/fpsms/modules/pickOrder/service/PickOrderService.kt +++ b/src/main/java/com/ffii/fpsms/modules/pickOrder/service/PickOrderService.kt @@ -1,6 +1,7 @@ package com.ffii.fpsms.modules.pickOrder.service import com.ffii.core.response.RecordsRes +import com.ffii.fpsms.modules.master.web.models.MessageResponse import com.ffii.fpsms.modules.pickOrder.entity.PickOrder import com.ffii.fpsms.modules.pickOrder.entity.PickOrderRepository import com.ffii.fpsms.modules.pickOrder.entity.projection.PickOrderInfo @@ -112,7 +113,7 @@ open class PickOrderService( // pick orders val pos = pickOrderRepository.findAllByConsoCode(consoCode) - + // Suggestions for Pick Order val suggestions = suggestedPickLotService.suggestionForPickOrders(SuggestedPickLotForPoRequest(pickOrders = pos)) val suggestedList = suggestions.suggestedList @@ -147,6 +148,7 @@ open class PickOrderService( // Mapping: InventoryLotLine -> InventoryLotLineInConso val finalInventoryLotLine = InventoryLotLineInConso( id = inventoryLotLine?.id, + lotNo = inventoryLotLine?.inventoryLot?.lotNo, inQty = inventoryLotLine?.inQty, outQty = inventoryLotLine?.outQty, holdQty = inventoryLotLine?.holdQty, @@ -233,7 +235,11 @@ open class PickOrderService( return response } - open fun releaseConsoPickOrder(request: ReleaseConsoPickOrderRequest) { - val pos = pickOrderRepository.findAllByConsoCode(request.consoCode) - } +// open fun releaseConsoPickOrder(request: ReleaseConsoPickOrderRequest): MessageResponse { +// val pos = pickOrderRepository.findAllByConsoCode(request.consoCode) +// val suggestedPickLots = suggestedPickLotService.convertRequestsToEntities(request.suggestedPickLots) +// +// suggestedPickLotService.saveAll(suggestedPickLots) +// // TODO: Add Response +// } } \ No newline at end of file diff --git a/src/main/java/com/ffii/fpsms/modules/pickOrder/web/models/ConsoPickOrderResponse.kt b/src/main/java/com/ffii/fpsms/modules/pickOrder/web/models/ConsoPickOrderResponse.kt index 01607f6..0e3d44e 100644 --- a/src/main/java/com/ffii/fpsms/modules/pickOrder/web/models/ConsoPickOrderResponse.kt +++ b/src/main/java/com/ffii/fpsms/modules/pickOrder/web/models/ConsoPickOrderResponse.kt @@ -51,6 +51,7 @@ data class ActualPickLotInConso( data class InventoryLotLineInConso( val id: Long?, + val lotNo: String?, val inQty: BigDecimal?, val outQty: BigDecimal?, val holdQty: BigDecimal?,