From 2b4e19150754ecbfcda996c4764a665e847d073f Mon Sep 17 00:00:00 2001
From: "B.E.N.S.O.N" <bensonhkbus@gmail.com>
Date: Mon, 16 Feb 2026 17:13:56 +0800
Subject: [PATCH] Report Update

---
 .../resources/jasper/FGDeliveryReport.jrxml   | 10 ++-
 .../jasper/FGStockOutTraceabilityReport.jrxml | 29 ++++----
 src/main/resources/jasper/ItemQCReport.jrxml  |  4 +-
 .../jasper/MaterialStockOutTraceability.jrxml | 14 ++--
 .../resources/jasper/StockBalanceReport.jrxml | 16 ++---
 .../jasper/StockInTraceabilityReport.jrxml    | 10 ++-
 .../resources/jasper/StockLedgarReport.jrxml  | 67 +++++++------------
 .../jasper/StockTakeVarianceReport.jrxml      | 10 ++-
 8 files changed, 83 insertions(+), 77 deletions(-)

diff --git a/src/main/resources/jasper/FGDeliveryReport.jrxml b/src/main/resources/jasper/FGDeliveryReport.jrxml
index 0cfcd75..53b3819 100644
--- a/src/main/resources/jasper/FGDeliveryReport.jrxml
+++ b/src/main/resources/jasper/FGDeliveryReport.jrxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Jaspersoft Studio version 6.17.0.final using JasperReports Library version 6.17.0-6d93193241dd8cc42629e188b94f9e0bc5722efd  -->
+<!-- Created with Jaspersoft Studio version 6.21.3.final using JasperReports Library version 6.21.3-4a3078d20785ebe464f18037d738d12fc98c13cf  -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="FGStockOutTraceabilityReport" pageWidth="842" pageHeight="595" orientation="Landscape" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="c40e235b-365d-48a0-a1b8-a8e0ece2cdd3">
 	<property name="com.jaspersoft.studio.unit." value="pixel"/>
 	<property name="com.jaspersoft.studio.unit.pageHeight" value="pixel"/>
@@ -65,7 +65,7 @@
 	<field name="deliveryOrderNo" class="java.lang.String"/>
 	<field name="stockSubCategory" class="java.lang.String"/>
 	<variable name="totalDeliveredQtyPerDeliveryOrder" class="java.math.BigDecimal" resetType="Group" resetGroup="Group1" incrementType="Group" incrementGroup="Group1" calculation="Sum">
-    <variableExpression><![CDATA[$F{qtyNumeric} != null ? $F{qtyNumeric} : java.math.BigDecimal.ZERO]]></variableExpression>
+		<variableExpression><![CDATA[$F{qtyNumeric} != null ? $F{qtyNumeric} : java.math.BigDecimal.ZERO]]></variableExpression>
 	</variable>
 	<group name="Group1" keepTogether="true">
 		<groupExpression><![CDATA[$F{itemNo}]]></groupExpression>
@@ -102,6 +102,12 @@
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 				</line>
+				<line>
+					<reportElement x="424" y="0" width="158" height="1" uuid="e6aafc03-9f85-4fbb-aabe-c10f936cea7e">
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+					</reportElement>
+				</line>
 			</band>
 			<band height="1">
 				<printWhenExpression><![CDATA[$V{Group1_COUNT}  == 1]]></printWhenExpression>
diff --git a/src/main/resources/jasper/FGStockOutTraceabilityReport.jrxml b/src/main/resources/jasper/FGStockOutTraceabilityReport.jrxml
index 42e6930..7fe5400 100644
--- a/src/main/resources/jasper/FGStockOutTraceabilityReport.jrxml
+++ b/src/main/resources/jasper/FGStockOutTraceabilityReport.jrxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Jaspersoft Studio version 6.17.0.final using JasperReports Library version 6.17.0-6d93193241dd8cc42629e188b94f9e0bc5722efd  -->
+<!-- Created with Jaspersoft Studio version 6.21.3.final using JasperReports Library version 6.21.3-4a3078d20785ebe464f18037d738d12fc98c13cf  -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="SemiFGProductionAnalysisReport" pageWidth="842" pageHeight="595" orientation="Landscape" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="a2a84586-3f53-476e-9c1f-6b13ad75908a">
 	<property name="com.jaspersoft.studio.data.sql.tables" value=""/>
 	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/>
@@ -75,18 +75,18 @@
 			<band height="19">
 				<printWhenExpression><![CDATA[$V{Group1_COUNT}  > 1]]></printWhenExpression>
 				<staticText>
-					<reportElement x="298" y="0" width="190" height="18" uuid="73188a51-3255-443c-9fee-4f3b527072c4">
+					<reportElement x="410" y="0" width="80" height="18" uuid="73188a51-3255-443c-9fee-4f3b527072c4">
 						<property name="com.jaspersoft.studio.unit.y" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
-					<textElement textAlignment="Right" verticalAlignment="Top">
+					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
 					<text><![CDATA[總出倉量：]]></text>
 				</staticText>
 				<textField>
 					<reportElement x="490" y="0" width="59" height="18" uuid="e4734789-5213-4934-80fe-6d72f3c38f23"/>
-					<textElement textAlignment="Right" verticalAlignment="Top">
+					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font fontName="微軟正黑體"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$F{totalStockOutQty}]]></textFieldExpression>
@@ -96,6 +96,11 @@
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 				</line>
+				<line>
+					<reportElement x="410" y="0" width="139" height="1" uuid="852c4909-06c6-436d-8545-3620beb6e255">
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+					</reportElement>
+				</line>
 			</band>
 			<band height="1">
 				<printWhenExpression><![CDATA[$V{Group1_COUNT}  == 1]]></printWhenExpression>
@@ -224,7 +229,7 @@
 				</textElement>
 				<text><![CDATA[存貨位置]]></text>
 			</staticText>
-				<staticText>
+			<staticText>
 				<reportElement x="10" y="80" width="80" height="18" uuid="5db44150-7e52-40dc-9fab-fe174d818c61">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
@@ -324,13 +329,13 @@
 	</pageHeader>
 	<detail>
 		<band height="17" splitType="Stretch">
-		<textField textAdjust="StretchHeight">
-			<reportElement x="10" y="0" width="80" height="17" uuid="d1e2f3a4-b5c6-4d7e-8f90-1234567890ab"/>
-			<textElement textAlignment="Center" verticalAlignment="Top">
-				<font fontName="微軟正黑體" size="10"/>
-			</textElement>
-			<textFieldExpression><![CDATA[$F{deliveryDate}]]></textFieldExpression>
-		</textField>
+			<textField textAdjust="StretchHeight">
+				<reportElement x="10" y="0" width="80" height="17" uuid="d1e2f3a4-b5c6-4d7e-8f90-1234567890ab"/>
+				<textElement textAlignment="Center" verticalAlignment="Top">
+					<font fontName="微軟正黑體" size="10"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{deliveryDate}]]></textFieldExpression>
+			</textField>
 			<textField textAdjust="StretchHeight">
 				<reportElement x="90" y="0" width="120" height="17" uuid="78ffaf9e-52c3-4d50-94ac-73f826d2448a">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
diff --git a/src/main/resources/jasper/ItemQCReport.jrxml b/src/main/resources/jasper/ItemQCReport.jrxml
index 72c1115..fdb7fdb 100644
--- a/src/main/resources/jasper/ItemQCReport.jrxml
+++ b/src/main/resources/jasper/ItemQCReport.jrxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Jaspersoft Studio version 6.17.0.final using JasperReports Library version 6.17.0-6d93193241dd8cc42629e188b94f9e0bc5722efd  -->
+<!-- Created with Jaspersoft Studio version 6.21.3.final using JasperReports Library version 6.21.3-4a3078d20785ebe464f18037d738d12fc98c13cf  -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="ItemQCReport" pageWidth="842" pageHeight="595" orientation="Landscape" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="6a86bad3-14fb-475b-b1eb-824e47f43432">
 	<subDataset name="Empty Dataset1" uuid="b8103bc4-ba4d-4924-9104-c2a6b6737612"/>
 	<parameter name="stockSubCategory" class="java.lang.String">
@@ -186,7 +186,7 @@
 				<textElement textAlignment="Left" verticalAlignment="Middle">
 					<font fontName="微軟正黑體" size="10"/>
 				</textElement>
-				<text><![CDATA[品質問題點]]></text>
+				<text><![CDATA[品質問題]]></text>
 			</staticText>
 			<line>
 				<reportElement x="0" y="98" width="799" height="1" uuid="726e7b1b-ad52-448c-8ad8-c091106d74dc">
diff --git a/src/main/resources/jasper/MaterialStockOutTraceability.jrxml b/src/main/resources/jasper/MaterialStockOutTraceability.jrxml
index 76150f7..caa7b9b 100644
--- a/src/main/resources/jasper/MaterialStockOutTraceability.jrxml
+++ b/src/main/resources/jasper/MaterialStockOutTraceability.jrxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Jaspersoft Studio version 6.17.0.final using JasperReports Library version 6.17.0-6d93193241dd8cc42629e188b94f9e0bc5722efd  -->
+<!-- Created with Jaspersoft Studio version 6.21.3.final using JasperReports Library version 6.21.3-4a3078d20785ebe464f18037d738d12fc98c13cf  -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="MaterialStockOutTraceability" pageWidth="842" pageHeight="595" orientation="Landscape" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="70a1aa41-cdaf-4e67-a3f4-b5983ddcf764">
 	<parameter name="stockSubCategory" class="java.lang.String">
 		<defaultValueExpression><![CDATA["stockSubCategory"]]></defaultValueExpression>
@@ -70,18 +70,18 @@
 			<band height="19">
 				<printWhenExpression><![CDATA[$V{Group1_COUNT}  > 1]]></printWhenExpression>
 				<staticText>
-					<reportElement x="220" y="0" width="190" height="18" uuid="127b8d9e-7af6-4973-bb72-e96ed062dcc9">
+					<reportElement x="330" y="0" width="80" height="18" uuid="127b8d9e-7af6-4973-bb72-e96ed062dcc9">
 						<property name="com.jaspersoft.studio.unit.y" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
-					<textElement textAlignment="Right" verticalAlignment="Top">
+					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
 					<text><![CDATA[總出倉量：]]></text>
 				</staticText>
 				<textField>
 					<reportElement x="410" y="0" width="59" height="18" uuid="bef3e158-73d3-40dc-8cc7-29f93f54113f"/>
-					<textElement textAlignment="Right" verticalAlignment="Top">
+					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font fontName="微軟正黑體"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$F{totalStockOutQty}]]></textFieldExpression>
@@ -91,6 +91,12 @@
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 				</line>
+				<line>
+					<reportElement x="330" y="0" width="139" height="1" uuid="69129436-53ea-4be6-960a-994170b025cc">
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+					</reportElement>
+				</line>
 			</band>
 			<band height="1">
 				<printWhenExpression><![CDATA[$V{Group1_COUNT}  == 1]]></printWhenExpression>
diff --git a/src/main/resources/jasper/StockBalanceReport.jrxml b/src/main/resources/jasper/StockBalanceReport.jrxml
index 958a7f6..4bdc237 100644
--- a/src/main/resources/jasper/StockBalanceReport.jrxml
+++ b/src/main/resources/jasper/StockBalanceReport.jrxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Jaspersoft Studio version 6.17.0.final using JasperReports Library version 6.17.0-6d93193241dd8cc42629e188b94f9e0bc5722efd  -->
+<!-- Created with Jaspersoft Studio version 6.21.3.final using JasperReports Library version 6.21.3-4a3078d20785ebe464f18037d738d12fc98c13cf  -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="StockBalanceReport" pageWidth="842" pageHeight="595" orientation="Landscape" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="b6cc79a8-6025-4490-938c-b90508da62d0">
 	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/>
 	<parameter name="stockSubCategory" class="java.lang.String">
@@ -87,7 +87,7 @@
 			<band height="19">
 				<printWhenExpression><![CDATA[$V{Group1_COUNT}  > 1]]></printWhenExpression>
 				<staticText>
-					<reportElement x="190" y="0" width="70" height="18" uuid="d10fdf4f-4a2a-439c-9877-125998c975db">
+					<reportElement x="260" y="0" width="60" height="18" uuid="d10fdf4f-4a2a-439c-9877-125998c975db">
 						<property name="com.jaspersoft.studio.unit.y" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
@@ -106,13 +106,6 @@
 					</textElement>
 					<textFieldExpression><![CDATA[$F{totalCumStockIn}]]></textFieldExpression>
 				</textField>
-				<textField>
-					<reportElement x="260" y="0" width="60" height="18" uuid="0a1320e0-dbbc-4da4-bc1e-ca3d21323ad8"/>
-					<textElement textAlignment="Right" verticalAlignment="Top">
-						<font fontName="微軟正黑體"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{totalOpeningBalance}]]></textFieldExpression>
-				</textField>
 				<textField>
 					<reportElement x="380" y="0" width="60" height="18" uuid="d2bc3efc-fd44-42b8-b451-7b6bc5e77cea">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
@@ -134,6 +127,11 @@
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 				</line>
+				<line>
+					<reportElement x="260" y="0" width="431" height="1" uuid="eaaa7506-fc74-4f38-be61-e3cb56968baa">
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+					</reportElement>
+				</line>
 			</band>
 			<band height="1">
 				<printWhenExpression><![CDATA[$V{Group1_COUNT}  == 1]]></printWhenExpression>
diff --git a/src/main/resources/jasper/StockInTraceabilityReport.jrxml b/src/main/resources/jasper/StockInTraceabilityReport.jrxml
index 09dc8d1..5a0b805 100644
--- a/src/main/resources/jasper/StockInTraceabilityReport.jrxml
+++ b/src/main/resources/jasper/StockInTraceabilityReport.jrxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Jaspersoft Studio version 6.17.0.final using JasperReports Library version 6.17.0-6d93193241dd8cc42629e188b94f9e0bc5722efd  -->
+<!-- Created with Jaspersoft Studio version 6.21.3.final using JasperReports Library version 6.21.3-4a3078d20785ebe464f18037d738d12fc98c13cf  -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="StockInTraceability" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="AllSectionsNoDetail" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="ed7bc020-85fe-4ae0-83d4-107bf939c670">
 	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/>
 	<parameter name="stockSubCategory" class="java.lang.String">
@@ -79,7 +79,7 @@
 			<band height="19">
 				<printWhenExpression><![CDATA[$V{Group1_COUNT}  > 1]]></printWhenExpression>
 				<staticText>
-					<reportElement x="210" y="0" width="70" height="18" uuid="8d002bea-8762-4e6b-9101-35a570f55031">
+					<reportElement x="220" y="0" width="60" height="18" uuid="8d002bea-8762-4e6b-9101-35a570f55031">
 						<property name="com.jaspersoft.studio.unit.y" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
@@ -121,6 +121,12 @@
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 				</line>
+				<line>
+					<reportElement x="220" y="0" width="210" height="1" uuid="106fbbc0-1931-4b67-8733-adb5dcd6096f">
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+					</reportElement>
+				</line>
 			</band>
 			<band height="1">
 				<printWhenExpression><![CDATA[$V{Group1_COUNT}  == 1]]></printWhenExpression>
diff --git a/src/main/resources/jasper/StockLedgarReport.jrxml b/src/main/resources/jasper/StockLedgarReport.jrxml
index 152f398..70f7923 100644
--- a/src/main/resources/jasper/StockLedgarReport.jrxml
+++ b/src/main/resources/jasper/StockLedgarReport.jrxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Jaspersoft Studio version 6.17.0.final using JasperReports Library version 6.17.0-6d93193241dd8cc42629e188b94f9e0bc5722efd  -->
+<!-- Created with Jaspersoft Studio version 6.21.3.final using JasperReports Library version 6.21.3-4a3078d20785ebe464f18037d738d12fc98c13cf  -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="StockLedgar" pageWidth="842" pageHeight="595" orientation="Landscape" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="974e3bea-4152-4549-a4d3-4aff6abf0b82">
 	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/>
 	<parameter name="reportDate" class="java.lang.String"/>
@@ -90,7 +90,7 @@
 			<band height="19">
 				<printWhenExpression><![CDATA[$V{Group1_COUNT}  > 1]]></printWhenExpression>
 				<staticText>
-					<reportElement x="284" y="0" width="75" height="18" uuid="518b1512-2f82-48ca-b334-652fe5991b72">
+					<reportElement x="359" y="0" width="57" height="18" uuid="518b1512-2f82-48ca-b334-652fe5991b72">
 						<property name="com.jaspersoft.studio.unit.y" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
@@ -100,15 +100,6 @@
 					</textElement>
 					<text><![CDATA[貨品總量：]]></text>
 				</staticText>
-				<textField textAdjust="StretchHeight" pattern="#,##0">
-					<reportElement x="359" y="0" width="57" height="18" uuid="44b1dc52-ca89-43b5-9828-31db7207ad22">
-						<property name="com.jaspersoft.studio.unit.width" value="px"/>
-					</reportElement>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font fontName="微軟正黑體"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{totalCumOpeningBal}]]></textFieldExpression>
-				</textField>
 				<textField pattern="#,##0">
 					<reportElement x="416" y="0" width="50" height="18" uuid="6c141d7d-766e-49bf-b987-e790312573a5">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
@@ -131,7 +122,7 @@
 					<reportElement x="524" y="0" width="66" height="18" uuid="636bf782-3020-4b49-837e-53ede91d1443">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
-					<textElement textAlignment="Right" verticalAlignment="Top">
+					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font fontName="微軟正黑體"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$F{totalCumBalance}]]></textFieldExpression>
@@ -141,6 +132,12 @@
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 				</line>
+				<line>
+					<reportElement x="359" y="0" width="230" height="1" uuid="23707f96-cc2a-46fd-8be1-9baface3ee85">
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+					</reportElement>
+				</line>
 			</band>
 			<band height="1">
 				<printWhenExpression><![CDATA[$V{Group1_COUNT}  == 1]]></printWhenExpression>
@@ -153,7 +150,7 @@
 		</groupFooter>
 	</group>
 	<pageHeader>
-		<band height="117" splitType="Stretch">
+		<band height="96" splitType="Stretch">
 			<staticText>
 				<reportElement x="324" y="5" width="165" height="23" uuid="61492f60-688d-4110-b8d2-fcc5b5b24ba7">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
@@ -164,36 +161,18 @@
 				</textElement>
 				<text><![CDATA[庫存明細報告]]></text>
 			</staticText>
-			<staticText>
-				<reportElement x="10" y="53" width="90" height="23" uuid="231d8082-a2fb-42fd-9980-cef8382bdeb5">
-					<property name="com.jaspersoft.studio.unit.y" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Left" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="12" isBold="true"/>
-				</textElement>
-				<text><![CDATA[查詢期間：]]></text>
-			</staticText>
-			<textField>
-				<reportElement x="100" y="53" width="490" height="23" uuid="3b98b6fa-9b8c-4248-9fb9-5923888c9569">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="12" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{reportPeriodStart}+ " 到 " + $P{reportPeriodEnd}]]></textFieldExpression>
-			</textField>
 			<line>
-				<reportElement x="2" y="80" width="799" height="1" uuid="33569f74-fee4-43c9-9bfe-b6bf7e12ecd4">
+				<reportElement x="2" y="55" width="799" height="1" uuid="33569f74-fee4-43c9-9bfe-b6bf7e12ecd4">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 			</line>
 			<line>
-				<reportElement x="2" y="84" width="799" height="1" uuid="da028dee-9baa-4df1-b79f-b1c042a73a6c">
+				<reportElement x="2" y="57" width="799" height="1" uuid="da028dee-9baa-4df1-b79f-b1c042a73a6c">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 			</line>
 			<staticText>
-				<reportElement x="416" y="84" width="50" height="32" uuid="75d5ce02-8001-4f6f-85ae-88c6c21c038a">
+				<reportElement x="416" y="60" width="50" height="32" uuid="75d5ce02-8001-4f6f-85ae-88c6c21c038a">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
@@ -203,7 +182,7 @@
 				<text><![CDATA[入庫]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="704" y="84" width="94" height="32" uuid="bb54ccd3-e003-4eba-9d95-d2c9c84767a5">
+				<reportElement x="704" y="60" width="94" height="32" uuid="bb54ccd3-e003-4eba-9d95-d2c9c84767a5">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
@@ -214,7 +193,7 @@
 				<text><![CDATA[存貨位置]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="159" y="84" width="125" height="32" uuid="1a37e08c-8c54-462f-9a2d-876fc665cdba">
+				<reportElement x="159" y="60" width="125" height="32" uuid="1a37e08c-8c54-462f-9a2d-876fc665cdba">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
@@ -225,7 +204,7 @@
 				<text><![CDATA[批號]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="11" y="84" width="78" height="32" uuid="29d7c8b3-689f-46c6-8283-ebc81c12e3b9">
+				<reportElement x="11" y="60" width="78" height="32" uuid="29d7c8b3-689f-46c6-8283-ebc81c12e3b9">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
@@ -236,7 +215,7 @@
 				<text><![CDATA[出入賬日期]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="524" y="84" width="66" height="32" uuid="12c55779-4875-4d8b-914c-9bbf4dcd64ff">
+				<reportElement x="524" y="60" width="66" height="32" uuid="12c55779-4875-4d8b-914c-9bbf4dcd64ff">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
@@ -246,7 +225,7 @@
 				<text><![CDATA[纍計存量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="592" y="84" width="112" height="32" uuid="19e06f3b-0c2a-4e9e-b436-79c21d497ebb">
+				<reportElement x="592" y="60" width="112" height="32" uuid="19e06f3b-0c2a-4e9e-b436-79c21d497ebb">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
@@ -256,7 +235,7 @@
 				<text><![CDATA[參考編號]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="466" y="84" width="50" height="32" uuid="86dcb3cb-197d-458e-9530-d2f4de6e5980">
+				<reportElement x="466" y="60" width="50" height="32" uuid="86dcb3cb-197d-458e-9530-d2f4de6e5980">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
@@ -267,7 +246,7 @@
 				<text><![CDATA[出庫]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="97" y="84" width="62" height="32" uuid="8fde28bc-907f-406e-9efc-b1e2ff54d819">
+				<reportElement x="97" y="60" width="62" height="32" uuid="8fde28bc-907f-406e-9efc-b1e2ff54d819">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
@@ -278,7 +257,7 @@
 				<text><![CDATA[類型]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="359" y="84" width="57" height="32" uuid="9bfc6cdc-28da-4533-a349-5951fd3bdb8d">
+				<reportElement x="359" y="60" width="57" height="32" uuid="9bfc6cdc-28da-4533-a349-5951fd3bdb8d">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
@@ -289,7 +268,7 @@
 存量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="284" y="84" width="75" height="32" uuid="42332f71-1b1f-4cef-a8c8-c2e66f125cb7">
+				<reportElement x="284" y="60" width="75" height="32" uuid="42332f71-1b1f-4cef-a8c8-c2e66f125cb7">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
@@ -299,7 +278,7 @@
 				<text><![CDATA[到期日]]></text>
 			</staticText>
 			<line>
-				<reportElement x="2" y="116" width="799" height="1" uuid="25601617-e2c7-4daf-829d-4525fdde0b6a">
+				<reportElement x="2" y="93" width="799" height="1" uuid="25601617-e2c7-4daf-829d-4525fdde0b6a">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 			</line>
diff --git a/src/main/resources/jasper/StockTakeVarianceReport.jrxml b/src/main/resources/jasper/StockTakeVarianceReport.jrxml
index f219e3c..053bd37 100644
--- a/src/main/resources/jasper/StockTakeVarianceReport.jrxml
+++ b/src/main/resources/jasper/StockTakeVarianceReport.jrxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Jaspersoft Studio version 6.17.0.final using JasperReports Library version 6.17.0-6d93193241dd8cc42629e188b94f9e0bc5722efd  -->
+<!-- Created with Jaspersoft Studio version 6.21.3.final using JasperReports Library version 6.21.3-4a3078d20785ebe464f18037d738d12fc98c13cf  -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="StockTakeVarianceReport" pageWidth="842" pageHeight="595" orientation="Landscape" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="f00b4a24-af11-4263-9e82-3966acf01017">
 	<parameter name="stockSubCategory" class="java.lang.String">
 		<defaultValueExpression><![CDATA["stockSubCategory"]]></defaultValueExpression>
@@ -75,7 +75,7 @@
 				<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
 				<printWhenExpression><![CDATA[$V{Group1_COUNT}  > 1]]></printWhenExpression>
 				<staticText>
-					<reportElement isPrintRepeatedValues="false" x="272" y="0" width="72" height="18" isRemoveLineWhenBlank="true" printWhenGroupChanges="Group1" uuid="73e4fded-40e2-44d5-b789-34a33978ed5a">
+					<reportElement isPrintRepeatedValues="false" x="273" y="0" width="70" height="18" isRemoveLineWhenBlank="true" printWhenGroupChanges="Group1" uuid="73e4fded-40e2-44d5-b789-34a33978ed5a">
 						<property name="com.jaspersoft.studio.unit.y" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
@@ -101,6 +101,12 @@
 						<printWhenExpression><![CDATA[$V{Group1_COUNT} > 1]]></printWhenExpression>
 					</reportElement>
 				</line>
+				<line>
+					<reportElement x="273" y="0" width="135" height="1" uuid="57591898-c7d7-43ef-a078-9ca155d03a8c">
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+					</reportElement>
+				</line>
 			</band>
 			<band height="1">
 				<printWhenExpression><![CDATA[$V{Group1_COUNT}  == 1]]></printWhenExpression>