From 87115f4a71d58af8cf5e6dbe08837e470498067a Mon Sep 17 00:00:00 2001 From: "MSI\\derek" Date: Thu, 19 Jun 2025 11:21:54 +0800 Subject: [PATCH] update --- .../entity/PurchaseOrderLineRepository.kt | 1 + .../entity/PurchaseOrderRepository.kt | 5 +- .../entity/projections/PurchaseOrderInfo.kt | 2 +- .../service/PurchaseOrderService.kt | 88 ++++++++++++++----- .../web/PurchaseOrderController.kt | 24 +++-- .../stock/entity/StockInLineRepository.kt | 1 + .../stock/service/StockInLineService.kt | 12 ++- 7 files changed, 99 insertions(+), 34 deletions(-) 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