diff --git a/src/main/java/com/ffii/fpsms/modules/pickOrder/entity/PickOrderRepository.kt b/src/main/java/com/ffii/fpsms/modules/pickOrder/entity/PickOrderRepository.kt index 80f3634..e99b908 100644 --- a/src/main/java/com/ffii/fpsms/modules/pickOrder/entity/PickOrderRepository.kt +++ b/src/main/java/com/ffii/fpsms/modules/pickOrder/entity/PickOrderRepository.kt @@ -2,10 +2,50 @@ package com.ffii.fpsms.modules.pickOrder.entity import com.ffii.core.support.AbstractRepository import com.ffii.fpsms.modules.pickOrder.entity.projection.PickOrderInfo +import com.ffii.fpsms.modules.pickOrder.web.models.SearchPickOrderRequest +import org.springframework.data.domain.Page +import org.springframework.data.domain.Pageable import org.springframework.data.jpa.repository.Query +import org.springframework.data.repository.query.Param import org.springframework.stereotype.Repository +import java.io.Serializable +import java.time.LocalDateTime @Repository -interface PickOrderRepository: AbstractRepository { +interface PickOrderRepository : AbstractRepository { fun findPickOrderInfoByDeletedIsFalse(): List + + @Query( + """ + select po from PickOrder po + where (lower(:code) = 'all' or lower(po.code) like concat('%',lower(:code),'%')) + and (:targetDateFrom is null or po.targetDate >= :targetDateFrom) + and (:targetDateTo is null or po.targetDate <= :targetDateTo) + and (lower(:type) = 'all' or lower(po.type) like concat('%',lower(:type),'%')) + and (lower(:status) = 'all' or lower(po.status) like concat('%',lower(:status),'%')) + and (lower(:itemName) = 'all' or exists ( + select 1 from PickOrderLine pol + where pol.pickOrder = po + and (lower(:itemName) = 'all' or lower(pol.item.name) like concat('%',lower(:itemName),'%')) + ) + ) + and po.consoCode = null + and po.deleted = false + """ + ) + fun findPickOrderInfoByConditionsAndPageable( + code: String, + targetDateFrom: LocalDateTime?, + targetDateTo: LocalDateTime?, + type: String, + status: String, + itemName: String, + pageable: Pageable, + ): Page + + @Query(""" + select po.consoCode from PickOrder po where po.consoCode like :prefix% order by po.consoCode desc limit 1 + """) + fun findLatestConsoCodeByPrefix(prefix: String): String? + fun findAllByIdIn(id: List): List } \ No newline at end of file diff --git a/src/main/java/com/ffii/fpsms/modules/pickOrder/service/PickOrderService.kt b/src/main/java/com/ffii/fpsms/modules/pickOrder/service/PickOrderService.kt index 13f08b8..154d44b 100644 --- a/src/main/java/com/ffii/fpsms/modules/pickOrder/service/PickOrderService.kt +++ b/src/main/java/com/ffii/fpsms/modules/pickOrder/service/PickOrderService.kt @@ -1,19 +1,76 @@ package com.ffii.fpsms.modules.pickOrder.service +import com.ffii.core.response.RecordsRes import com.ffii.fpsms.modules.pickOrder.entity.PickOrderRepository 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 org.springframework.data.domain.PageRequest import org.springframework.stereotype.Service +import java.time.LocalDate +import java.time.LocalDateTime +import java.time.format.DateTimeFormatter @Service open class PickOrderService( val pickOrderRepository: PickOrderRepository, ) { + open fun LocalDateTimeParse(dateTime: String?, pattern: String? = "YYYY-MM-DD hh:mm:ss"): LocalDateTime? { + try { + val formatter = DateTimeFormatter.ofPattern(pattern) + return LocalDateTime.parse(dateTime, formatter) + } catch (e: Exception) { + return null + } + } + open fun allPickOrders(): List { return pickOrderRepository.findPickOrderInfoByDeletedIsFalse() } + open fun allPickOrdersByPage(request: SearchPickOrderRequest): RecordsRes { + val pageable = PageRequest.of(request.pageNum ?: 0, request.pageSize ?: 10); + + val response = pickOrderRepository.findPickOrderInfoByConditionsAndPageable( + code = request.code ?: "all", + targetDateFrom = LocalDateTimeParse(request.targetDateFrom), + targetDateTo = LocalDateTimeParse(request.targetDateTo), + type = request.type ?: "all", + status = request.status ?: "all", + itemName = request.itemName ?: "all", + pageable = pageable + ) + + val records = response.content + val total = response.totalElements + return RecordsRes(records, total.toInt()) + } + // Consolidating Pick Orders - open fun consoPickOrders() { + open fun assignConsoCode(): String { + val suffixFormat = "%03d" + val pattern = "YYYYMMDD" + val formatter = DateTimeFormatter.ofPattern(pattern) + + val prefix = "PICK" + val midfix = LocalDate.now().format(formatter) + val suffix = String.format(suffixFormat, 1) + val latestConsoCode = pickOrderRepository.findLatestConsoCodeByPrefix("${prefix}-${midfix}") + if (latestConsoCode != null) { + val splitLatestConsoCode = latestConsoCode.split("-") + if (splitLatestConsoCode.size > 2) { + val latestNo = splitLatestConsoCode[2].toInt() + return listOf(prefix, midfix, String.format(suffixFormat, latestNo + 1)).joinToString("-") + } + } + + return listOf(prefix, midfix, suffix).joinToString("-") } + +// open fun consoPickOrders(request: ConsoPickOrderRequest) { +// val assignConsoCode = assignConsoCode() +// val pickOrders = pickOrderRepository.findAllByIdIn(request.ids) +// pickOrders. +// } } \ No newline at end of file diff --git a/src/main/java/com/ffii/fpsms/modules/pickOrder/web/PickOrderController.kt b/src/main/java/com/ffii/fpsms/modules/pickOrder/web/PickOrderController.kt index b12fd9d..1b83860 100644 --- a/src/main/java/com/ffii/fpsms/modules/pickOrder/web/PickOrderController.kt +++ b/src/main/java/com/ffii/fpsms/modules/pickOrder/web/PickOrderController.kt @@ -1,18 +1,37 @@ package com.ffii.fpsms.modules.pickOrder.web +import com.ffii.core.response.RecordsRes +import com.ffii.fpsms.modules.pickOrder.entity.PickOrderRepository import com.ffii.fpsms.modules.pickOrder.entity.projection.PickOrderInfo import com.ffii.fpsms.modules.pickOrder.service.PickOrderService +import com.ffii.fpsms.modules.pickOrder.web.models.SearchPickOrderRequest +import jakarta.validation.Valid +import org.springframework.data.domain.Page +import org.springframework.data.domain.PageRequest +import org.springframework.data.domain.Pageable import org.springframework.web.bind.annotation.GetMapping +import org.springframework.web.bind.annotation.ModelAttribute +import org.springframework.web.bind.annotation.PostMapping import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.bind.annotation.RequestParam import org.springframework.web.bind.annotation.RestController +import java.time.DateTimeException +import java.time.LocalDateTime +import java.time.format.DateTimeFormatter @RestController @RequestMapping("/pickOrder") class PickOrderController( private val pickOrderService: PickOrderService, + private val pickOrderRepository: PickOrderRepository, ) { @GetMapping("/list") fun allPickOrders(): List { return pickOrderService.allPickOrders(); } + + @GetMapping("/getRecordByPage") + fun allPickOrdersByPage(@ModelAttribute request: SearchPickOrderRequest): RecordsRes { + return pickOrderService.allPickOrdersByPage(request); + } } \ No newline at end of file diff --git a/src/main/java/com/ffii/fpsms/modules/pickOrder/web/models/ConsoPickOrderRequest.kt b/src/main/java/com/ffii/fpsms/modules/pickOrder/web/models/ConsoPickOrderRequest.kt new file mode 100644 index 0000000..41d6a7c --- /dev/null +++ b/src/main/java/com/ffii/fpsms/modules/pickOrder/web/models/ConsoPickOrderRequest.kt @@ -0,0 +1,5 @@ +package com.ffii.fpsms.modules.pickOrder.web.models + +data class ConsoPickOrderRequest ( + val ids: List +) \ No newline at end of file diff --git a/src/main/java/com/ffii/fpsms/modules/pickOrder/web/models/SearchPickOrderRequest.kt b/src/main/java/com/ffii/fpsms/modules/pickOrder/web/models/SearchPickOrderRequest.kt new file mode 100644 index 0000000..98fe005 --- /dev/null +++ b/src/main/java/com/ffii/fpsms/modules/pickOrder/web/models/SearchPickOrderRequest.kt @@ -0,0 +1,14 @@ +package com.ffii.fpsms.modules.pickOrder.web.models + +import org.springframework.web.bind.annotation.RequestParam + +data class SearchPickOrderRequest ( + val code: String?, + val targetDateFrom: String?, + val targetDateTo: String?, + val type: String?, + val status: String?, + val itemName: String?, + val pageSize: Int?, + val pageNum: Int?, +) \ No newline at end of file diff --git a/src/main/java/com/ffii/fpsms/modules/purchaseOrder/entity/PurchaseOrderLineRepository.kt b/src/main/java/com/ffii/fpsms/modules/purchaseOrder/entity/PurchaseOrderLineRepository.kt index 3421b5d..4de0519 100644 --- a/src/main/java/com/ffii/fpsms/modules/purchaseOrder/entity/PurchaseOrderLineRepository.kt +++ b/src/main/java/com/ffii/fpsms/modules/purchaseOrder/entity/PurchaseOrderLineRepository.kt @@ -12,5 +12,6 @@ interface PurchaseOrderLineRepository : AbstractRepository fun findAllByPurchaseOrderIdAndDeletedIsFalse(purchaseOrderId: Long): List fun findAllByPurchaseOrderIdAndStatusNotAndDeletedIsFalse(purchaseOrderId: Long, status: PurchaseOrderLineStatus): List +// fun findAllByPurchaseOrderIdAndDeletedIsFalse(purchaseOrderId: Long): List // fun find } \ No newline at end of file diff --git a/src/main/java/com/ffii/fpsms/modules/purchaseOrder/entity/PurchaseOrderRepository.kt b/src/main/java/com/ffii/fpsms/modules/purchaseOrder/entity/PurchaseOrderRepository.kt index 4ba3434..db24189 100644 --- a/src/main/java/com/ffii/fpsms/modules/purchaseOrder/entity/PurchaseOrderRepository.kt +++ b/src/main/java/com/ffii/fpsms/modules/purchaseOrder/entity/PurchaseOrderRepository.kt @@ -1,19 +1,20 @@ package com.ffii.fpsms.modules.purchaseOrder.entity import com.ffii.core.support.AbstractRepository +import com.ffii.fpsms.modules.purchaseOrder.entity.projections.PurchaseOrderDataClass import com.ffii.fpsms.modules.purchaseOrder.entity.projections.PurchaseOrderInfo import org.springframework.data.domain.Page import org.springframework.stereotype.Repository import java.io.Serializable import java.util.Optional import org.springframework.data.domain.Pageable +import org.springframework.data.jpa.repository.Query +import org.springframework.data.repository.query.Param @Repository interface PurchaseOrderRepository : AbstractRepository { fun findTopByM18DataLogIdAndDeletedIsFalseOrderByModifiedDesc(m18datalogId: Serializable): PurchaseOrder? - fun findPurchaseOrderInfoByDeletedIsFalse(): List - fun findPurchaseOrderInfoByDeletedIsFalse(pageable: Pageable): Page fun findPurchaseOrderInfoByIdAndDeletedIsFalse(id: Long): PurchaseOrderInfo fun findByIdAndDeletedFalse(id: Long): Optional diff --git a/src/main/java/com/ffii/fpsms/modules/purchaseOrder/entity/projections/PurchaseOrderInfo.kt b/src/main/java/com/ffii/fpsms/modules/purchaseOrder/entity/projections/PurchaseOrderInfo.kt index afa2f7a..6f19647 100644 --- a/src/main/java/com/ffii/fpsms/modules/purchaseOrder/entity/projections/PurchaseOrderInfo.kt +++ b/src/main/java/com/ffii/fpsms/modules/purchaseOrder/entity/projections/PurchaseOrderInfo.kt @@ -14,7 +14,7 @@ interface PurchaseOrderInfo { val status: String @get:Value("#{target.supplier?.name}") val supplier: String? -// var escalated: Boolean? + var escalated: Boolean? } data class PurchaseOrderDataClass( diff --git a/src/main/java/com/ffii/fpsms/modules/purchaseOrder/service/PurchaseOrderService.kt b/src/main/java/com/ffii/fpsms/modules/purchaseOrder/service/PurchaseOrderService.kt index b3507ce..8ce04b3 100644 --- a/src/main/java/com/ffii/fpsms/modules/purchaseOrder/service/PurchaseOrderService.kt +++ b/src/main/java/com/ffii/fpsms/modules/purchaseOrder/service/PurchaseOrderService.kt @@ -30,6 +30,7 @@ import org.springframework.data.domain.Pageable import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional import java.io.IOException +import java.time.LocalDateTime import java.util.HashMap import java.util.Objects import kotlin.jvm.optionals.getOrDefault @@ -47,33 +48,69 @@ open class PurchaseOrderService( private val currencyService: CurrencyService, private val shopService: ShopService, ) : AbstractBaseEntityService(jdbcDao, purchaseOrderRepository) { - - open fun getPoList(request: PagingRequest): RecordsRes { - println(request) - val totalCount = purchaseOrderRepository.count().toInt() - val list: List = if (request.pageNum != null && request.pageSize != null) { - val pageable = PageRequest.of(request.pageNum!!, request.pageSize!!) - purchaseOrderRepository.findPurchaseOrderInfoByDeletedIsFalse(pageable).content - } else { - purchaseOrderRepository.findPurchaseOrderInfoByDeletedIsFalse() +// open fun getPurchaseOrderInfo(args: Map): List> { +// val sql = StringBuilder( +// "SELECT " + +// "po.* " + +// "FROM purchase_order po " + +// "WHERE po.deleted = FALSE" +// ); +// if (args.containsKey("name")){ +// sql.append(" AND i.name like :name "); +// } +// } + open fun getPoList(args: MutableMap): List { + val sql = StringBuilder( + " select " + + " po.*, " + + " s.name as supplier, " + + " CASE " + + " WHEN sil.purchaseOrderId IS NOT NULL THEN 1 " + + " ELSE 0 " + + " END AS escalated " + + " from purchase_order po " + + " left join shop s on s.id = po.supplierId " + + " left join ( " + + " select " + + " sil.purchaseOrderId " + + " from stock_in_line sil " + + " where sil.status like 'determine%' " + + " ) sil on sil.purchaseOrderId = po.id " + + " where po.deleted = false " + ) + if (args.containsKey("code")){ + sql.append(" AND po.code like :code "); + } + if (args.containsKey("status")){ + sql.append(" AND po.status = :status "); } + if (args.containsKey("escalated")) { + if (args["escalated"] == true) { + sql.append(" and sil.purchaseOrderId IS NOT NULL "); + } else { + sql.append(" and sil.purchaseOrderId IS NULL "); + } + } + val list = jdbcDao.queryForList(sql.toString(), args); + println(list) + val mappedList = list.map { - val escalated = stockInLineRepository.findAllStockInLineInfoByPurchaseOrderIdAndStatusStartsWithAndDeletedFalse( - purchaseOrderId = it.id, - status = "determine" - ) PurchaseOrderDataClass( - id = it.id, - code = it.code, - orderDate = it.orderDate, - estimatedArrivalDate = it.estimatedArrivalDate, - completeDate = it.completeDate, - status = it.status, - supplier = it.supplier, - escalated = escalated.isNotEmpty(), + id = (it["id"] as Int).toLong(), + code = it["code"] as String, + orderDate = it["orderDate"] as LocalDateTime?, + estimatedArrivalDate = it["estimatedArrivalDate"] as LocalDateTime?, + completeDate = it["completeDate"] as LocalDateTime?, + status = it["status"] as String, + supplier = it["supplier"] as String?, + escalated = it["escalated"] == 1L, ) } - return RecordsRes(mappedList, totalCount) +// println(value1) +// println(value1 == 1L) +// println(value2) + println(mappedList) + return mappedList } open fun allPurchaseOrder(): List { @@ -188,6 +225,13 @@ open class PurchaseOrderService( @Transactional open fun checkPolAndCompletePo(id: Long): MessageResponse { val unfinishedLines = polRepository.findAllByPurchaseOrderIdAndStatusNotAndDeletedIsFalse(purchaseOrderId = id, status = PurchaseOrderLineStatus.COMPLETED) +// val unfinishedLines = polRepository.findAllByPurchaseOrderIdAndDeletedIsFalse(purchaseOrderId = id) +// .filter { +// it.status != PurchaseOrderLineStatus.COMPLETED | +// it.status != PurchaseOrderLineStatus. +// } + println("unfinishedLines") + println(unfinishedLines) val po = purchaseOrderRepository.findById(id).orElseThrow() if (unfinishedLines.isEmpty()) { po.apply { diff --git a/src/main/java/com/ffii/fpsms/modules/purchaseOrder/web/PurchaseOrderController.kt b/src/main/java/com/ffii/fpsms/modules/purchaseOrder/web/PurchaseOrderController.kt index 1d63978..5f1f59d 100644 --- a/src/main/java/com/ffii/fpsms/modules/purchaseOrder/web/PurchaseOrderController.kt +++ b/src/main/java/com/ffii/fpsms/modules/purchaseOrder/web/PurchaseOrderController.kt @@ -3,6 +3,7 @@ package com.ffii.fpsms.modules.purchaseOrder.web import com.ffii.core.response.RecordsRes import com.ffii.core.support.JdbcDao import com.ffii.core.utils.CriteriaArgsBuilder +import com.ffii.core.utils.PagingUtils import com.ffii.fpsms.modules.master.entity.Items import com.ffii.fpsms.modules.master.service.ItemsService import com.ffii.fpsms.modules.master.web.models.MessageResponse @@ -24,16 +25,24 @@ class PurchaseOrderController( ) { @GetMapping("/list") fun getPoList( + request: HttpServletRequest // @RequestParam(required = false) pageNum: Int, // @RequestParam(required = false) pageSize: Int ): RecordsRes { -// println("request") -// println(pageSize) -// println(pageNum - 1) - // request pageNum starts from 1, but pagingRequest starts with 0 -// val pageRequest = PagingRequest(pageSize = pageSize, pageNum = pageNum - 1,) // not start from 0 - val pageRequest = PagingRequest(pageSize = null, pageNum = null) // not start from 0 - return purchaseOrderService.getPoList(pageRequest) + println("request") + println(request) + val criteriaArgs = CriteriaArgsBuilder.withRequest(request) + .addStringLike("code") + .addString("status") + .addBoolean("escalated") + .build() + println(criteriaArgs) + val pageSize = request.getParameter("pageSize")?.toIntOrNull() ?: 10 // Default to 10 if not provided + val pageNum = request.getParameter("pageNum")?.toIntOrNull() ?: 1 // Default to 1 if not provided + + val fullList = purchaseOrderService.getPoList(criteriaArgs) + val paginatedList = PagingUtils.getPaginatedList(fullList,pageSize, pageNum) + return RecordsRes(paginatedList, fullList.size) } @GetMapping("/testing") @@ -41,6 +50,7 @@ class PurchaseOrderController( val criteriaArgs = CriteriaArgsBuilder.withRequest(request) .addStringLike("code") .addStringLike("name") + .addBoolean("escalated") .build() println("criteriaArgs") println(criteriaArgs) diff --git a/src/main/java/com/ffii/fpsms/modules/stock/entity/StockInLineRepository.kt b/src/main/java/com/ffii/fpsms/modules/stock/entity/StockInLineRepository.kt index 8759bff..104e430 100644 --- a/src/main/java/com/ffii/fpsms/modules/stock/entity/StockInLineRepository.kt +++ b/src/main/java/com/ffii/fpsms/modules/stock/entity/StockInLineRepository.kt @@ -13,6 +13,7 @@ interface StockInLineRepository : AbstractRepository { fun findStockInLineInfoByIdAndDeletedFalse(id: Long): StockInLineInfo fun findStockInLineInfoByIdInAndDeletedFalse(id: List): List fun findStockInLineInfoByPurchaseOrderLineIdAndStatusNotAndDeletedFalse(purchaseOrderLineId: Long, status: String): List + fun findStockInLineInfoByPurchaseOrderLineIdAndDeletedFalse(purchaseOrderLineId: Long): List fun findStockInLineInfoByIdAndStatusAndDeletedFalse(id: Long, status: String): Optional fun findAllStockInLineInfoByPurchaseOrderIdAndStatusStartsWithAndDeletedFalse(purchaseOrderId: Long, status: String): List> } \ No newline at end of file diff --git a/src/main/java/com/ffii/fpsms/modules/stock/service/StockInLineService.kt b/src/main/java/com/ffii/fpsms/modules/stock/service/StockInLineService.kt index 94c1db8..4fd6e6f 100644 --- a/src/main/java/com/ffii/fpsms/modules/stock/service/StockInLineService.kt +++ b/src/main/java/com/ffii/fpsms/modules/stock/service/StockInLineService.kt @@ -191,8 +191,16 @@ open class StockInLineService( @Throws(IOException::class) @Transactional fun updatePurchaseOrderLineStatus(request: SaveStockInLineRequest) { - if (request.status == StockInLineStatus.COMPLETE.status) { - val unfinishedLines = stockInLineRepository.findStockInLineInfoByPurchaseOrderLineIdAndStatusNotAndDeletedFalse(purchaseOrderLineId = request.purchaseOrderLineId, status = request.status!!) + println(request.status) + if (request.status == StockInLineStatus.COMPLETE.status || request.status == StockInLineStatus.REJECT.status) { +// val unfinishedLines = stockInLineRepository.findStockInLineInfoByPurchaseOrderLineIdAndStatusNotAndDeletedFalse(purchaseOrderLineId = request.purchaseOrderLineId, status = request.status!!) + val unfinishedLines = stockInLineRepository.findStockInLineInfoByPurchaseOrderLineIdAndDeletedFalse(purchaseOrderLineId = request.purchaseOrderLineId) + .filter { + it.status != StockInLineStatus.COMPLETE.status + && it.status != StockInLineStatus.REJECT.status + } + println("unfinishedLines") + println(unfinishedLines) if (unfinishedLines.isEmpty()) { // all stock in lines finished // change status of purchase order line