stock take report update

src/main/java/com/ffii/fpsms/modules/report/web/StockTakeVarianceReportController.kt

@@ -35,8 +35,8 @@ class StockTakeVarianceReportController(
         @RequestParam(required = false) stockCategory: String?,
         @RequestParam(required = false) itemCode: String?,
         @RequestParam(required = false) storeLocation: String?,
-        @RequestParam(name = "startDateStart", required = false) lastInDateStart: String?,
-        @RequestParam(name = "startDateEnd", required = false) lastInDateEnd: String?,
+        @RequestParam(required = false) lastInDateStart: String?,
+        @RequestParam(required = false) lastInDateEnd: String?,
     ): ResponseEntity<ByteArray> {
         val parameters = mutableMapOf<String, Any>()
 
@@ -56,6 +56,8 @@ class StockTakeVarianceReportController(
         parameters["lastOutDateStart"] = ""
         parameters["lastOutDateEnd"] = ""
 
+
+
         val dbData = stockTakeVarianceReportService.searchStockTakeVarianceReport(
             stockCategory = stockCategory,
             itemCode = itemCode,
@@ -63,6 +65,13 @@ class StockTakeVarianceReportController(
             lastInDateStart = lastInDateStart,
             lastInDateEnd = lastInDateEnd,
         )
+        val stockTakeDateDisplay = dbData
+            .mapNotNull { it["stockTakeDate"] as? String }
+            .filter { it.isNotBlank() }
+            .maxOrNull()
+            ?: ""
+
+        parameters["stockTakeDate"] = stockTakeDateDisplay
 
         val pdfBytes = reportService.createPdfResponse(
             "/jasper/StockTakeVarianceReport.jrxml",

src/main/resources/jasper/StockTakeVarianceReport.jrxml

@@ -13,6 +13,7 @@
 	<parameter name="year" class="java.lang.String"/>
 	<parameter name="reportDate" class="java.lang.String"/>
 	<parameter name="reportTime" class="java.lang.String"/>
+	<parameter name="stockTakeDate" class="java.lang.String"/>
 	<parameter name="storeLocation" class="java.lang.String">
 		<parameterDescription><![CDATA["storeLocation"]]></parameterDescription>
 	</parameter>
@@ -57,13 +58,14 @@
 	<field name="stockTakeQty" class="java.lang.String"/>
 	<field name="variance" class="java.lang.String"/>
 	<field name="variancePercentage" class="java.lang.String"/>
+	
 	<group name="Group1" keepTogether="true" preventOrphanFooter="true">
 		<groupExpression><![CDATA[$F{itemNo}]]></groupExpression>
 		<groupHeader>
 			<band height="19">
 				<textField textAdjust="StretchHeight">
 					<reportElement x="10" y="0" width="579" height="18" uuid="89a0d4b3-860b-4fa9-b8b4-cb1d9a19b053"/>
-					<textElement textAlignment="Left" verticalAlignment="Top" markup="styled">
+					<textElement textAlignment="Left" verticalAlignment="Top" markup="none">
 						<font fontName="微軟正黑體" isBold="true"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$F{itemNo}+"   "+$F{itemName}+"   "+$F{unitOfMeasure}]]></textFieldExpression>
@@ -156,14 +158,14 @@
 				<textElement verticalAlignment="Middle">
 					<font fontName="微軟正黑體" size="12" isBold="true"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$P{reportDate}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{reportDate} + "(" + $P{reportTime}+")"]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement x="708" y="29" width="90" height="23" uuid="d117e97e-8158-4aef-9e48-d19456c4073c"/>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
 					<font fontName="微軟正黑體" size="12" isBold="true"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$P{reportTime}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{stockTakeDate}]]></textFieldExpression>
 			</textField>
 			<staticText>
 				<reportElement x="747" y="0" width="21" height="23" uuid="5a1b4b58-b7b1-48c9-b229-7e96392c6425">
@@ -191,7 +193,7 @@
 				<textElement textAlignment="Left" verticalAlignment="Middle">
 					<font fontName="微軟正黑體" size="12" isBold="true"/>
 				</textElement>
-				<text><![CDATA[報告時間：]]></text>
+				<text><![CDATA[盤點日期：]]></text>
 			</staticText>
 			<staticText>
 				<reportElement x="10" y="30" width="90" height="23" uuid="0628b331-5736-4f93-bed3-2278011456aa">