Przeglądaj źródła

do pdf fix

do detail fix
production
CANCERYS\kw093 4 godzin temu
rodzic
commit
789666aad8
2 zmienionych plików z 6 dodań i 4 usunięć
  1. +2
    -0
      src/main/java/com/ffii/fpsms/modules/deliveryOrder/entity/models/DeliveryOrderLineInfo.kt
  2. +4
    -4
      src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DeliveryOrderService.kt

+ 2
- 0
src/main/java/com/ffii/fpsms/modules/deliveryOrder/entity/models/DeliveryOrderLineInfo.kt Wyświetl plik

@@ -17,4 +17,6 @@ interface DeliveryOrderLineInfo {


@get:Value("#{target.item?.id}") @get:Value("#{target.item?.id}")
val itemId: Long? val itemId: Long?
@get:Value("#{target.deleted}")
val deleted: Boolean?
} }

+ 4
- 4
src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DeliveryOrderService.kt Wyświetl plik

@@ -603,11 +603,11 @@ open class DeliveryOrderService(
null null
} }


val itemIds = deliveryOrder.deliveryOrderLines.mapNotNull { it.item?.id }.distinct()
val itemIds = deliveryOrder.deliveryOrderLines.filter { it.deleted != true }.mapNotNull { it.item?.id }.distinct()
val stockQtyByItemId = itemIds.associateWith { itemId -> val stockQtyByItemId = itemIds.associateWith { itemId ->
computeAvailableStockQtyForItem(itemId) computeAvailableStockQtyForItem(itemId)
} }
val fallbackQtyByItemId = deliveryOrder.deliveryOrderLines.mapNotNull { line ->
val fallbackQtyByItemId = deliveryOrder.deliveryOrderLines.filter { it.deleted != true }.mapNotNull { line ->
val itemId = line.item?.id ?: return@mapNotNull null val itemId = line.item?.id ?: return@mapNotNull null
itemId to (line.qty ?: BigDecimal.ZERO) itemId to (line.qty ?: BigDecimal.ZERO)
}.toMap() }.toMap()
@@ -632,7 +632,7 @@ open class DeliveryOrderService(
isExtra = deliveryOrder.isExtra, isExtra = deliveryOrder.isExtra,
handlerName = handlerName, handlerName = handlerName,
truckLaneCode = truckLaneCode, truckLaneCode = truckLaneCode,
deliveryOrderLines = deliveryOrder.deliveryOrderLines.map { line ->
deliveryOrderLines = deliveryOrder.deliveryOrderLines.filter { it.deleted != true }.map { line ->
val itemId = line.item?.id val itemId = line.item?.id
val stockQty = itemId?.let { stockQtyByItemId[it] } ?: BigDecimal.ZERO val stockQty = itemId?.let { stockQtyByItemId[it] } ?: BigDecimal.ZERO
val requiredQty = line.qty ?: BigDecimal.ZERO val requiredQty = line.qty ?: BigDecimal.ZERO
@@ -1554,7 +1554,7 @@ open class DeliveryOrderService(


fun deliveryNoteExportLines(deliveryNoteInfo: List<DeliveryOrderInfo>): List<DeliveryNoteExportLine> = fun deliveryNoteExportLines(deliveryNoteInfo: List<DeliveryOrderInfo>): List<DeliveryNoteExportLine> =
deliveryNoteInfo.flatMap { info -> deliveryNoteInfo.flatMap { info ->
info.deliveryOrderLines.map { line -> DeliveryNoteExportLine(info.id, line) }
info.deliveryOrderLines.filter { it.deleted != true }.map { line -> DeliveryNoteExportLine(info.id, line) }
} }


fun resolvePickOrderLineIdForDeliveryNoteLine( fun resolvePickOrderLineIdForDeliveryNoteLine(


Ładowanie…
Anuluj
Zapisz