Selaa lähdekoodia

update do finish jump page,

production
CANCERYS\kw093 2 päivää sitten
vanhempi
commit
b5af7aad05
4 muutettua tiedostoa jossa 21 lisäystä ja 4 poistoa
  1. +8
    -2
      src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DoWorkbenchMainService.kt
  2. +4
    -0
      src/main/java/com/ffii/fpsms/modules/pickOrder/web/PickOrderController.kt
  3. +1
    -0
      src/main/java/com/ffii/fpsms/modules/pickOrder/web/models/SearchPickOrderRequest.kt
  4. +8
    -2
      src/main/java/com/ffii/fpsms/modules/stock/service/InventoryLotLineService.kt

+ 8
- 2
src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DoWorkbenchMainService.kt Näytä tiedosto

@@ -1011,7 +1011,10 @@ return MessageResponse(
sql.append(" AND dop.deliveryNoteCode LIKE :dnPat ")
params["dnPat"] = "%${request.deliveryNoteCode!!.trim()}%"
}

if (!request.ticketNo.isNullOrBlank()) {
sql.append(" AND dop.ticketNo LIKE :ticketNoPat ")
params["ticketNoPat"] = "%${request.ticketNo!!.trim()}%"
}
sql.append(" GROUP BY dop.id ORDER BY dop.modified DESC ")

val rows: List<Map<String, Any?>> = try {
@@ -1158,7 +1161,10 @@ return MessageResponse(
sql.append(" AND dop.deliveryNoteCode LIKE :dnPat ")
params["dnPat"] = "%${request.deliveryNoteCode!!.trim()}%"
}

if (!request.ticketNo.isNullOrBlank()) {
sql.append(" AND dop.ticketNo LIKE :ticketNoPat ")
params["ticketNoPat"] = "%${request.ticketNo!!.trim()}%"
}
sql.append(" GROUP BY dop.id ORDER BY dop.modified DESC ")

val rows: List<Map<String, Any?>> = try {


+ 4
- 0
src/main/java/com/ffii/fpsms/modules/pickOrder/web/PickOrderController.kt Näytä tiedosto

@@ -374,12 +374,14 @@ fun getCompletedDoPickOrdersWorkbench(
@RequestParam(required = false) targetDate: String?,
@RequestParam(required = false) deliveryNoteCode: String?,
@RequestParam(required = false) truckLanceCode: String?,
@RequestParam(required = false) ticketNo: String?,
): List<CompletedDoPickOrderResponse> {
val request = GetCompletedDoPickOrdersRequest(
targetDate = targetDate,
shopName = shopName,
deliveryNoteCode = deliveryNoteCode,
truckLanceCode = truckLanceCode,
ticketNo = ticketNo,
)
return doWorkbenchMainService.getCompletedDoPickOrdersWorkbench(userId, request)
}
@@ -390,12 +392,14 @@ fun getCompletedDoPickOrdersWorkbenchAll(
@RequestParam(required = false) targetDate: String?,
@RequestParam(required = false) deliveryNoteCode: String?,
@RequestParam(required = false) truckLanceCode: String?,
@RequestParam(required = false) ticketNo: String?,
): List<CompletedDoPickOrderResponse> {
val request = GetCompletedDoPickOrdersRequest(
targetDate = targetDate,
shopName = shopName,
deliveryNoteCode = deliveryNoteCode,
truckLanceCode = truckLanceCode,
ticketNo = ticketNo,
)
return doWorkbenchMainService.getCompletedDoPickOrdersWorkbenchAll(request)
}


+ 1
- 0
src/main/java/com/ffii/fpsms/modules/pickOrder/web/models/SearchPickOrderRequest.kt Näytä tiedosto

@@ -23,6 +23,7 @@ data class GetCompletedDoPickOrdersRequest(
val deliveryNoteCode: String? = null,
/** 卡車 / 車道代碼(模糊匹配 truck_lance_code) */
val truckLanceCode: String? = null,
val ticketNo: String? = null,
)

data class CompletedDoPickOrderResponse(


+ 8
- 2
src/main/java/com/ffii/fpsms/modules/stock/service/InventoryLotLineService.kt Näytä tiedosto

@@ -440,8 +440,14 @@ open fun updateInventoryLotLineQuantities(request: UpdateInventoryLotLineQuantit
.filter { !it.deleted && it.inventoryLot?.item != null }
.toList()
val item = source.firstOrNull()?.inventoryLot?.item
?: throw IllegalStateException("Item not found for itemId=$itemId")

if (item == null) {
return WorkbenchItemLotsResponse(
itemId = itemId,
itemCode = "",
itemName = "",
sameItemLots = emptyList()
)
}
val sameItemLots = source
.mapNotNull { lotLine ->
val lot = lotLine.inventoryLot ?: return@mapNotNull null


Ladataan…
Peruuta
Tallenna