From c91029182268e014f750e16b7d3385bcdc466710 Mon Sep 17 00:00:00 2001 From: "cyril.tsui" Date: Tue, 24 Jun 2025 16:56:12 +0800 Subject: [PATCH] use pathvariable for release pick order page --- .../fpsms/modules/pickOrder/service/PickOrderService.kt | 6 +++--- .../ffii/fpsms/modules/pickOrder/web/PickOrderController.kt | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) 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 cf42365..24e928b 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 @@ -240,9 +240,9 @@ open class PickOrderService( return response } - open fun releaseConsoPickOrderInfo(request: ReleaseConsoPickOrderRequest): ReleasePickOrderInfoResponse { + open fun releaseConsoPickOrderInfo(consoCode: String): ReleasePickOrderInfoResponse { val zero = BigDecimal.ZERO - val pos = pickOrderRepository.findAllByConsoCodeAndStatus(request.consoCode, PickOrderStatus.CONSOLIDATED) + val pos = pickOrderRepository.findAllByConsoCodeAndStatus(consoCode, PickOrderStatus.CONSOLIDATED) val requiredItems = pos .flatMap { it.pickOrderLines } .groupBy { it.item?.id } @@ -268,7 +268,7 @@ open class PickOrderService( } return ReleasePickOrderInfoResponse( - consoCode = request.consoCode, + consoCode = consoCode, items = currentInventoryInfos, ) } diff --git a/src/main/java/com/ffii/fpsms/modules/pickOrder/web/PickOrderController.kt b/src/main/java/com/ffii/fpsms/modules/pickOrder/web/PickOrderController.kt index c54011b..fd5efd2 100644 --- a/src/main/java/com/ffii/fpsms/modules/pickOrder/web/PickOrderController.kt +++ b/src/main/java/com/ffii/fpsms/modules/pickOrder/web/PickOrderController.kt @@ -53,9 +53,9 @@ class PickOrderController( return pickOrderService.consoPickOrderDetail(consoCode); } - @GetMapping("/releaseConso") - fun releaseConsoPickOrderInfo(@Valid @RequestParam request: ReleaseConsoPickOrderRequest): ReleasePickOrderInfoResponse { - return pickOrderService.releaseConsoPickOrderInfo(request); + @GetMapping("/releaseConso/{consoCode}") + fun releaseConsoPickOrderInfo(@PathVariable consoCode: String): ReleasePickOrderInfoResponse { + return pickOrderService.releaseConsoPickOrderInfo(consoCode); } @PostMapping("/releaseConso")