瀏覽代碼

hide some print

master
CANCERYS\kw093 1 周之前
父節點
當前提交
8bdc74ef90
共有 2 個檔案被更改,包括 13 行新增21 行删除
  1. +10
    -18
      src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DoWorkbenchMainService.kt
  2. +3
    -3
      src/main/java/com/ffii/fpsms/modules/stock/service/StockOutLineService.kt

+ 10
- 18
src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DoWorkbenchMainService.kt 查看文件

@@ -475,6 +475,7 @@ open class DoWorkbenchMainService(
val solSnapshot = infos.joinToString("; ") { info -> val solSnapshot = infos.joinToString("; ") { info ->
"sol${info.id} st=${info.status} qty=${info.qty} picked=${WorkbenchStockOutLinePickProgress.isCountedAsPicked(info)}" "sol${info.id} st=${info.status} qty=${info.qty} picked=${WorkbenchStockOutLinePickProgress.isCountedAsPicked(info)}"
} }
/*
log.info( log.info(
"WORKBENCH_SCAN_TRACE polId={} solId={} scanLotNo={} scanIllId={} polRequired={} [{}] endedSumOthers={} currentSolQty={} remainingPol={} splMatchQty={} chunkTarget={} stillNeedOnThisSol={} requestedCap={} availScanLot={} plannedDelta={} lotSplit={}", "WORKBENCH_SCAN_TRACE polId={} solId={} scanLotNo={} scanIllId={} polRequired={} [{}] endedSumOthers={} currentSolQty={} remainingPol={} splMatchQty={} chunkTarget={} stillNeedOnThisSol={} requestedCap={} availScanLot={} plannedDelta={} lotSplit={}",
polId, polId,
@@ -494,7 +495,7 @@ log.info(
plannedDelta, plannedDelta,
isLotExhaustedSplit, // initial trace only isLotExhaustedSplit, // initial trace only
) )
*/
val prepMs = lapMs() val prepMs = lapMs()


// retry-related state // retry-related state
@@ -533,26 +534,16 @@ while (attempt <= maxRetries) {
"SELECT id, inQty, outQty, status, version FROM inventory_lot_line WHERE id = ?", "SELECT id, inQty, outQty, status, version FROM inventory_lot_line WHERE id = ?",
illId illId
) )
log.info(
"WB_SQL_TRACE phase=before traceId={} connId={} illId={} inQty={} outQty={} status={} ver={} delta={} expVer={} retryAttempt={}",
traceId, connIdBefore, illId,
beforeRow["inQty"], beforeRow["outQty"], beforeRow["status"], beforeRow["version"],
effectiveDelta, expectedVersion, attempt
)



updated = inventoryLotLineRepository.incrementOutQtyIfAvailable(illId, effectiveDelta, expectedVersion) updated = inventoryLotLineRepository.incrementOutQtyIfAvailable(illId, effectiveDelta, expectedVersion)
println("updated: $updated")
// println("updated: $updated")


val connIdAfter = jdbcTemplate.queryForObject("SELECT CONNECTION_ID()", Long::class.java) val connIdAfter = jdbcTemplate.queryForObject("SELECT CONNECTION_ID()", Long::class.java)
val afterRow = jdbcTemplate.queryForMap( val afterRow = jdbcTemplate.queryForMap(
"SELECT id, inQty, outQty, status, version FROM inventory_lot_line WHERE id = ?", "SELECT id, inQty, outQty, status, version FROM inventory_lot_line WHERE id = ?",
illId illId
) )
log.info(
"WB_SQL_TRACE phase=after traceId={} connId={} illId={} updated={} inQty={} outQty={} status={} ver={} retryAttempt={}",
traceId, connIdAfter, illId, updated,
afterRow["inQty"], afterRow["outQty"], afterRow["status"], afterRow["version"], attempt
)


if (updated > 0) break if (updated > 0) break


@@ -695,6 +686,7 @@ val mapped = stockOutLIneRepository.findStockOutLineInfoById(sol.id!!)
val mapFetchMs = (System.nanoTime() - mapFetchT0) / 1_000_000 val mapFetchMs = (System.nanoTime() - mapFetchT0) / 1_000_000


val totalMs = (System.nanoTime() - wall0) / 1_000_000 val totalMs = (System.nanoTime() - wall0) / 1_000_000
/*
log.info( log.info(
"workbench scanPick timing (ms): total={} prep={} outbound={} saveSol={} rebuildSpl={} ensureSol={} polPartial={} postEffects={} mapFetch={} lotSplit={} solId={} polId={} poId={}", "workbench scanPick timing (ms): total={} prep={} outbound={} saveSol={} rebuildSpl={} ensureSol={} polPartial={} postEffects={} mapFetch={} lotSplit={} solId={} polId={} poId={}",
totalMs, totalMs,
@@ -711,7 +703,7 @@ log.info(
polId, polId,
pickOrderId ?: 0L, pickOrderId ?: 0L,
) )
*/
return MessageResponse( return MessageResponse(
id = sol.id, id = sol.id,
name = scannedIll.inventoryLot?.lotNo ?: lotNo, name = scannedIll.inventoryLot?.lotNo ?: lotNo,
@@ -1699,8 +1691,8 @@ return MessageResponse(
"pickOrders" to emptyList<Any>(), "pickOrders" to emptyList<Any>(),
) )
} }
println(" Found delivery_order_pick_order ID: $doPickOrderId")
println(" delivery_order_pick_order ticketStatus: $doTicketStatus")
//println(" Found delivery_order_pick_order ID: $doPickOrderId")
//println(" delivery_order_pick_order ticketStatus: $doTicketStatus")


if (doTicketStatus == "completed") { if (doTicketStatus == "completed") {
return mapOf( return mapOf(
@@ -1736,7 +1728,7 @@ return MessageResponse(
) )
} }
mark("query.pickOrdersMs", pickOrdersQueryMs) mark("query.pickOrdersMs", pickOrdersQueryMs)
println(" Found ${pickOrdersInfo.size} pick orders (workbench)")
// println(" Found ${pickOrdersInfo.size} pick orders (workbench)")


var payload: Map<String, Any?> = emptyMap() var payload: Map<String, Any?> = emptyMap()
val assembleMs = measureTimeMillis { val assembleMs = measureTimeMillis {
@@ -1889,7 +1881,7 @@ return MessageResponse(
return emptyList() return emptyList()
} }


println(" Found ${results.size} active FG workbench pick orders for user: $userId")
// println(" Found ${results.size} active FG workbench pick orders for user: $userId")


return results.map { row -> return results.map { row ->
val pickOrderIdsStr = row["pickOrderIds"] as? String ?: "" val pickOrderIdsStr = row["pickOrderIds"] as? String ?: ""


+ 3
- 3
src/main/java/com/ffii/fpsms/modules/stock/service/StockOutLineService.kt 查看文件

@@ -1804,7 +1804,7 @@ open fun newBatchSubmit(request: QrPickBatchSubmitRequest): MessageResponse {


if (flushAfterSave) { if (flushAfterSave) {
stockLedgerRepository.saveAndFlush(ledger) stockLedgerRepository.saveAndFlush(ledger)
println("${tracePrefix}Ledger created successfully for stockOutLineId=$solId")
//println("${tracePrefix}Ledger created successfully for stockOutLineId=$solId")
} else { } else {
stockLedgerRepository.save(ledger) stockLedgerRepository.save(ledger)
} }
@@ -1847,12 +1847,12 @@ open fun batchScan(request: com.ffii.fpsms.modules.stock.web.model.BatchScanRequ
try { try {
// 1) Bulk load all pick order lines // 1) Bulk load all pick order lines
val pickOrderLineIds = request.lines.map { it.pickOrderLineId }.distinct() val pickOrderLineIds = request.lines.map { it.pickOrderLineId }.distinct()
println("Loading ${pickOrderLineIds.size} pick order lines...")
//println("Loading ${pickOrderLineIds.size} pick order lines...")
val pickOrderLines = pickOrderLineRepository.findAllById(pickOrderLineIds).associateBy { it.id } val pickOrderLines = pickOrderLineRepository.findAllById(pickOrderLineIds).associateBy { it.id }


// 2) Bulk load all inventory lot lines (if any) // 2) Bulk load all inventory lot lines (if any)
val lotLineIds = request.lines.mapNotNull { it.inventoryLotLineId }.distinct() val lotLineIds = request.lines.mapNotNull { it.inventoryLotLineId }.distinct()
println("Loading ${lotLineIds.size} inventory lot lines...")
// println("Loading ${lotLineIds.size} inventory lot lines...")
val inventoryLotLines = if (lotLineIds.isNotEmpty()) { val inventoryLotLines = if (lotLineIds.isNotEmpty()) {
inventoryLotLineRepository.findAllById(lotLineIds).associateBy { it.id } inventoryLotLineRepository.findAllById(lotLineIds).associateBy { it.id }
} else { } else {


Loading…
取消
儲存