Explorar el Código

update consumable print label model input

master
CANCERYS\kw093 hace 1 semana
padre
commit
140d86bed9
Se han modificado 4 ficheros con 7 adiciones y 1 borrados
  1. +1
    -1
      src/main/java/com/ffii/fpsms/modules/master/service/ItemsService.kt
  2. +2
    -0
      src/main/java/com/ffii/fpsms/modules/pickOrder/service/PickOrderService.kt
  3. +3
    -0
      src/main/java/com/ffii/fpsms/modules/pickOrder/service/PickOrderWorkbenchService.kt
  4. +1
    -0
      src/main/java/com/ffii/fpsms/modules/pickOrder/web/models/ConsoPickOrderResponse.kt

+ 1
- 1
src/main/java/com/ffii/fpsms/modules/master/service/ItemsService.kt Ver fichero

@@ -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}")


+ 2
- 0
src/main/java/com/ffii/fpsms/modules/pickOrder/service/PickOrderService.kt Ver fichero

@@ -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,


+ 3
- 0
src/main/java/com/ffii/fpsms/modules/pickOrder/service/PickOrderWorkbenchService.kt Ver fichero

@@ -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,


+ 1
- 0
src/main/java/com/ffii/fpsms/modules/pickOrder/web/models/ConsoPickOrderResponse.kt Ver fichero

@@ -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?,


Cargando…
Cancelar
Guardar