補貨 search fix

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,

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")