|
|
|
@@ -143,6 +143,22 @@ open class DeliveryOrderService( |
|
|
|
suppliers2F: List<String>, |
|
|
|
suppliers4F: List<String>, |
|
|
|
): 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( |
|
|
|
code: String?, |
|
|
|
shopName: String?, |
|
|
|
@@ -979,15 +995,7 @@ open class DeliveryOrderService( |
|
|
|
} |
|
|
|
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( |
|
|
|
doId = deliveryOrder.id, |
|
|
|
type = PickOrderType.DELIVERY_ORDER, |
|
|
|
@@ -2112,15 +2120,7 @@ open class DeliveryOrderService( |
|
|
|
deliveryOrderRepository.save(deliveryOrder) |
|
|
|
|
|
|
|
// 创建 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( |
|
|
|
doId = deliveryOrder.id, |
|
|
|
type = PickOrderType.DELIVERY_ORDER, |
|
|
|
@@ -2343,15 +2343,7 @@ val inventoryLotLine = illId?.let { inventoryLotLineMap[it] } |
|
|
|
deliveryOrderRepository.save(deliveryOrder) |
|
|
|
|
|
|
|
// 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( |
|
|
|
doId = deliveryOrder.id, |
|
|
|
type = PickOrderType.DELIVERY_ORDER, |
|
|
|
|