CANCERYS\kw093 5 дней назад
Родитель
Сommit
44646254f6
1 измененных файлов: 19 добавлений и 27 удалений
  1. +19
    -27
      src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DeliveryOrderService.kt

+ 19
- 27
src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DeliveryOrderService.kt Просмотреть файл

@@ -143,6 +143,22 @@ open class DeliveryOrderService(
suppliers2F: List<String>, suppliers2F: List<String>,
suppliers4F: List<String>, suppliers4F: List<String>,
): String = doFloorSupplierSettingsService.preferredStoreFloorForSupplier(supplierCode, suppliers2F, suppliers4F) ): String = doFloorSupplierSettingsService.preferredStoreFloorForSupplier(supplierCode, suppliers2F, suppliers4F)

private fun mapDeliveryOrderLinesForPickOrderRelease(
deliveryOrder: DeliveryOrder,
): List<SavePickOrderLineRequest> {
return deliveryOrder.deliveryOrderLines
.filter { it.deleted != true }
.filter { it.item?.isFee != true }
.map {
SavePickOrderLineRequest(
itemId = it.item?.id,
qty = it.qty ?: BigDecimal.ZERO,
uomId = it.uom?.id,
)
}
}

open fun searchDoLiteByPage( open fun searchDoLiteByPage(
code: String?, code: String?,
shopName: String?, shopName: String?,
@@ -979,15 +995,7 @@ open class DeliveryOrderService(
} }
deliveryOrderRepository.save(deliveryOrder) deliveryOrderRepository.save(deliveryOrder)


val pols = deliveryOrder.deliveryOrderLines
.filter { it.deleted != true } // 只跳过 deleted=true(deleted 为空时也当作未删)
.map {
SavePickOrderLineRequest(
itemId = it.item?.id,
qty = it.qty ?: BigDecimal.ZERO,
uomId = it.uom?.id,
)
}
val pols = mapDeliveryOrderLinesForPickOrderRelease(deliveryOrder)
val po = SavePickOrderRequest( val po = SavePickOrderRequest(
doId = deliveryOrder.id, doId = deliveryOrder.id,
type = PickOrderType.DELIVERY_ORDER, type = PickOrderType.DELIVERY_ORDER,
@@ -2112,15 +2120,7 @@ open class DeliveryOrderService(
deliveryOrderRepository.save(deliveryOrder) deliveryOrderRepository.save(deliveryOrder)


// 创建 pick order // 创建 pick order
val pols = deliveryOrder.deliveryOrderLines
.filter { it.deleted != true } // 只跳过 deleted=true(deleted 为空时也当作未删)
.map {
SavePickOrderLineRequest(
itemId = it.item?.id,
qty = it.qty ?: BigDecimal.ZERO,
uomId = it.uom?.id,
)
}
val pols = mapDeliveryOrderLinesForPickOrderRelease(deliveryOrder)
val po = SavePickOrderRequest( val po = SavePickOrderRequest(
doId = deliveryOrder.id, doId = deliveryOrder.id,
type = PickOrderType.DELIVERY_ORDER, type = PickOrderType.DELIVERY_ORDER,
@@ -2343,15 +2343,7 @@ val inventoryLotLine = illId?.let { inventoryLotLineMap[it] }
deliveryOrderRepository.save(deliveryOrder) deliveryOrderRepository.save(deliveryOrder)


// Create pick order (same as normal release) // Create pick order (same as normal release)
val pols = deliveryOrder.deliveryOrderLines
.filter { it.deleted != true }
.map {
SavePickOrderLineRequest(
itemId = it.item?.id,
qty = it.qty ?: BigDecimal.ZERO,
uomId = it.uom?.id,
)
}
val pols = mapDeliveryOrderLinesForPickOrderRelease(deliveryOrder)
val po = SavePickOrderRequest( val po = SavePickOrderRequest(
doId = deliveryOrder.id, doId = deliveryOrder.id,
type = PickOrderType.DELIVERY_ORDER, type = PickOrderType.DELIVERY_ORDER,


Загрузка…
Отмена
Сохранить