| @@ -17,5 +17,6 @@ interface JoPickOrderRepository : JpaRepository<JoPickOrder, Long> { | |||||
| fun findByPickOrderId(pickOrderId: Long): List<JoPickOrder> | fun findByPickOrderId(pickOrderId: Long): List<JoPickOrder> | ||||
| fun findByPickOrderIdAndItemId(pickOrderId: Long, itemId: Long): java.util.Optional<JoPickOrder> | fun findByPickOrderIdAndItemId(pickOrderId: Long, itemId: Long): java.util.Optional<JoPickOrder> | ||||
| fun findByJobOrderId(jobOrderId: Long): List<JoPickOrder>? | fun findByJobOrderId(jobOrderId: Long): List<JoPickOrder>? | ||||
| fun findByPickOrderIdIn(pickOrderIds: Collection<Long>): List<JoPickOrder> | |||||
| } | } | ||||
| @@ -226,12 +226,21 @@ fun recordSecondScanIssue( | |||||
| fun printStockInLabel(@ModelAttribute request: PrintFGStockInLabelRequest){ | fun printStockInLabel(@ModelAttribute request: PrintFGStockInLabelRequest){ | ||||
| jobOrderService.printFGStockInLabel(request) | jobOrderService.printFGStockInLabel(request) | ||||
| } | } | ||||
| /* | |||||
| @GetMapping("/completed-job-order-pick-orders-only") | @GetMapping("/completed-job-order-pick-orders-only") | ||||
| fun getCompletedJobOrderPickOrders(): List<Map<String, Any?>> { | fun getCompletedJobOrderPickOrders(): List<Map<String, Any?>> { | ||||
| return joPickOrderService.getCompletedJobOrderPickOrders() | return joPickOrderService.getCompletedJobOrderPickOrders() | ||||
| } | } | ||||
| */ | |||||
| @GetMapping("/completed-job-order-pick-orders-only") | |||||
| fun getCompletedJobOrderPickOrders( | |||||
| @RequestParam(name = "date", required = false) | |||||
| @org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE) | |||||
| completedDate: LocalDate?, | |||||
| ): List<Map<String, Any?>> { | |||||
| return joPickOrderService.getCompletedJobOrderPickOrders(completedDate) | |||||
| } | |||||
| @GetMapping("/joForPrintQrCode/{date}") | @GetMapping("/joForPrintQrCode/{date}") | ||||
| fun getJoForPrintQrCode(@PathVariable date: String): List<JobOrderListForPrintQrCodeResponse> { | fun getJoForPrintQrCode(@PathVariable date: String): List<JobOrderListForPrintQrCodeResponse> { | ||||
| return joPickOrderService.getJobOrderListForPrintQrCode(LocalDate.parse(date)) | return joPickOrderService.getJobOrderListForPrintQrCode(LocalDate.parse(date)) | ||||
| @@ -23,4 +23,12 @@ fun findAllPickOrdersByItemId(@Param("itemId") itemId: Long): List<PickOrder> | |||||
| fun findAllByPickOrderId(@Param("pickOrderId") pickOrderId: Long): List<PickOrderLine> | fun findAllByPickOrderId(@Param("pickOrderId") pickOrderId: Long): List<PickOrderLine> | ||||
| fun findAllByPickOrderIdAndDeletedFalse(pickOrderId: Long): List<PickOrderLine> | fun findAllByPickOrderIdAndDeletedFalse(pickOrderId: Long): List<PickOrderLine> | ||||
| fun findByPickOrderId(pickOrderId: Long): List<PickOrderLine> | fun findByPickOrderId(pickOrderId: Long): List<PickOrderLine> | ||||
| @Query( | |||||
| """ | |||||
| SELECT pol FROM PickOrderLine pol | |||||
| WHERE pol.pickOrder.id IN :pickOrderIds AND pol.deleted = false | |||||
| """ | |||||
| ) | |||||
| fun findAllByPickOrderIdInAndDeletedFalse(@Param("pickOrderIds") pickOrderIds: List<Long>): List<PickOrderLine> | |||||
| } | } | ||||
| @@ -95,4 +95,21 @@ fun findAllByStatusAndAssignToIsNullAndDeletedFalse(status: PickOrderStatus): Li | |||||
| fun findAllByJobOrder_Id(jobOrderId: Long): List<PickOrder> | fun findAllByJobOrder_Id(jobOrderId: Long): List<PickOrder> | ||||
| fun findTopByJobOrder_IdOrderByCreatedDesc(jobOrderId: Long): PickOrder? | fun findTopByJobOrder_IdOrderByCreatedDesc(jobOrderId: Long): PickOrder? | ||||
| fun findAllByStatusIn(statuses: List<PickOrderStatus>): List<PickOrder> | fun findAllByStatusIn(statuses: List<PickOrderStatus>): List<PickOrder> | ||||
| @Query( | |||||
| """ | |||||
| SELECT po FROM PickOrder po | |||||
| WHERE po.status = :status | |||||
| AND po.deleted = false | |||||
| AND po.jobOrder IS NOT NULL | |||||
| AND po.jobOrder.planEnd IS NOT NULL | |||||
| AND po.jobOrder.planEnd >= :planEndFrom | |||||
| AND po.jobOrder.planEnd < :planEndToExclusive | |||||
| """ | |||||
| ) | |||||
| fun findAllCompletedWithJobOrderPlanEndOnDay( | |||||
| @Param("status") status: PickOrderStatus, | |||||
| @Param("planEndFrom") planEndFrom: LocalDateTime, | |||||
| @Param("planEndToExclusive") planEndToExclusive: LocalDateTime, | |||||
| ): List<PickOrder> | |||||
| } | } | ||||
| @@ -154,4 +154,14 @@ fun findLatestLotNoByPrefix(@Param("prefix") prefix: String): String? | |||||
| @Param("since") since: LocalDateTime, | @Param("since") since: LocalDateTime, | ||||
| pageable: Pageable, | pageable: Pageable, | ||||
| ): List<PurchaseStockInAlertRow> | ): List<PurchaseStockInAlertRow> | ||||
| @Query( | |||||
| """ | |||||
| SELECT sil FROM StockInLine sil | |||||
| WHERE sil.jobOrder.id IN :jobOrderIds AND sil.deleted = false | |||||
| ORDER BY sil.id ASC | |||||
| """ | |||||
| ) | |||||
| fun findAllByJobOrder_IdInAndDeletedFalse(@Param("jobOrderIds") jobOrderIds: List<Long>): List<StockInLine> | |||||
| } | } | ||||
| @@ -86,4 +86,13 @@ fun findByInventoryLotLineIdAndStatusAndDeletedFalse( | |||||
| inventoryLotLineId: Long, | inventoryLotLineId: Long, | ||||
| status: String | status: String | ||||
| ): List<StockOutLine> | ): List<StockOutLine> | ||||
| @Query( | |||||
| """ | |||||
| SELECT sil FROM StockInLine sil | |||||
| WHERE sil.jobOrder.id IN :jobOrderIds AND sil.deleted = false | |||||
| ORDER BY sil.id ASC | |||||
| """ | |||||
| ) | |||||
| fun findAllByJobOrder_IdInAndDeletedFalse(@Param("jobOrderIds") jobOrderIds: List<Long>): List<StockInLine> | |||||
| } | } | ||||