diff --git a/src/main/java/com/ffii/fpsms/modules/report/web/ReportController.kt b/src/main/java/com/ffii/fpsms/modules/report/web/ReportController.kt index 816098bd..185d807b 100644 --- a/src/main/java/com/ffii/fpsms/modules/report/web/ReportController.kt +++ b/src/main/java/com/ffii/fpsms/modules/report/web/ReportController.kt @@ -1063,6 +1063,7 @@ class ReportController( return out.toByteArray() } + /** FP-MTMS Version Checklist | Functions Ref. No. 87 | v1.0.0 | 2026-09-28 */ private fun createStockBalanceExcel( dbData: List>, reportDate: String, @@ -1139,6 +1140,9 @@ class ReportController( } val widths = intArrayOf(14, 26, 10, 12, 12, 12, 14, 12, 12, 12, 12, 14) widths.forEachIndexed { i, w -> sheet.setColumnWidth(i, w * 256) } + // Keep 單位均價 and 庫存總價值 in the sheet, but hide them for now. + sheet.setColumnHidden(10, true) + sheet.setColumnHidden(11, true) val out = ByteArrayOutputStream() workbook.use { it.write(out) } diff --git a/src/main/java/com/ffii/fpsms/modules/report/web/StockLotOnhandReportController.kt b/src/main/java/com/ffii/fpsms/modules/report/web/StockLotOnhandReportController.kt index 041b6cab..6718b7fb 100644 --- a/src/main/java/com/ffii/fpsms/modules/report/web/StockLotOnhandReportController.kt +++ b/src/main/java/com/ffii/fpsms/modules/report/web/StockLotOnhandReportController.kt @@ -191,7 +191,7 @@ class StockLotOnhandReportController( return v } - /** FP-MTMS Version Checklist | Functions Ref. No. 68 | v1.0.1 | 2026-09-07 */ + /** FP-MTMS Version Checklist | Functions Ref. No. 68 | v1.0.2 | 2026-09-28 */ private fun createExcel( dbData: List>, reportDate: String, @@ -310,6 +310,9 @@ class StockLotOnhandReportController( sheet.createFreezePane(0, headerRowIndex + 1) intArrayOf(14, 28, 14, 8, 20, 12, 10, 12, 10, 10, 12, 20, 12, 12, 14) .forEachIndexed { i, w -> sheet.setColumnWidth(i, w * 256) } + // Keep 單位均價 and 庫存總價值 in the sheet, but hide them for now. + sheet.setColumnHidden(13, true) + sheet.setColumnHidden(14, true) val out = ByteArrayOutputStream() workbook.write(out) diff --git a/src/main/resources/jasper/StockBalanceReport.jrxml b/src/main/resources/jasper/StockBalanceReport.jrxml index 072560bc..2feb7101 100644 --- a/src/main/resources/jasper/StockBalanceReport.jrxml +++ b/src/main/resources/jasper/StockBalanceReport.jrxml @@ -1,5 +1,6 @@ + @@ -77,6 +78,7 @@ + @@ -163,6 +165,7 @@ + @@ -405,6 +408,7 @@ + @@ -416,6 +420,7 @@ +