| @@ -338,7 +338,7 @@ open class ItemsService( | |||||
| val result = jdbcDao.queryForList(finalSql, args) | val result = jdbcDao.queryForList(finalSql, args) | ||||
| //println("Query result size: ${result.size}") | //println("Query result size: ${result.size}") | ||||
| result.forEach { row -> println("Result row: $row") } | |||||
| // result.forEach { row -> println("Result row: $row") } | |||||
| return result | return result | ||||
| } catch (e: Exception) { | } catch (e: Exception) { | ||||
| println("Error in getPickOrderItemsByPage: ${e.message}") | println("Error in getPickOrderItemsByPage: ${e.message}") | ||||
| @@ -943,6 +943,7 @@ open class PickOrderService( | |||||
| lotNo = il?.lotNo, | lotNo = il?.lotNo, | ||||
| expiryDate = il?.expiryDate, | expiryDate = il?.expiryDate, | ||||
| location = w?.code, | location = w?.code, | ||||
| stockInLineId = il?.stockInLine?.id, | |||||
| stockUnit = ill.stockUom?.uom?.udfudesc ?: uomDesc, | stockUnit = ill.stockUom?.uom?.udfudesc ?: uomDesc, | ||||
| availableQty = availableQty, | availableQty = availableQty, | ||||
| requiredQty = spl?.qty ?: zero, | requiredQty = spl?.qty ?: zero, | ||||
| @@ -974,6 +975,7 @@ open class PickOrderService( | |||||
| lotNo = null, | lotNo = null, | ||||
| expiryDate = null, | expiryDate = null, | ||||
| location = null, | location = null, | ||||
| stockInLineId = null, | |||||
| stockUnit = uomDesc, | stockUnit = uomDesc, | ||||
| availableQty = null, | availableQty = null, | ||||
| requiredQty = zero, | requiredQty = zero, | ||||
| @@ -252,6 +252,7 @@ open class PickOrderWorkbenchService( | |||||
| val lotSql = """ | val lotSql = """ | ||||
| SELECT | SELECT | ||||
| ill.id AS lotId, | ill.id AS lotId, | ||||
| il.stockInLineId AS stockInLineId, | |||||
| il.lotNo AS lotNo, | il.lotNo AS lotNo, | ||||
| il.expiryDate AS expiryDate, | il.expiryDate AS expiryDate, | ||||
| w.code AS location, | w.code AS location, | ||||
| @@ -326,6 +327,7 @@ open class PickOrderWorkbenchService( | |||||
| expiryDate = toLocalDate(r["expiryDate"]), | expiryDate = toLocalDate(r["expiryDate"]), | ||||
| location = r["location"]?.toString(), | location = r["location"]?.toString(), | ||||
| itemId = pol.item?.id, | itemId = pol.item?.id, | ||||
| stockInLineId = toLong(r["stockInLineId"]), | |||||
| stockUnit = uomDesc, | stockUnit = uomDesc, | ||||
| availableQty = availableQty, | availableQty = availableQty, | ||||
| requiredQty = toBigDecimal(r["suggestedQty"]) ?: pol.qty ?: zero, | requiredQty = toBigDecimal(r["suggestedQty"]) ?: pol.qty ?: zero, | ||||
| @@ -364,6 +366,7 @@ open class PickOrderWorkbenchService( | |||||
| expiryDate = null, | expiryDate = null, | ||||
| location = null, | location = null, | ||||
| itemId = pol.item?.id, | itemId = pol.item?.id, | ||||
| stockInLineId = null, | |||||
| stockUnit = uomDesc, | stockUnit = uomDesc, | ||||
| availableQty = null, | availableQty = null, | ||||
| requiredQty = pol.qty ?: zero, | requiredQty = pol.qty ?: zero, | ||||
| @@ -163,6 +163,7 @@ data class PickOrderLineLotDetailResponse( | |||||
| val expiryDate: LocalDate?, | val expiryDate: LocalDate?, | ||||
| val location: String?, | val location: String?, | ||||
| val itemId: Long? = null, | val itemId: Long? = null, | ||||
| val stockInLineId: Long? = null, | |||||
| val stockUnit: String?, | val stockUnit: String?, | ||||
| val availableQty: BigDecimal?, | val availableQty: BigDecimal?, | ||||
| val requiredQty: BigDecimal?, | val requiredQty: BigDecimal?, | ||||