From fd3a0f00fac3c997b21632b9e16b044fd94e3980 Mon Sep 17 00:00:00 2001 From: "CANCERYS\\kw093" Date: Sat, 4 Jul 2026 21:15:54 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A3=9C=E8=B2=A8=20search=20fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliveryOrder/service/DoReplenishmentService.kt | 9 ++++----- .../deliveryOrder/web/models/DoReplenishmentModels.kt | 1 + 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DoReplenishmentService.kt b/src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DoReplenishmentService.kt index 6085c70..81d0010 100644 --- a/src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DoReplenishmentService.kt +++ b/src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DoReplenishmentService.kt @@ -521,12 +521,10 @@ open class DoReplenishmentService( } val dopoIds = entities.mapNotNull { it.deliveryOrderPickOrderId }.distinct() - val targetDoRequiredDateByDopoId = if (dopoIds.isEmpty()) { + val dopoById = if (dopoIds.isEmpty()) { emptyMap() } else { - deliveryOrderPickOrderRepository.findAllById(dopoIds).associate { dopo -> - dopo.id!! to dopo.requiredDeliveryDate - } + deliveryOrderPickOrderRepository.findAllById(dopoIds).associateBy { it.id!! } } val sourceKeys = entities.map { it.sourceDoId!! to it.itemId!! }.distinct() @@ -572,9 +570,10 @@ open class DoReplenishmentService( truckLaneCode = row.truckLaneCode, targetDoId = row.targetDoId, targetDoCode = row.targetDoCode, - targetDoEstimatedArrivalDate = row.deliveryOrderPickOrderId?.let { targetDoRequiredDateByDopoId[it] }, + targetDoEstimatedArrivalDate = row.deliveryOrderPickOrderId?.let { dopoById[it]?.requiredDeliveryDate }, pickOrderLineId = row.pickOrderLineId, deliveryOrderPickOrderId = row.deliveryOrderPickOrderId, + relateTicketNo = row.deliveryOrderPickOrderId?.let { dopoById[it]?.ticketNo }, status = row.status, reason = row.reason, created = row.created, diff --git a/src/main/java/com/ffii/fpsms/modules/deliveryOrder/web/models/DoReplenishmentModels.kt b/src/main/java/com/ffii/fpsms/modules/deliveryOrder/web/models/DoReplenishmentModels.kt index 6a67a09..ae8d4c6 100644 --- a/src/main/java/com/ffii/fpsms/modules/deliveryOrder/web/models/DoReplenishmentModels.kt +++ b/src/main/java/com/ffii/fpsms/modules/deliveryOrder/web/models/DoReplenishmentModels.kt @@ -54,6 +54,7 @@ data class DoReplenishmentResponse( val targetDoEstimatedArrivalDate: LocalDate?, val pickOrderLineId: Long?, val deliveryOrderPickOrderId: Long?, + val relateTicketNo: String?, val status: String, val reason: String?, @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss")