CANCERYS\kw093 9 часов назад
Родитель
Сommit
cc7b2799a4
7 измененных файлов: 705 добавлений и 526 удалений
  1. +1
    -0
      src/main/java/com/ffii/fpsms/modules/jobOrder/entity/JoPickOrderRepository.kt
  2. +650
    -525
      src/main/java/com/ffii/fpsms/modules/jobOrder/service/JoPickOrderService.kt
  3. +10
    -1
      src/main/java/com/ffii/fpsms/modules/jobOrder/web/JobOrderController.kt
  4. +8
    -0
      src/main/java/com/ffii/fpsms/modules/pickOrder/entity/PickOrderLineRepository.kt
  5. +17
    -0
      src/main/java/com/ffii/fpsms/modules/pickOrder/entity/PickOrderRepository.kt
  6. +10
    -0
      src/main/java/com/ffii/fpsms/modules/stock/entity/StockInLineRepository.kt
  7. +9
    -0
      src/main/java/com/ffii/fpsms/modules/stock/entity/StockOutLIneRepository.kt

+ 1
- 0
src/main/java/com/ffii/fpsms/modules/jobOrder/entity/JoPickOrderRepository.kt Просмотреть файл

@@ -17,5 +17,6 @@ interface JoPickOrderRepository : JpaRepository<JoPickOrder, Long> {
fun findByPickOrderId(pickOrderId: Long): List<JoPickOrder>
fun findByPickOrderIdAndItemId(pickOrderId: Long, itemId: Long): java.util.Optional<JoPickOrder>
fun findByJobOrderId(jobOrderId: Long): List<JoPickOrder>?
fun findByPickOrderIdIn(pickOrderIds: Collection<Long>): List<JoPickOrder>

}

+ 650
- 525
src/main/java/com/ffii/fpsms/modules/jobOrder/service/JoPickOrderService.kt
Разница между файлами не показана из-за своего большого размера
Просмотреть файл


+ 10
- 1
src/main/java/com/ffii/fpsms/modules/jobOrder/web/JobOrderController.kt Просмотреть файл

@@ -226,12 +226,21 @@ fun recordSecondScanIssue(
fun printStockInLabel(@ModelAttribute request: PrintFGStockInLabelRequest){
jobOrderService.printFGStockInLabel(request)
}
/*

@GetMapping("/completed-job-order-pick-orders-only")
fun getCompletedJobOrderPickOrders(): List<Map<String, Any?>> {
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}")
fun getJoForPrintQrCode(@PathVariable date: String): List<JobOrderListForPrintQrCodeResponse> {
return joPickOrderService.getJobOrderListForPrintQrCode(LocalDate.parse(date))


+ 8
- 0
src/main/java/com/ffii/fpsms/modules/pickOrder/entity/PickOrderLineRepository.kt Просмотреть файл

@@ -23,4 +23,12 @@ fun findAllPickOrdersByItemId(@Param("itemId") itemId: Long): List<PickOrder>
fun findAllByPickOrderId(@Param("pickOrderId") pickOrderId: Long): List<PickOrderLine>
fun findAllByPickOrderIdAndDeletedFalse(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>
}

+ 17
- 0
src/main/java/com/ffii/fpsms/modules/pickOrder/entity/PickOrderRepository.kt Просмотреть файл

@@ -95,4 +95,21 @@ fun findAllByStatusAndAssignToIsNullAndDeletedFalse(status: PickOrderStatus): Li
fun findAllByJobOrder_Id(jobOrderId: Long): List<PickOrder>
fun findTopByJobOrder_IdOrderByCreatedDesc(jobOrderId: Long): 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>
}

+ 10
- 0
src/main/java/com/ffii/fpsms/modules/stock/entity/StockInLineRepository.kt Просмотреть файл

@@ -154,4 +154,14 @@ fun findLatestLotNoByPrefix(@Param("prefix") prefix: String): String?
@Param("since") since: LocalDateTime,
pageable: Pageable,
): 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>
}

+ 9
- 0
src/main/java/com/ffii/fpsms/modules/stock/entity/StockOutLIneRepository.kt Просмотреть файл

@@ -86,4 +86,13 @@ fun findByInventoryLotLineIdAndStatusAndDeletedFalse(
inventoryLotLineId: Long,
status: String
): 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>
}

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