diff --git a/src/main/java/com/ffii/fpsms/modules/master/service/ItemsService.kt b/src/main/java/com/ffii/fpsms/modules/master/service/ItemsService.kt index 72afd92..d2fbc98 100644 --- a/src/main/java/com/ffii/fpsms/modules/master/service/ItemsService.kt +++ b/src/main/java/com/ffii/fpsms/modules/master/service/ItemsService.kt @@ -338,7 +338,7 @@ open class ItemsService( val result = jdbcDao.queryForList(finalSql, args) //println("Query result size: ${result.size}") - result.forEach { row -> println("Result row: $row") } + // result.forEach { row -> println("Result row: $row") } return result } catch (e: Exception) { println("Error in getPickOrderItemsByPage: ${e.message}") diff --git a/src/main/java/com/ffii/fpsms/modules/pickOrder/service/PickOrderService.kt b/src/main/java/com/ffii/fpsms/modules/pickOrder/service/PickOrderService.kt index 7cba195..5ecdecc 100644 --- a/src/main/java/com/ffii/fpsms/modules/pickOrder/service/PickOrderService.kt +++ b/src/main/java/com/ffii/fpsms/modules/pickOrder/service/PickOrderService.kt @@ -943,6 +943,7 @@ open class PickOrderService( lotNo = il?.lotNo, expiryDate = il?.expiryDate, location = w?.code, + stockInLineId = il?.stockInLine?.id, stockUnit = ill.stockUom?.uom?.udfudesc ?: uomDesc, availableQty = availableQty, requiredQty = spl?.qty ?: zero, @@ -974,6 +975,7 @@ open class PickOrderService( lotNo = null, expiryDate = null, location = null, + stockInLineId = null, stockUnit = uomDesc, availableQty = null, requiredQty = zero, diff --git a/src/main/java/com/ffii/fpsms/modules/pickOrder/service/PickOrderWorkbenchService.kt b/src/main/java/com/ffii/fpsms/modules/pickOrder/service/PickOrderWorkbenchService.kt index 2bedb42..aafe0ed 100644 --- a/src/main/java/com/ffii/fpsms/modules/pickOrder/service/PickOrderWorkbenchService.kt +++ b/src/main/java/com/ffii/fpsms/modules/pickOrder/service/PickOrderWorkbenchService.kt @@ -252,6 +252,7 @@ open class PickOrderWorkbenchService( val lotSql = """ SELECT ill.id AS lotId, + il.stockInLineId AS stockInLineId, il.lotNo AS lotNo, il.expiryDate AS expiryDate, w.code AS location, @@ -326,6 +327,7 @@ open class PickOrderWorkbenchService( expiryDate = toLocalDate(r["expiryDate"]), location = r["location"]?.toString(), itemId = pol.item?.id, + stockInLineId = toLong(r["stockInLineId"]), stockUnit = uomDesc, availableQty = availableQty, requiredQty = toBigDecimal(r["suggestedQty"]) ?: pol.qty ?: zero, @@ -364,6 +366,7 @@ open class PickOrderWorkbenchService( expiryDate = null, location = null, itemId = pol.item?.id, + stockInLineId = null, stockUnit = uomDesc, availableQty = null, requiredQty = pol.qty ?: zero, diff --git a/src/main/java/com/ffii/fpsms/modules/pickOrder/web/models/ConsoPickOrderResponse.kt b/src/main/java/com/ffii/fpsms/modules/pickOrder/web/models/ConsoPickOrderResponse.kt index b4a3f0e..2d7f095 100644 --- a/src/main/java/com/ffii/fpsms/modules/pickOrder/web/models/ConsoPickOrderResponse.kt +++ b/src/main/java/com/ffii/fpsms/modules/pickOrder/web/models/ConsoPickOrderResponse.kt @@ -163,6 +163,7 @@ data class PickOrderLineLotDetailResponse( val expiryDate: LocalDate?, val location: String?, val itemId: Long? = null, + val stockInLineId: Long? = null, val stockUnit: String?, val availableQty: BigDecimal?, val requiredQty: BigDecimal?,