diff --git a/src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DoPickOrderQueryService.kt b/src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DoPickOrderQueryService.kt index 869ac3f..2efd0b9 100644 --- a/src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DoPickOrderQueryService.kt +++ b/src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DoPickOrderQueryService.kt @@ -21,7 +21,7 @@ class DoPickOrderQueryService( fun getSummaryByStore(storeId: String, requiredDate: LocalDate?, releaseType: String): StoreLaneSummary { val targetDate = requiredDate ?: LocalDate.now() - println(" DEBUG: Getting summary for store=$storeId, date=$targetDate, releaseType=$releaseType") + //println(" DEBUG: Getting summary for store=$storeId, date=$targetDate, releaseType=$releaseType") val actualStoreId = when (storeId) { "2/F" -> "2/F" @@ -57,10 +57,10 @@ class DoPickOrderQueryService( else -> completedRecords // "all" 或其他值,不过滤 } - println(" DEBUG: Found ${activeRecords.size} active records for date $targetDate") - println(" DEBUG: After releaseType filter: ${filteredActiveRecordsByReleaseType.size} active records") - println(" DEBUG: Found ${completedRecords.size} completed records for date $targetDate") - println(" DEBUG: After releaseType filter: ${filteredCompletedRecordsByReleaseType.size} completed records") + //println(" DEBUG: Found ${activeRecords.size} active records for date $targetDate") + // println(" DEBUG: After releaseType filter: ${filteredActiveRecordsByReleaseType.size} active records") + //println(" DEBUG: Found ${completedRecords.size} completed records for date $targetDate") + //println(" DEBUG: After releaseType filter: ${filteredCompletedRecordsByReleaseType.size} completed records") // Filter active records (check for non-issue lines) val filteredActiveRecords = filteredActiveRecordsByReleaseType.filter { doPickOrder -> @@ -98,7 +98,7 @@ class DoPickOrderQueryService( val defaultTruckId = 5577L val defaultTruck = truckRepository.findById(defaultTruckId).orElse(null) val defaultTruckLaneCode = defaultTruck?.truckLanceCode ?: "" - println(" DEBUG: After filtering, ${allRecords.size} records remain (${filteredActiveRecords.size} active + ${filteredCompletedRecords.size} completed)") + //println(" DEBUG: After filtering, ${allRecords.size} records remain (${filteredActiveRecords.size} active + ${filteredCompletedRecords.size} completed)") val grouped = allRecords.groupBy { it.truckDepartureTime to it.truckLanceCode } .mapValues { (_, list) -> diff --git a/src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DoPickOrderService.kt b/src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DoPickOrderService.kt index e1fa914..9307278 100644 --- a/src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DoPickOrderService.kt +++ b/src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DoPickOrderService.kt @@ -503,7 +503,7 @@ open class DoPickOrderService( // 3. 只有当所有 lines 都是 "issue" 状态时才过滤掉 val hasNonIssueLines = nonIssueLines > 0 - println(" DEBUG: DoPickOrder $doPickOrderId - Total lines: $totalLines, Non-issue lines: $nonIssueLines, Has non-issue lines: $hasNonIssueLines") + // println(" DEBUG: DoPickOrder $doPickOrderId - Total lines: $totalLines, Non-issue lines: $nonIssueLines, Has non-issue lines: $hasNonIssueLines") return hasNonIssueLines @@ -553,7 +553,7 @@ open class DoPickOrderService( // 关键修改:获取这个 do_pick_order 下的所有 pick orders 并分配给用户 val doPickOrderLines = doPickOrderLineRepository.findByDoPickOrderIdAndDeletedFalse(firstOrder.id!!) - println(" DEBUG: Found ${doPickOrderLines.size} pick orders in do_pick_order ${firstOrder.id}") + //println(" DEBUG: Found ${doPickOrderLines.size} pick orders in do_pick_order ${firstOrder.id}") doPickOrderLines.forEach { line -> if (line.pickOrderId != null) { diff --git a/src/main/java/com/ffii/fpsms/modules/jobOrder/service/JoPickOrderService.kt b/src/main/java/com/ffii/fpsms/modules/jobOrder/service/JoPickOrderService.kt index 79a011e..735e281 100644 --- a/src/main/java/com/ffii/fpsms/modules/jobOrder/service/JoPickOrderService.kt +++ b/src/main/java/com/ffii/fpsms/modules/jobOrder/service/JoPickOrderService.kt @@ -1535,7 +1535,7 @@ open fun getCompletedJobOrderPickOrderLotDetails(pickOrderId: Long): List()) @@ -2790,7 +2790,7 @@ open class PickOrderService( il.lotNo ASC """.trimIndent() - println(" Executing SQL for all pick order lots with details: $sql") + //println(" Executing SQL for all pick order lots with details: $sql") println(" With parameters: userId = $userId, pickOrderIds = $pickOrderIdsStr") val results = jdbcDao.queryForList(sql, mapOf("userId" to userId)) @@ -2818,7 +2818,7 @@ open class PickOrderService( it.status?.value in listOf("assigned", "released", "picking") } - println(" Found ${pickOrders.size} FG pick orders using repository") + //println(" Found ${pickOrders.size} FG pick orders using repository") val results = pickOrders.map { po -> val deliveryOrder = po.deliveryOrder @@ -2925,17 +2925,17 @@ open class PickOrderService( ORDER BY MIN(po.targetDate) DESC, MIN(po.code) ASC """.trimIndent() - println(" Executing SQL for FG pick orders by userId: $sql") - println(" With parameters: userId = $userId") + // println(" Executing SQL for FG pick orders by userId: $sql") + // println(" With parameters: userId = $userId") val results = jdbcDao.queryForList(sql, mapOf("userId" to userId)) if (results.isEmpty()) { - println("❌ No active FG pick orders found for user: $userId") + // println("❌ No active FG pick orders found for user: $userId") return emptyList() } - println(" Found ${results.size} active FG pick orders for user: $userId") + // println(" Found ${results.size} active FG pick orders for user: $userId") // 添加调试信息 results.forEachIndexed { index, row -> @@ -3436,7 +3436,7 @@ ORDER BY il.lotNo ASC """.trimIndent() - println(" Executing SQL for all pick order lots with details (no auto-assign): $sql") + //println(" Executing SQL for all pick order lots with details (no auto-assign): $sql") println(" With parameters: userId = $userId, pickOrderIds = $pickOrderIdsStr") val results = jdbcDao.queryForList(sql, mapOf("userId" to userId)) @@ -4252,7 +4252,7 @@ open fun getAllPickOrderLotsWithDetailsHierarchical(userId: Long): Map