cyril.tsui 7 месяцев назад
Родитель
Сommit
15ee7fe18e
1 измененных файлов: 7 добавлений и 5 удалений
  1. +7
    -5
      src/main/java/com/ffii/fpsms/modules/pickOrder/service/PickOrderService.kt

+ 7
- 5
src/main/java/com/ffii/fpsms/modules/pickOrder/service/PickOrderService.kt Просмотреть файл

@@ -3,6 +3,7 @@ package com.ffii.fpsms.modules.pickOrder.service
import com.ffii.core.response.RecordsRes import com.ffii.core.response.RecordsRes
import com.ffii.fpsms.modules.pickOrder.entity.PickOrderRepository import com.ffii.fpsms.modules.pickOrder.entity.PickOrderRepository
import com.ffii.fpsms.modules.pickOrder.entity.projection.PickOrderInfo import com.ffii.fpsms.modules.pickOrder.entity.projection.PickOrderInfo
import com.ffii.fpsms.modules.pickOrder.web.models.ConsoPickOrderRequest
import com.ffii.fpsms.modules.pickOrder.web.models.SearchPickOrderRequest import com.ffii.fpsms.modules.pickOrder.web.models.SearchPickOrderRequest
import org.springframework.data.domain.PageRequest import org.springframework.data.domain.PageRequest
import org.springframework.stereotype.Service import org.springframework.stereotype.Service
@@ -28,7 +29,7 @@ open class PickOrderService(
} }


open fun allPickOrdersByPage(request: SearchPickOrderRequest): RecordsRes<PickOrderInfo> { open fun allPickOrdersByPage(request: SearchPickOrderRequest): RecordsRes<PickOrderInfo> {
val pageable = PageRequest.of(request.pageNum ?: 1, request.pageSize ?: 10);
val pageable = PageRequest.of(request.pageNum ?: 0, request.pageSize ?: 10);


val response = pickOrderRepository.findPickOrderInfoByConditionsAndPageable( val response = pickOrderRepository.findPickOrderInfoByConditionsAndPageable(
code = request.code ?: "all", code = request.code ?: "all",
@@ -56,7 +57,6 @@ open class PickOrderService(
val suffix = String.format(suffixFormat, 1) val suffix = String.format(suffixFormat, 1)


val latestConsoCode = pickOrderRepository.findLatestConsoCodeByPrefix("${prefix}-${midfix}") val latestConsoCode = pickOrderRepository.findLatestConsoCodeByPrefix("${prefix}-${midfix}")

if (latestConsoCode != null) { if (latestConsoCode != null) {
val splitLatestConsoCode = latestConsoCode.split("-") val splitLatestConsoCode = latestConsoCode.split("-")
if (splitLatestConsoCode.size > 2) { if (splitLatestConsoCode.size > 2) {
@@ -68,7 +68,9 @@ open class PickOrderService(
return listOf<String>(prefix, midfix, suffix).joinToString("-") return listOf<String>(prefix, midfix, suffix).joinToString("-")
} }


open fun consoPickOrders() {

}
// open fun consoPickOrders(request: ConsoPickOrderRequest) {
// val assignConsoCode = assignConsoCode()
// val pickOrders = pickOrderRepository.findAllByIdIn(request.ids)
// pickOrders.
// }
} }

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