浏览代码

update scan putaway

master
kelvinsuen 3 个月前
父节点
当前提交
99f4be6258
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. +1
    -0
      src/main/java/com/ffii/fpsms/modules/stock/entity/projection/StockInLineInfo.kt
  2. +1
    -2
      src/main/java/com/ffii/fpsms/modules/stock/service/StockInLineService.kt

+ 1
- 0
src/main/java/com/ffii/fpsms/modules/stock/entity/projection/StockInLineInfo.kt 查看文件

@@ -44,6 +44,7 @@ interface StockInLineInfo {
val itemType: String
val dnNo: String
val dnDate: LocalDateTime?
val qcDecision: LocalDateTime?
@get:Value("#{target.escalationLog.^[status.value == 'pending']?.handler?.id}")
val handlerId: Long?
@get:Value("#{target.inventoryLot?.inventoryLotLines ?: new java.util.ArrayList()}")


+ 1
- 2
src/main/java/com/ffii/fpsms/modules/stock/service/StockInLineService.kt 查看文件

@@ -378,8 +378,7 @@ open class StockInLineService(
BigDecimal.ONE
}

// if (inventoryLotLines.sumOf { it.inQty ?: BigDecimal.ZERO } >= request.acceptQty?.times(ratio)) {
if (request.inventoryLotLines?.isEmpty() == true) { // Clicked proceed in PO Modal -- TODO improve
if (inventoryLotLines.sumOf { it.inQty ?: BigDecimal.ZERO } >= request.acceptQty?.times(ratio)) {
stockInLine.apply {
this.status = if (request.acceptQty?.compareTo(request.acceptedQty) == 0)
StockInLineStatus.COMPLETE.status else StockInLineStatus.PARTIALLY_COMPLETE.status


正在加载...
取消
保存