From 5deb6446698e30f2240e81a61c7ca22931d9e932 Mon Sep 17 00:00:00 2001 From: "CANCERYS\\kw093" Date: Wed, 21 Oct 2026 12:51:21 +0800 Subject: [PATCH] update report round list --- .../ffii/fpsms/modules/report/service/ReportService.kt | 9 +++++++++ .../report/service/StockTakeVarianceReportService.kt | 5 +++++ 2 files changed, 14 insertions(+) diff --git a/src/main/java/com/ffii/fpsms/modules/report/service/ReportService.kt b/src/main/java/com/ffii/fpsms/modules/report/service/ReportService.kt index 0f9a34b6..ec5f3020 100644 --- a/src/main/java/com/ffii/fpsms/modules/report/service/ReportService.kt +++ b/src/main/java/com/ffii/fpsms/modules/report/service/ReportService.kt @@ -292,7 +292,16 @@ return result val sql = """ SELECT CAST(st.stockTakeRoundId AS CHAR) AS value, + CASE + WHEN LOWER(COALESCE(MAX(st.stockTakeRoundMode), 'section')) = 'item' THEN 'item' + ELSE 'section' + END AS mode, CONCAT( + CASE + WHEN LOWER(COALESCE(MAX(st.stockTakeRoundMode), 'section')) = 'item' THEN '【依貨品】' + ELSE '【依區域】' + END, + ' ', CASE WHEN NULLIF(TRIM(MAX(st.stockTakeRoundName)), '') IS NULL THEN CONCAT('盤點輪次', CAST(st.stockTakeRoundId AS CHAR)) diff --git a/src/main/java/com/ffii/fpsms/modules/report/service/StockTakeVarianceReportService.kt b/src/main/java/com/ffii/fpsms/modules/report/service/StockTakeVarianceReportService.kt index 9b190257..330964a3 100644 --- a/src/main/java/com/ffii/fpsms/modules/report/service/StockTakeVarianceReportService.kt +++ b/src/main/java/com/ffii/fpsms/modules/report/service/StockTakeVarianceReportService.kt @@ -978,6 +978,11 @@ ORDER BY val sql = """ SELECT CONCAT( + CASE + WHEN LOWER(COALESCE(MAX(st.stockTakeRoundMode), 'section')) = 'item' THEN '【依貨品】' + ELSE '【依區域】' + END, + ' ', CASE WHEN NULLIF(TRIM(MAX(st.stockTakeRoundName)), '') IS NULL THEN CONCAT('盤點輪次', CAST(st.stockTakeRoundId AS CHAR))