Просмотр исходного кода

m18 purchase order line update (after sync of PO, all the fee items will be marked deleted)

reset-do-picking-order
kelvin.yau 1 неделю назад
Родитель
Сommit
5979d983f8
3 измененных файлов: 19 добавлений и 0 удалений
  1. +6
    -0
      src/main/java/com/ffii/fpsms/m18/service/M18PurchaseOrderService.kt
  2. +4
    -0
      src/main/java/com/ffii/fpsms/modules/purchaseOrder/entity/PurchaseOrderLineRepository.kt
  3. +9
    -0
      src/main/java/com/ffii/fpsms/modules/purchaseOrder/service/PurchaseOrderLineService.kt

+ 6
- 0
src/main/java/com/ffii/fpsms/m18/service/M18PurchaseOrderService.kt Просмотреть файл

@@ -514,6 +514,12 @@ open class M18PurchaseOrderService(
// if (failDetailList.size > 0) { // if (failDetailList.size > 0) {
logger.error("Total Fail (${poLineRefType}) (${failDetailList.size}): $failDetailList") logger.error("Total Fail (${poLineRefType}) (${failDetailList.size}): $failDetailList")
// } // }

val feeMarked = purchaseOrderLineService.markDeletedLinesWithFeeItems()
if (feeMarked > 0) {
logger.info("Marked $feeMarked PO line(s) as deleted (isFee items).")
}

logger.info("--------------------------------------------End - Saving M18 Purchase Order--------------------------------------------") logger.info("--------------------------------------------End - Saving M18 Purchase Order--------------------------------------------")


return SyncResult( return SyncResult(


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

@@ -3,6 +3,7 @@ package com.ffii.fpsms.modules.purchaseOrder.entity
import com.ffii.core.support.AbstractRepository import com.ffii.core.support.AbstractRepository
import com.ffii.fpsms.modules.purchaseOrder.entity.projections.PurchaseOrderLineInfo import com.ffii.fpsms.modules.purchaseOrder.entity.projections.PurchaseOrderLineInfo
import com.ffii.fpsms.modules.purchaseOrder.enums.PurchaseOrderLineStatus import com.ffii.fpsms.modules.purchaseOrder.enums.PurchaseOrderLineStatus
import org.springframework.data.jpa.repository.Query
import org.springframework.stereotype.Repository import org.springframework.stereotype.Repository
import java.io.Serializable import java.io.Serializable


@@ -15,4 +16,7 @@ interface PurchaseOrderLineRepository : AbstractRepository<PurchaseOrderLine, Lo
fun findAllByPurchaseOrderIdAndStatusNotAndDeletedIsFalse(purchaseOrderId: Long, status: PurchaseOrderLineStatus): List<PurchaseOrderLine> fun findAllByPurchaseOrderIdAndStatusNotAndDeletedIsFalse(purchaseOrderId: Long, status: PurchaseOrderLineStatus): List<PurchaseOrderLine>
// fun findAllByPurchaseOrderIdAndDeletedIsFalse(purchaseOrderId: Long): List<PurchaseOrderLine> // fun findAllByPurchaseOrderIdAndDeletedIsFalse(purchaseOrderId: Long): List<PurchaseOrderLine>
// fun find // fun find

@Query("SELECT pol FROM PurchaseOrderLine pol WHERE pol.deleted = false AND pol.item IS NOT NULL AND pol.item.isFee = true")
fun findAllByDeletedIsFalseAndItemIsFeeTrue(): List<PurchaseOrderLine>
} }

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

@@ -98,4 +98,13 @@ open class PurchaseOrderLineService(


return savedPurchaseOrderLine return savedPurchaseOrderLine
} }

open fun markDeletedLinesWithFeeItems(): Int {
val feeLines = purchaseOrderLineRepository.findAllByDeletedIsFalseAndItemIsFeeTrue()
feeLines.forEach { line ->
line.deleted = true
purchaseOrderLineRepository.saveAndFlush(line)
}
return feeLines.size
}
} }

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