From 0447c82f313632b828d576e0056261588e264328 Mon Sep 17 00:00:00 2001
From: "Tommy\\2Fi-Staff" <tommy.lu@2fi-solutions.com.hk>
Date: Sat, 14 Feb 2026 02:34:02 +0800
Subject: [PATCH] report update

---
 .../resources/jasper/FGDeliveryReport.jrxml   |  10 +-
 .../jasper/FGStockOutTraceabilityReport.jrxml | 202 ++++---
 src/main/resources/jasper/ItemQCReport.jrxml  | 223 ++++----
 .../jasper/MaterialStockOutTraceability.jrxml | 218 ++++----
 .../SemiFGProductionAnalysisReport.jrxml      |  23 +-
 .../resources/jasper/StockBalanceReport.jrxml | 525 ++++++++----------
 .../jasper/StockInTraceabilityReport.jrxml    | 273 ++++-----
 .../StockItemConsumptionTrendReport.jrxml     |  15 +-
 .../resources/jasper/StockLedgarReport.jrxml  | 215 ++++---
 .../jasper/StockTakeVarianceReport.jrxml      | 287 +++-------
 10 files changed, 880 insertions(+), 1111 deletions(-)

diff --git a/src/main/resources/jasper/FGDeliveryReport.jrxml b/src/main/resources/jasper/FGDeliveryReport.jrxml
index 729347b..1a1cc5a 100644
--- a/src/main/resources/jasper/FGDeliveryReport.jrxml
+++ b/src/main/resources/jasper/FGDeliveryReport.jrxml
@@ -248,7 +248,7 @@
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
+				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font fontName="微軟正黑體" size="10"/>
 				</textElement>
 				<text><![CDATA[單位]]></text>
@@ -259,7 +259,7 @@
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
+				<textElement textAlignment="Left" verticalAlignment="Middle">
 					<font fontName="微軟正黑體" size="10"/>
 				</textElement>
 				<text><![CDATA[DN編號]]></text>
@@ -270,7 +270,7 @@
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
+				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font fontName="微軟正黑體" size="10"/>
 				</textElement>
 				<text><![CDATA[數量]]></text>
@@ -281,7 +281,7 @@
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
+				<textElement textAlignment="Left" verticalAlignment="Middle">
 					<font fontName="微軟正黑體" size="10"/>
 				</textElement>
 				<text><![CDATA[送貨訂單編號]]></text>
@@ -292,7 +292,7 @@
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
+				<textElement textAlignment="Left" verticalAlignment="Middle">
 					<font fontName="微軟正黑體" size="10"/>
 				</textElement>
 				<text><![CDATA[門店名稱]]></text>
diff --git a/src/main/resources/jasper/FGStockOutTraceabilityReport.jrxml b/src/main/resources/jasper/FGStockOutTraceabilityReport.jrxml
index c32637b..96ac844 100644
--- a/src/main/resources/jasper/FGStockOutTraceabilityReport.jrxml
+++ b/src/main/resources/jasper/FGStockOutTraceabilityReport.jrxml
@@ -62,7 +62,7 @@
 		<groupHeader>
 			<band height="18">
 				<textField textAdjust="StretchHeight">
-					<reportElement isPrintRepeatedValues="false" x="0" y="0" width="579" height="18" printWhenGroupChanges="Group1" uuid="55eabe3a-e291-4cac-a5bf-3ad3f9a8b3a7"/>
+					<reportElement isPrintRepeatedValues="false" x="10" y="0" width="579" height="18" printWhenGroupChanges="Group1" uuid="55eabe3a-e291-4cac-a5bf-3ad3f9a8b3a7"/>
 					<textElement textAlignment="Left" verticalAlignment="Top" markup="styled">
 						<font fontName="微軟正黑體" isBold="true"/>
 					</textElement>
@@ -74,7 +74,7 @@
 			<band height="19">
 				<printWhenExpression><![CDATA[$V{Group1_COUNT}  > 1]]></printWhenExpression>
 				<staticText>
-					<reportElement x="210" y="0" width="190" height="18" uuid="73188a51-3255-443c-9fee-4f3b527072c4">
+					<reportElement x="220" y="0" width="190" 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>
@@ -84,7 +84,7 @@
 					<text><![CDATA[總出倉量：]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="400" y="0" width="59" height="18" uuid="e4734789-5213-4934-80fe-6d72f3c38f23"/>
+					<reportElement x="410" y="0" width="59" height="18" uuid="e4734789-5213-4934-80fe-6d72f3c38f23"/>
 					<textElement textAlignment="Right" verticalAlignment="Top">
 						<font fontName="微軟正黑體"/>
 					</textElement>
@@ -111,89 +111,16 @@
 	</background>
 	<pageHeader>
 		<band height="99">
-			<textField evaluationTime="Report">
-				<reportElement x="780" y="2" width="20" height="18" uuid="8ebe39b1-11cd-4058-a4c5-a32de40e2235">
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="微軟正黑體"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement x="700" y="2" width="40" height="18" uuid="72b82b4b-6d4d-4b58-860a-1d5fcdc5b1ca">
-					<property name="com.jaspersoft.studio.unit.y" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="12"/>
-				</textElement>
-				<text><![CDATA[頁數]]></text>
-			</staticText>
-			<textField>
-				<reportElement x="740" y="2" width="20" height="18" uuid="e00bc834-695d-4b57-a95b-b6628d45ae9b">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="微軟正黑體"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement x="760" y="2" width="20" height="18" uuid="de9992f2-b449-46a5-a38b-d5af9dc2754f">
-					<property name="com.jaspersoft.studio.unit.y" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="12"/>
-				</textElement>
-				<text><![CDATA[/]]></text>
-			</staticText>
 			<line>
 				<reportElement x="0" y="79" width="799" height="1" uuid="8d4d2060-74a7-486f-9647-d0f12e817e0a">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 			</line>
 			<line>
-				<reportElement x="0" y="75" width="799" height="1" uuid="bf9e8b27-bbc8-4e9a-92e6-0874549f6d29">
+				<reportElement x="0" y="76" width="799" height="1" uuid="bf9e8b27-bbc8-4e9a-92e6-0874549f6d29">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 			</line>
-			<staticText>
-				<reportElement x="0" y="25" width="110" height="23" uuid="e57917d9-23c2-45fe-9d23-a799b975755a">
-					<property name="com.jaspersoft.studio.unit.y" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Left" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="16" isBold="true"/>
-				</textElement>
-				<text><![CDATA[報告日期：]]></text>
-			</staticText>
-			<textField>
-				<reportElement x="110" y="25" width="190" height="23" uuid="867346a2-5f97-425c-a9b9-34fa8ce513d0"/>
-				<textElement verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="16" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{reportDate}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement x="570" y="25" width="228" height="23" uuid="65cfb017-1dfb-4a15-a21a-6fb2399de1b0"/>
-				<textElement verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="16" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{reportTime}]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement x="480" y="25" width="90" height="23" uuid="d5b2cd04-3c71-4d7d-90ef-9e4cd38918af">
-					<property name="com.jaspersoft.studio.unit.y" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Left" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="16" isBold="true"/>
-				</textElement>
-				<text><![CDATA[報告時間：]]></text>
-			</staticText>
 			<staticText>
 				<reportElement x="275" y="0" width="253" height="23" uuid="2b4bdbda-a606-455e-b4c7-f59ada12dcf4">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
@@ -205,36 +132,36 @@
 				<text><![CDATA[成品出倉追蹤報告]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="0" y="49" width="110" height="23" uuid="297107ea-5827-41bc-83a0-8d966b714e0f">
-					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+				<reportElement x="10" y="53" width="90" height="23" uuid="297107ea-5827-41bc-83a0-8d966b714e0f">
+					<property name="com.jaspersoft.studio.unit.y" value="pixel"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 				</reportElement>
-				<textElement textAlignment="Left" verticalAlignment="Top">
-					<font fontName="微軟正黑體" size="16" isBold="true"/>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="12" isBold="true"/>
 				</textElement>
 				<text><![CDATA[最後出倉日期:]]></text>
 			</staticText>
 			<textField>
-				<reportElement x="110" y="49" width="560" height="23" uuid="76ed89e6-9e70-4cc3-9d38-ff5dc24cd094"/>
-				<textElement textAlignment="Left" verticalAlignment="Top">
-					<font fontName="微軟正黑體" size="16" isBold="true"/>
+				<reportElement x="100" y="53" width="560" height="23" uuid="76ed89e6-9e70-4cc3-9d38-ff5dc24cd094"/>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="12" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$P{lastOutDateStart} +  " 到 " + $P{lastOutDateEnd}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement x="400" y="80" width="59" height="18" uuid="7950d513-4660-445b-9b18-08e062b66f30">
+				<reportElement x="410" y="80" width="59" height="18" uuid="7950d513-4660-445b-9b18-08e062b66f30">
 					<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"/>
 				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
+				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font fontName="微軟正黑體" size="10"/>
 				</textElement>
 				<text><![CDATA[出貨數量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="320" y="80" width="80" height="18" uuid="a2e0f22f-b299-4712-84f7-7ba3b54b1d1c">
+				<reportElement x="330" y="80" width="80" height="18" uuid="a2e0f22f-b299-4712-84f7-7ba3b54b1d1c">
 					<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"/>
@@ -245,7 +172,7 @@
 				<text><![CDATA[到期日]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="120" y="80" width="100" height="18" uuid="ccda69a3-43de-413b-b53c-1b572e92fcf8">
+				<reportElement x="130" y="80" width="100" height="18" uuid="ccda69a3-43de-413b-b53c-1b572e92fcf8">
 					<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"/>
@@ -256,7 +183,7 @@
 				<text><![CDATA[提料單編號]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="459" y="80" width="49" height="18" uuid="21d9afe9-fd02-4896-a478-60967afc50f4">
+				<reportElement x="469" y="80" width="49" height="18" uuid="21d9afe9-fd02-4896-a478-60967afc50f4">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
@@ -266,7 +193,7 @@
 				<text><![CDATA[提料人]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="220" y="80" width="100" height="18" uuid="03fc341e-7026-4f5e-b975-264097a7aeda">
+				<reportElement x="230" y="80" width="100" height="18" uuid="03fc341e-7026-4f5e-b975-264097a7aeda">
 					<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"/>
@@ -277,17 +204,17 @@
 				<text><![CDATA[批號]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="620" y="80" width="180" height="18" uuid="0f155dfc-0aff-4935-aa8f-54b4f01af51e">
+				<reportElement x="630" y="80" width="168" height="18" uuid="0f155dfc-0aff-4935-aa8f-54b4f01af51e">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="10"/>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="10" isItalic="false"/>
 				</textElement>
 				<text><![CDATA[提料備注]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="508" y="80" width="112" height="18" uuid="b20762b2-25ab-4fde-a693-a8b32776d866">
+				<reportElement x="518" y="80" width="112" height="18" uuid="b20762b2-25ab-4fde-a693-a8b32776d866">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
@@ -297,7 +224,7 @@
 				<text><![CDATA[存貨位置]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="0" y="80" width="120" height="18" uuid="5db44150-7e52-40dc-9fab-fe174d818c61">
+				<reportElement x="10" y="80" width="120" 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"/>
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
@@ -312,12 +239,81 @@
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 			</line>
+			<staticText>
+				<reportElement x="747" y="0" width="21" height="23" uuid="86ad35af-c50b-4fc5-a9dd-57f8a8520203">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="12"/>
+				</textElement>
+				<text><![CDATA[/]]></text>
+			</staticText>
+			<textField>
+				<reportElement x="708" y="29" width="90" height="23" uuid="5243088f-4b30-4e69-90bd-eae06fe1eb38"/>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="12" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{reportTime}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="717" y="0" width="30" height="23" uuid="fc8051b6-9dec-43f8-9483-5af643d19a90">
+					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="10" y="30" width="90" height="23" uuid="9ab6647d-c771-4c0c-aab9-a07d96a7f0eb">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="12" isBold="true"/>
+				</textElement>
+				<text><![CDATA[報告日期：]]></text>
+			</staticText>
+			<textField evaluationTime="Report">
+				<reportElement x="768" y="0" width="30" height="23" uuid="0bd93c84-e6c8-4613-afec-12632071b737">
+					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="100" y="30" width="335" height="23" uuid="c7784751-a50c-4288-b65d-1f52973e95a3"/>
+				<textElement verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="12" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{reportDate}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="677" y="0" width="40" height="23" uuid="b5981ff6-676f-46c8-85bc-137714e60964">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="12"/>
+				</textElement>
+				<text><![CDATA[頁數]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="640" y="29" width="68" height="23" uuid="53e03c14-32a0-4cdd-a883-542d6acb931a">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="12" isBold="true"/>
+				</textElement>
+				<text><![CDATA[報告時間：]]></text>
+			</staticText>
 		</band>
 	</pageHeader>
 	<detail>
 		<band height="17" splitType="Stretch">
 			<textField textAdjust="StretchHeight">
-				<reportElement x="0" y="0" width="120" height="17" uuid="78ffaf9e-52c3-4d50-94ac-73f826d2448a">
+				<reportElement x="10" y="0" width="120" height="17" uuid="78ffaf9e-52c3-4d50-94ac-73f826d2448a">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 				</reportElement>
@@ -327,49 +323,49 @@
 				<textFieldExpression><![CDATA[$F{deliveryOrderNo}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="120" y="0" width="100" height="17" uuid="939193b3-e573-4e5d-af6c-da58910f03a1"/>
+				<reportElement x="130" y="0" width="100" height="17" uuid="939193b3-e573-4e5d-af6c-da58910f03a1"/>
 				<textElement verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{stockReqNo}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="220" y="0" width="100" height="17" uuid="92aae78d-2b61-4e61-9b18-574a9a7d515c"/>
+				<reportElement x="230" y="0" width="100" height="17" uuid="92aae78d-2b61-4e61-9b18-574a9a7d515c"/>
 				<textElement verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{lotNo}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="320" y="0" width="80" height="17" uuid="696e6d6c-101c-4e4e-b0c8-b3aabefb78ab"/>
+				<reportElement x="330" y="0" width="80" height="17" uuid="696e6d6c-101c-4e4e-b0c8-b3aabefb78ab"/>
 				<textElement textAlignment="Center" verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{expiryDate}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="400" y="0" width="59" height="17" uuid="45523cc4-2b5b-4a1b-8bfc-db16158a92dc"/>
+				<reportElement x="410" y="0" width="59" height="17" uuid="45523cc4-2b5b-4a1b-8bfc-db16158a92dc"/>
 				<textElement textAlignment="Right" verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{stockOutQty}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="459" y="0" width="49" height="17" uuid="6384ebfc-6d01-404a-bea1-73d4e4ac5fc3"/>
+				<reportElement x="469" y="0" width="49" height="17" uuid="6384ebfc-6d01-404a-bea1-73d4e4ac5fc3"/>
 				<textElement textAlignment="Center" verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{handler}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="508" y="0" width="112" height="17" uuid="bb1402fd-a96e-4345-b48c-7aeeeadbf57d"/>
+				<reportElement x="518" y="0" width="112" height="17" uuid="bb1402fd-a96e-4345-b48c-7aeeeadbf57d"/>
 				<textElement textAlignment="Center" verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{storeLocation}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="620" y="0" width="180" height="17" uuid="35b41bee-4246-4cc7-ab30-4966c185a73b"/>
+				<reportElement x="630" y="0" width="168" height="17" uuid="35b41bee-4246-4cc7-ab30-4966c185a73b"/>
 				<textElement verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
 				</textElement>
diff --git a/src/main/resources/jasper/ItemQCReport.jrxml b/src/main/resources/jasper/ItemQCReport.jrxml
index 6486abc..72c1115 100644
--- a/src/main/resources/jasper/ItemQCReport.jrxml
+++ b/src/main/resources/jasper/ItemQCReport.jrxml
@@ -57,7 +57,7 @@
 			<band height="18">
 				<property name="com.jaspersoft.studio.layout" value="com.jaspersoft.studio.editor.layout.FreeLayout"/>
 				<textField textAdjust="StretchHeight">
-					<reportElement isPrintRepeatedValues="false" x="0" y="0" width="579" height="18" uuid="2e1dc204-1626-43ee-97eb-bcfa745b2ff1"/>
+					<reportElement isPrintRepeatedValues="false" x="10" y="0" width="579" height="18" uuid="2e1dc204-1626-43ee-97eb-bcfa745b2ff1"/>
 					<textElement textAlignment="Left" verticalAlignment="Top" markup="styled">
 						<font fontName="微軟正黑體" isBold="true"/>
 					</textElement>
@@ -79,90 +79,17 @@
 		<band splitType="Stretch"/>
 	</background>
 	<pageHeader>
-		<band height="108" splitType="Stretch">
-			<textField evaluationTime="Report">
-				<reportElement x="780" y="12" width="20" height="18" uuid="54f6d70c-9c04-4980-9151-f748ccd4a5d4">
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="微軟正黑體"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement x="700" y="12" width="40" height="18" uuid="9fea4333-624c-4163-a2d1-c88b92815d46">
-					<property name="com.jaspersoft.studio.unit.y" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="12"/>
-				</textElement>
-				<text><![CDATA[頁數]]></text>
-			</staticText>
-			<textField>
-				<reportElement x="740" y="12" width="20" height="18" uuid="9a639fc7-4866-4b46-9ff2-e9f9dffb37e4">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="微軟正黑體"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement x="760" y="12" width="20" height="18" uuid="6685b6ed-fe0d-4669-8e3a-61cb60a141f0">
-					<property name="com.jaspersoft.studio.unit.y" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="12"/>
-				</textElement>
-				<text><![CDATA[/]]></text>
-			</staticText>
+		<band height="99" splitType="Stretch">
 			<line>
-				<reportElement x="0" y="88" width="799" height="1" uuid="ac02dc33-cb8d-4e70-8bcc-42285159d0bc">
+				<reportElement x="0" y="80" width="799" height="1" uuid="ac02dc33-cb8d-4e70-8bcc-42285159d0bc">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 			</line>
 			<line>
-				<reportElement x="0" y="84" width="799" height="1" uuid="b4baa70b-6211-49e6-95f4-218c624647e0">
+				<reportElement x="0" y="76" width="799" height="1" uuid="b4baa70b-6211-49e6-95f4-218c624647e0">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 			</line>
-			<staticText>
-				<reportElement x="0" y="35" width="90" height="23" uuid="89236d28-ff56-412a-9152-62bff0f29c11">
-					<property name="com.jaspersoft.studio.unit.y" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Left" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="16" isBold="true"/>
-				</textElement>
-				<text><![CDATA[報告日期：]]></text>
-			</staticText>
-			<textField>
-				<reportElement x="90" y="35" width="390" height="23" uuid="6b152aab-d180-47cc-892a-1038ac7a3650"/>
-				<textElement verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="16" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{reportDate}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement x="570" y="35" width="228" height="23" uuid="fa8aead3-618b-45fa-b535-46246fa0f415"/>
-				<textElement verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="16" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{reportTime}]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement x="480" y="35" width="90" height="23" uuid="0b9c0ce6-b5a0-4c12-985a-e14eb7a59467">
-					<property name="com.jaspersoft.studio.unit.y" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Left" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="16" isBold="true"/>
-				</textElement>
-				<text><![CDATA[報告時間：]]></text>
-			</staticText>
 			<staticText>
 				<reportElement x="322" y="0" width="158" height="23" uuid="0102d5e8-f072-4701-abff-8f62a4dc8463">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
@@ -174,24 +101,7 @@
 				<text><![CDATA[庫存品質檢測報告]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="1" y="58" width="118" height="23" uuid="b26146a6-0083-4e43-8466-e6e32e3e0120">
-					<property name="com.jaspersoft.studio.unit.y" value="px"/>
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Left" verticalAlignment="Top">
-					<font fontName="微軟正黑體" size="16" isBold="true"/>
-				</textElement>
-				<text><![CDATA[最後入倉日期：]]></text>
-			</staticText>
-			<textField>
-				<reportElement x="120" y="58" width="298" height="23" uuid="9fa63848-5dd3-400f-ad19-0671365361c5"/>
-				<textElement textAlignment="Left" verticalAlignment="Top">
-					<font fontName="微軟正黑體" size="16" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{lastInDateStart} +  " 到 " + $P{lastInDateEnd}]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement x="590" y="89" width="90" height="18" uuid="e36d0d94-9345-46d2-8fa5-604676255cba">
+				<reportElement x="600" y="80" width="90" height="18" uuid="e36d0d94-9345-46d2-8fa5-604676255cba">
 					<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"/>
@@ -202,7 +112,7 @@
 				<text><![CDATA[備注]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="80" y="89" width="70" height="18" uuid="7db4a800-8573-408c-baad-f4f4885625c9">
+				<reportElement x="90" y="80" width="70" height="18" uuid="7db4a800-8573-408c-baad-f4f4885625c9">
 					<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"/>
@@ -213,18 +123,18 @@
 				<text><![CDATA[品質檢查類型]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="490" y="89" width="50" height="18" uuid="808b9adc-e79f-469b-89f8-a4d8035d0b02">
+				<reportElement x="490" y="80" width="50" height="18" uuid="808b9adc-e79f-469b-89f8-a4d8035d0b02">
 					<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"/>
 				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
+				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font fontName="微軟正黑體" size="10"/>
 				</textElement>
 				<text><![CDATA[數量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="150" y="89" width="160" height="18" uuid="f6036ff2-a00e-4809-bcb2-f4e86fb1ccf7">
+				<reportElement x="160" y="80" width="160" height="18" uuid="f6036ff2-a00e-4809-bcb2-f4e86fb1ccf7">
 					<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"/>
@@ -235,7 +145,7 @@
 				<text><![CDATA[品質檢查樣板]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="0" y="89" width="80" height="18" uuid="67fc8d08-74ed-4e63-af62-4bf566c2bea4">
+				<reportElement x="10" y="80" width="80" height="18" uuid="67fc8d08-74ed-4e63-af62-4bf566c2bea4">
 					<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"/>
@@ -246,18 +156,18 @@
 				<text><![CDATA[到期日]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="540" y="89" width="50" height="18" uuid="7d8c7616-20d1-4081-853b-34bf90711d8f">
+				<reportElement x="550" y="80" width="50" height="18" uuid="7d8c7616-20d1-4081-853b-34bf90711d8f">
 					<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"/>
 				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
+				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font fontName="微軟正黑體" size="10"/>
 				</textElement>
 				<text><![CDATA[瑕疵品數量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="680" y="89" width="120" height="18" uuid="8b11690e-d04c-4402-9436-dba241594b9a">
+				<reportElement x="690" y="80" width="108" height="18" uuid="8b11690e-d04c-4402-9436-dba241594b9a">
 					<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"/>
@@ -268,48 +178,135 @@
 				<text><![CDATA[參考編號]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="320" y="89" width="170" height="18" uuid="26c0ec07-f36c-4f9a-8b9c-5e485bdd501e">
+				<reportElement x="330" y="80" width="160" height="18" uuid="26c0ec07-f36c-4f9a-8b9c-5e485bdd501e">
 					<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"/>
 				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
+				<textElement textAlignment="Left" verticalAlignment="Middle">
 					<font fontName="微軟正黑體" size="10"/>
 				</textElement>
 				<text><![CDATA[品質問題點]]></text>
 			</staticText>
 			<line>
-				<reportElement x="0" y="107" width="799" height="1" uuid="726e7b1b-ad52-448c-8ad8-c091106d74dc">
+				<reportElement x="0" y="98" width="799" height="1" uuid="726e7b1b-ad52-448c-8ad8-c091106d74dc">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 			</line>
+			<textField evaluationTime="Report">
+				<reportElement x="768" y="0" width="30" height="23" uuid="c70ffa4e-4a94-4f79-b849-249f71ab8fc4">
+					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="717" y="0" width="30" height="23" uuid="d7f500db-9b11-4fa7-b1e2-e31648986858">
+					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="747" y="0" width="21" height="23" uuid="0af6c3ee-f85d-4a9b-bc51-558d2848f492">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="12"/>
+				</textElement>
+				<text><![CDATA[/]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="677" y="0" width="40" height="23" uuid="e6d84133-39ab-4405-be2c-abdcd968076e">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="12"/>
+				</textElement>
+				<text><![CDATA[頁數]]></text>
+			</staticText>
+			<textField>
+				<reportElement x="708" y="29" width="90" height="23" uuid="2531fea1-1a06-4c5b-9be5-c2f615d98dac"/>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="12" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{reportTime}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="640" y="29" width="68" height="23" uuid="8160cd29-88e8-495b-b0ff-b816df69d2c2">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="12" isBold="true"/>
+				</textElement>
+				<text><![CDATA[報告時間：]]></text>
+			</staticText>
+			<textField>
+				<reportElement x="100" y="30" width="335" height="23" uuid="20007ca4-c3e0-4e46-b05f-53ca15e9494f"/>
+				<textElement verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="12" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{reportDate}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="10" y="30" width="90" height="23" uuid="a5e6b095-e0c8-4200-911f-cdf9fbc953b1">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="12" isBold="true"/>
+				</textElement>
+				<text><![CDATA[報告日期：]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="10" y="53" width="90" height="23" uuid="91156739-c0e2-4cd2-b4a5-a1bcef9a1eea">
+					<property name="com.jaspersoft.studio.unit.y" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+					<property name="com.jaspersoft.studio.unit.width" 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="560" height="23" uuid="96afd73f-53ed-42cd-9911-fdaac017d65b"/>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="12" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{lastInDateStart} +  " 到 " + $P{lastInDateEnd}]]></textFieldExpression>
+			</textField>
 		</band>
 	</pageHeader>
 	<detail>
 		<band height="20" splitType="Stretch">
 			<textField textAdjust="StretchHeight">
-				<reportElement x="0" y="0" width="80" height="17" uuid="2f60426c-0d94-483f-8851-2b9d73b438e3"/>
+				<reportElement x="10" y="0" width="80" height="17" uuid="2f60426c-0d94-483f-8851-2b9d73b438e3"/>
 				<textElement textAlignment="Center" verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{expiryDate}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="80" y="0" width="70" height="17" uuid="c738c90c-e341-420f-ac76-4ee2660b038f"/>
+				<reportElement x="90" y="0" width="70" height="17" uuid="c738c90c-e341-420f-ac76-4ee2660b038f"/>
 				<textElement textAlignment="Center" verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{qcType}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="150" y="0" width="160" height="17" uuid="6e149a04-1b03-4ac6-8c54-c15ae889365d"/>
+				<reportElement x="160" y="0" width="160" height="17" uuid="6e149a04-1b03-4ac6-8c54-c15ae889365d"/>
 				<textElement textAlignment="Center" verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{qcTemplate}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="320" y="0" width="170" height="17" uuid="e079b438-f9e4-443d-a3f3-c0805292292c"/>
+				<reportElement x="330" y="0" width="160" height="17" uuid="e079b438-f9e4-443d-a3f3-c0805292292c"/>
 				<textElement textAlignment="Left" verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
 				</textElement>
@@ -323,21 +320,21 @@
 				<textFieldExpression><![CDATA[$F{lotQty}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="540" y="0" width="50" height="17" uuid="ffa7b57b-4036-40b7-a6b0-d5e217afbb3b"/>
+				<reportElement x="550" y="0" width="50" height="17" uuid="ffa7b57b-4036-40b7-a6b0-d5e217afbb3b"/>
 				<textElement textAlignment="Right" verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{defectQty}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="590" y="0" width="90" height="17" uuid="9fb029a9-a16e-48d3-870e-d63af808faab"/>
+				<reportElement x="600" y="0" width="90" height="17" uuid="9fb029a9-a16e-48d3-870e-d63af808faab"/>
 				<textElement textAlignment="Center" verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{refData}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="680" y="0" width="120" height="17" uuid="a5e52468-0ed0-4dfb-a305-2873273101c0"/>
+				<reportElement x="690" y="0" width="108" height="17" uuid="a5e52468-0ed0-4dfb-a305-2873273101c0"/>
 				<textElement textAlignment="Center" verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
 				</textElement>
diff --git a/src/main/resources/jasper/MaterialStockOutTraceability.jrxml b/src/main/resources/jasper/MaterialStockOutTraceability.jrxml
index b2f0135..76150f7 100644
--- a/src/main/resources/jasper/MaterialStockOutTraceability.jrxml
+++ b/src/main/resources/jasper/MaterialStockOutTraceability.jrxml
@@ -58,7 +58,7 @@
 		<groupHeader>
 			<band height="18">
 				<textField textAdjust="StretchHeight">
-					<reportElement x="3" y="0" width="579" height="18" uuid="8988ea44-8c61-49ef-a4c1-1c382299d651"/>
+					<reportElement x="10" y="0" width="579" height="18" uuid="8988ea44-8c61-49ef-a4c1-1c382299d651"/>
 					<textElement textAlignment="Left" verticalAlignment="Top" markup="styled">
 						<font fontName="微軟正黑體" isBold="true"/>
 					</textElement>
@@ -70,7 +70,7 @@
 			<band height="19">
 				<printWhenExpression><![CDATA[$V{Group1_COUNT}  > 1]]></printWhenExpression>
 				<staticText>
-					<reportElement x="210" y="0" width="190" height="18" uuid="127b8d9e-7af6-4973-bb72-e96ed062dcc9">
+					<reportElement x="220" y="0" width="190" 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>
@@ -80,7 +80,7 @@
 					<text><![CDATA[總出倉量：]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="400" y="0" width="59" height="18" uuid="bef3e158-73d3-40dc-8cc7-29f93f54113f"/>
+					<reportElement x="410" y="0" width="59" height="18" uuid="bef3e158-73d3-40dc-8cc7-29f93f54113f"/>
 					<textElement textAlignment="Right" verticalAlignment="Top">
 						<font fontName="微軟正黑體"/>
 					</textElement>
@@ -107,45 +107,6 @@
 	</background>
 	<pageHeader>
 		<band height="99" splitType="Stretch">
-			<textField evaluationTime="Report">
-				<reportElement x="780" y="2" width="20" height="18" uuid="8e4c063b-81a9-4d2f-854c-f848bf4f7360">
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="微軟正黑體"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement x="700" y="2" width="40" height="18" uuid="1a7ea384-c006-440a-8bfc-e89d5aa069a8">
-					<property name="com.jaspersoft.studio.unit.y" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="12"/>
-				</textElement>
-				<text><![CDATA[頁數]]></text>
-			</staticText>
-			<textField>
-				<reportElement x="740" y="2" width="20" height="18" uuid="3e9443de-9543-4560-8f00-4e8648313e5c">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="微軟正黑體"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement x="760" y="2" width="20" height="18" uuid="ce2c0dcc-1973-4758-aa68-264d242cd806">
-					<property name="com.jaspersoft.studio.unit.y" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="12"/>
-				</textElement>
-				<text><![CDATA[/]]></text>
-			</staticText>
 			<line>
 				<reportElement x="0" y="79" width="799" height="1" uuid="588519b2-2b53-447d-a94a-f5323a5071b6">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
@@ -167,59 +128,7 @@
 				<text><![CDATA[物料出倉追蹤報告]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="0" y="49" width="110" height="23" uuid="f01ce41d-c561-428a-820b-c5e8eed55d87">
-					<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"/>
-				</reportElement>
-				<textElement textAlignment="Left" verticalAlignment="Top">
-					<font fontName="微軟正黑體" size="16" isBold="true"/>
-				</textElement>
-				<text><![CDATA[最後出倉日期:]]></text>
-			</staticText>
-			<staticText>
-				<reportElement x="0" y="25" width="110" height="23" uuid="a610a1ce-08d6-4ab7-be60-1dbc5ec68c20">
-					<property name="com.jaspersoft.studio.unit.y" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Left" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="16" isBold="true"/>
-				</textElement>
-				<text><![CDATA[報告日期：]]></text>
-			</staticText>
-			<textField>
-				<reportElement x="110" y="25" width="190" height="23" uuid="be91f7fa-1711-4947-981e-905380b80cdf"/>
-				<textElement verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="16" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{reportDate}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement x="570" y="25" width="228" height="23" uuid="b5159c59-5811-45ef-9f88-39207dc8450f"/>
-				<textElement verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="16" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{reportTime}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement x="110" y="49" width="560" height="23" uuid="05970209-7fd1-40c6-9d9e-c19570093c09"/>
-				<textElement textAlignment="Left" verticalAlignment="Top">
-					<font fontName="微軟正黑體" size="16" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{lastOutDateStart} +  " 到 " + $P{lastOutDateEnd}]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement x="480" y="25" width="90" height="23" uuid="260cd63a-86e2-4b6f-93f7-94c264067173">
-					<property name="com.jaspersoft.studio.unit.y" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Left" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="16" isBold="true"/>
-				</textElement>
-				<text><![CDATA[報告時間：]]></text>
-			</staticText>
-			<staticText>
-				<reportElement x="459" y="80" width="49" height="18" uuid="c17221d2-b543-4558-a530-e2b0fe57815c">
+				<reportElement x="469" y="80" width="61" height="18" uuid="c17221d2-b543-4558-a530-e2b0fe57815c">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
@@ -229,7 +138,7 @@
 				<text><![CDATA[提料人]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="120" y="80" width="100" height="18" uuid="58633e83-5a17-4b4c-91fb-0a1e95377b78">
+				<reportElement x="130" y="80" width="100" height="18" uuid="58633e83-5a17-4b4c-91fb-0a1e95377b78">
 					<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"/>
@@ -240,7 +149,7 @@
 				<text><![CDATA[提料單編號]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="220" y="80" width="100" height="18" uuid="72c185c0-02bd-44c3-9a95-b8a8b118a5b8">
+				<reportElement x="230" y="80" width="100" height="18" uuid="72c185c0-02bd-44c3-9a95-b8a8b118a5b8">
 					<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"/>
@@ -251,7 +160,7 @@
 				<text><![CDATA[批號]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="0" y="80" width="120" height="18" uuid="53dda4bc-e6ba-40de-8bdb-cf9dc0803b23">
+				<reportElement x="10" y="80" width="120" height="18" uuid="53dda4bc-e6ba-40de-8bdb-cf9dc0803b23">
 					<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"/>
@@ -262,7 +171,7 @@
 				<text><![CDATA[工單編號]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="508" y="80" width="112" height="18" uuid="5faf317c-4814-4507-ae8d-21652d8642ef">
+				<reportElement x="530" y="80" width="100" height="18" uuid="5faf317c-4814-4507-ae8d-21652d8642ef">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
@@ -272,7 +181,7 @@
 				<text><![CDATA[存倉位置]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="320" y="80" width="80" height="18" uuid="fab273cc-7a7b-4598-be08-b1473ab32124">
+				<reportElement x="330" y="80" width="80" height="18" uuid="fab273cc-7a7b-4598-be08-b1473ab32124">
 					<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"/>
@@ -283,7 +192,7 @@
 				<text><![CDATA[到期日]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="620" y="80" width="180" height="18" uuid="74f1c031-48f4-4b36-baed-1d3fd973b7ad">
+				<reportElement x="630" y="80" width="168" height="18" uuid="74f1c031-48f4-4b36-baed-1d3fd973b7ad">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
@@ -293,12 +202,12 @@
 				<text><![CDATA[提料備注]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="400" y="80" width="59" height="18" uuid="1f547265-a0c6-472f-8c99-c2ea25c9a6d5">
+				<reportElement x="410" y="80" width="59" height="18" uuid="1f547265-a0c6-472f-8c99-c2ea25c9a6d5">
 					<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"/>
 				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
+				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font fontName="微軟正黑體" size="10"/>
 				</textElement>
 				<text><![CDATA[出貨數量]]></text>
@@ -308,12 +217,99 @@
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 			</line>
+			<textField evaluationTime="Report">
+				<reportElement x="768" y="0" width="30" height="23" uuid="010c90fe-b9b9-497c-b32e-b2a5ade48e9e">
+					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="717" y="0" width="30" height="23" uuid="5e94aa7a-e7ab-4779-afb6-df011bcf725d">
+					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="747" y="0" width="21" height="23" uuid="d2c5e646-3885-4941-b1f0-98496d3bd553">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="12"/>
+				</textElement>
+				<text><![CDATA[/]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="677" y="0" width="40" height="23" uuid="70764071-b438-4548-a01d-d3bbaf01ad62">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="12"/>
+				</textElement>
+				<text><![CDATA[頁數]]></text>
+			</staticText>
+			<textField>
+				<reportElement x="708" y="29" width="90" height="23" uuid="55961375-1d81-4195-ae09-dbad03027460"/>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="12" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{reportTime}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="640" y="29" width="68" height="23" uuid="60125685-7c9e-443d-afcb-8257836a7b0f">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="12" isBold="true"/>
+				</textElement>
+				<text><![CDATA[報告時間：]]></text>
+			</staticText>
+			<textField>
+				<reportElement x="100" y="30" width="335" height="23" uuid="7e22315e-2b61-4d91-8c35-454a29a54440"/>
+				<textElement verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="12" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{reportDate}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="10" y="30" width="90" height="23" uuid="3dc4c597-8c09-424a-afcd-6fe9ae70137d">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="12" isBold="true"/>
+				</textElement>
+				<text><![CDATA[報告日期：]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="10" y="53" width="90" height="23" uuid="7582a23b-1cd1-4058-b072-62d9a1b1f12a">
+					<property name="com.jaspersoft.studio.unit.y" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+					<property name="com.jaspersoft.studio.unit.width" 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="560" height="23" uuid="fb36cc91-4daf-439c-955e-148b0586bc95"/>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="12" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{lastOutDateStart} +  " 到 " + $P{lastOutDateEnd}]]></textFieldExpression>
+			</textField>
 		</band>
 	</pageHeader>
 	<detail>
 		<band height="17" splitType="Stretch">
 			<textField textAdjust="StretchHeight">
-				<reportElement x="0" y="0" width="120" height="17" uuid="5f8e4b35-01b2-4fb1-96c4-47fbc6f8d1a6">
+				<reportElement x="10" y="0" width="120" height="17" uuid="5f8e4b35-01b2-4fb1-96c4-47fbc6f8d1a6">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 				</reportElement>
@@ -323,49 +319,49 @@
 				<textFieldExpression><![CDATA[$F{jobOrderNo}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="120" y="0" width="100" height="17" uuid="b7492ff2-eb72-42cb-ab6e-73181dd2daa8"/>
+				<reportElement x="130" y="0" width="100" height="17" uuid="b7492ff2-eb72-42cb-ab6e-73181dd2daa8"/>
 				<textElement verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{stockReqNo}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="620" y="0" width="180" height="17" uuid="37e635a3-bb5b-4435-8508-414a373f7002"/>
+				<reportElement x="630" y="0" width="168" height="17" uuid="37e635a3-bb5b-4435-8508-414a373f7002"/>
 				<textElement verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{pickRemark}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="508" y="0" width="112" height="17" uuid="9df68816-6fde-4922-8ce0-b7234e076029"/>
+				<reportElement x="530" y="0" width="100" height="17" uuid="9df68816-6fde-4922-8ce0-b7234e076029"/>
 				<textElement textAlignment="Center" verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{storeLocation}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="220" y="0" width="100" height="17" uuid="cdf35daf-76bd-4244-9c5f-4dec5fc38740"/>
+				<reportElement x="230" y="0" width="100" height="17" uuid="cdf35daf-76bd-4244-9c5f-4dec5fc38740"/>
 				<textElement verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{lotNo}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="459" y="0" width="49" height="17" uuid="0c22894f-8cca-4a97-a0d4-d069b99631b0"/>
+				<reportElement x="469" y="0" width="61" height="17" uuid="0c22894f-8cca-4a97-a0d4-d069b99631b0"/>
 				<textElement textAlignment="Center" verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{handler}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="320" y="0" width="80" height="17" uuid="044e670f-8c24-41bc-9865-153eeefec098"/>
+				<reportElement x="330" y="0" width="80" height="17" uuid="044e670f-8c24-41bc-9865-153eeefec098"/>
 				<textElement textAlignment="Center" verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{expiryDate}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="400" y="0" width="59" height="17" uuid="66a8a739-66f8-4f86-9f02-5de5c2520aef"/>
+				<reportElement x="410" y="0" width="59" height="17" uuid="66a8a739-66f8-4f86-9f02-5de5c2520aef"/>
 				<textElement textAlignment="Right" verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
 				</textElement>
diff --git a/src/main/resources/jasper/SemiFGProductionAnalysisReport.jrxml b/src/main/resources/jasper/SemiFGProductionAnalysisReport.jrxml
index c58947f..63524a7 100644
--- a/src/main/resources/jasper/SemiFGProductionAnalysisReport.jrxml
+++ b/src/main/resources/jasper/SemiFGProductionAnalysisReport.jrxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Jaspersoft Studio version 6.21.3.final using JasperReports Library version 6.21.3-4a3078d20785ebe464f18037d738d12fc98c13cf  -->
+<!-- Created with Jaspersoft Studio version 6.17.0.final using JasperReports Library version 6.17.0-6d93193241dd8cc42629e188b94f9e0bc5722efd  -->
 <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="055685d6-c02e-403a-8511-48e9df2752d3">
 	<property name="com.jaspersoft.studio.unit." value="pixel"/>
 	<property name="com.jaspersoft.studio.unit.pageHeight" value="pixel"/>
@@ -356,7 +356,7 @@
 		</groupHeader>
 	</group>
 	<pageHeader>
-		<band height="86" splitType="Stretch">
+		<band height="84" splitType="Stretch">
 			<property name="com.jaspersoft.studio.unit.height" value="px"/>
 			<textField evaluationTime="Report">
 				<reportElement x="768" y="0" width="30" height="23" uuid="6e9ed0a2-e1e6-4533-a786-f086b868a84c">
@@ -404,14 +404,14 @@
 				<text><![CDATA[報告日期：]]></text>
 			</staticText>
 			<textField>
-				<reportElement x="738" y="52" width="60" height="23" uuid="53b66bc3-4925-4340-add0-b4f2069a76c1"/>
+				<reportElement x="708" y="52" width="90" height="23" uuid="53b66bc3-4925-4340-add0-b4f2069a76c1"/>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
 					<font fontName="微軟正黑體" size="12" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$P{year}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement x="670" y="29" width="68" height="23" uuid="e2be43a3-3570-4a4e-a671-d96f872a5ad7">
+				<reportElement x="640" y="29" width="68" height="23" uuid="e2be43a3-3570-4a4e-a671-d96f872a5ad7">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
@@ -421,7 +421,7 @@
 				<text><![CDATA[報告時間：]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="670" y="52" width="68" height="23" uuid="29ed871d-3417-4978-9799-964389143451">
+				<reportElement x="640" y="52" width="68" height="23" uuid="29ed871d-3417-4978-9799-964389143451">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
@@ -431,14 +431,14 @@
 				<text><![CDATA[年份：]]></text>
 			</staticText>
 			<textField>
-				<reportElement x="738" y="29" width="60" height="23" uuid="cb1fbb06-e953-40e5-bdbe-5fc219f7c884"/>
+				<reportElement x="708" y="29" width="90" height="23" uuid="cb1fbb06-e953-40e5-bdbe-5fc219f7c884"/>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
 					<font fontName="微軟正黑體" size="12" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$P{reportTime}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="100" y="30" width="190" height="23" uuid="d398cf17-318c-4c16-a8bf-6f064e911965"/>
+				<reportElement x="100" y="30" width="335" height="23" uuid="d398cf17-318c-4c16-a8bf-6f064e911965"/>
 				<textElement verticalAlignment="Middle">
 					<font fontName="微軟正黑體" size="12" isBold="true"/>
 				</textElement>
@@ -475,7 +475,12 @@
 				<text><![CDATA[完成生產日期:]]></text>
 			</staticText>
 			<line>
-				<reportElement x="2" y="80" width="799" height="1" uuid="9e9ba4e3-e369-4180-b01b-1b581e8fa00d">
+				<reportElement x="0" y="75" width="799" height="1" uuid="f04b0470-72e7-42b6-80fd-f1dc4ea5fa66">
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+			</line>
+			<line>
+				<reportElement x="0" y="79" width="799" height="1" uuid="4eca2d8d-89d2-44a9-a89e-b7a4c8080413">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 			</line>
@@ -613,7 +618,7 @@
 				<text><![CDATA[四月]]></text>
 			</staticText>
 			<line>
-				<reportElement x="2" y="23" width="799" height="1" uuid="ad5d85ce-e7fe-46c0-9b37-76b2ed3f4152">
+				<reportElement x="1" y="23" width="799" height="1" uuid="ad5d85ce-e7fe-46c0-9b37-76b2ed3f4152">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 			</line>
diff --git a/src/main/resources/jasper/StockBalanceReport.jrxml b/src/main/resources/jasper/StockBalanceReport.jrxml
index 6bb3e8d..61db3fb 100644
--- a/src/main/resources/jasper/StockBalanceReport.jrxml
+++ b/src/main/resources/jasper/StockBalanceReport.jrxml
@@ -63,248 +63,103 @@
 	<field name="reOrderLevel" class="java.lang.String"/>
 	<field name="reOrderQty" class="java.lang.String"/>
 	<field name="storeLocation" class="java.lang.String"/>
+	<field name="misInputAndLost" class="java.lang.String"/>
+	<field name="totalMisInputAndLost" class="java.lang.String"/>
+	<field name="totalVariance" class="java.lang.String"/>
+	<field name="totalDefectiveGoods" class="java.lang.String"/>
+	<field name="lastMovementDate" class="java.lang.String"/>
+	<field name="defectiveGoods" class="java.lang.String"/>
+	<field name="variance" class="java.lang.String"/>
 	<group name="Group1" keepTogether="true">
 		<groupExpression><![CDATA[$F{itemNo}]]></groupExpression>
 		<groupHeader>
-			<band height="42">
-				<staticText>
-					<reportElement x="0" y="23" width="120" height="18" uuid="aa7590f2-5ce0-4877-b98d-b197fa799fee">
-						<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"/>
-					</reportElement>
-					<textElement textAlignment="Left" verticalAlignment="Middle">
-						<font fontName="微軟正黑體" size="10"/>
-					</textElement>
-					<text><![CDATA[批號]]></text>
-				</staticText>
-				<staticText>
-					<reportElement x="120" y="23" width="80" height="18" uuid="a78ad88c-d542-4a5f-9662-c3f9f90776b8">
-						<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"/>
-					</reportElement>
-					<textElement textAlignment="Left" verticalAlignment="Middle">
-						<font fontName="微軟正黑體" size="10"/>
-					</textElement>
-					<text><![CDATA[到期日]]></text>
-				</staticText>
-				<staticText>
-					<reportElement x="200" y="23" width="50" height="18" uuid="360cf13a-93e7-45d4-8a4d-9e9506a6ad3f">
-						<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"/>
-					</reportElement>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
-						<font fontName="微軟正黑體" size="10"/>
-					</textElement>
-					<text><![CDATA[期初存量]]></text>
-				</staticText>
-				<staticText>
-					<reportElement x="250" y="23" width="61" height="18" uuid="e95456ea-35da-4b71-8dc6-f11cf1c519d5">
-						<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"/>
-					</reportElement>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
-						<font fontName="微軟正黑體" size="10"/>
-					</textElement>
-					<text><![CDATA[累計存入量]]></text>
-				</staticText>
-				<staticText>
-					<reportElement x="319" y="23" width="61" height="18" uuid="2e7bbc7e-bc76-45d6-9f32-099e3058ce7b">
-						<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"/>
-					</reportElement>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
-						<font fontName="微軟正黑體" size="10"/>
-					</textElement>
-					<text><![CDATA[累計存出量]]></text>
-				</staticText>
-				<staticText>
-					<reportElement x="390" y="23" width="40" height="18" uuid="b208e97a-9d94-40ba-9922-3399d8e2f3ac">
-						<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"/>
-					</reportElement>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
-						<font fontName="微軟正黑體" size="10"/>
-					</textElement>
-					<text><![CDATA[現存存貨]]></text>
-				</staticText>
-				<staticText>
-					<reportElement x="440" y="23" width="40" height="18" uuid="3866d462-c233-4998-a0f4-fa527b89bc0e">
-						<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"/>
-					</reportElement>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
-						<font fontName="微軟正黑體" size="10"/>
-					</textElement>
-					<text><![CDATA[補貨位]]></text>
-				</staticText>
-				<staticText>
-					<reportElement x="490" y="23" width="40" height="18" uuid="eaf55a87-c36f-4b9e-8957-2747bce9d43d">
-						<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"/>
-					</reportElement>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
-						<font fontName="微軟正黑體" size="10"/>
-					</textElement>
-					<text><![CDATA[補貨數量]]></text>
-				</staticText>
-				<staticText>
-					<reportElement x="540" y="23" width="110" height="18" uuid="4bb9dbca-a6bb-4596-969e-86e8dd60c215">
-						<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"/>
-					</reportElement>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
-						<font fontName="微軟正黑體" size="10"/>
-					</textElement>
-					<text><![CDATA[存貨位置]]></text>
-				</staticText>
-				<staticText>
-					<reportElement x="650" y="23" width="71" height="18" uuid="8913364c-9f76-4bf6-bbcf-456e92d75f5c">
-						<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"/>
-					</reportElement>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
-						<font fontName="微軟正黑體" size="10"/>
-					</textElement>
-					<text><![CDATA[最後入倉日期]]></text>
-				</staticText>
-				<staticText>
-					<reportElement x="730" y="23" width="70" height="18" uuid="49a89912-a5e5-4d5b-9ecd-fcf3169bed84">
-						<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"/>
-					</reportElement>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
-						<font fontName="微軟正黑體" size="10"/>
-					</textElement>
-					<text><![CDATA[最後出倉日期]]></text>
-				</staticText>
-				<staticText>
-					<reportElement x="110" y="4" width="50" height="18" uuid="823e2cd2-dfcb-4658-a290-0046f7fafc74">
-						<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"/>
-					</reportElement>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
-						<font fontName="微軟正黑體" size="10"/>
-					</textElement>
-					<text><![CDATA[貨品名稱：]]></text>
-				</staticText>
-				<textField textAdjust="StretchHeight">
-					<reportElement x="50" y="4" width="60" height="18" uuid="1a0aa29d-fbd7-4eb0-9209-e2dacf82bbde">
-						<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					</reportElement>
-					<textElement verticalAlignment="Middle">
-						<font fontName="微軟正黑體" size="10"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{itemNo}]]></textFieldExpression>
-				</textField>
-				<textField textAdjust="StretchHeight">
-					<reportElement x="160" y="4" width="480" height="18" uuid="47e6c81c-eef6-4032-82d1-6738a92f9981">
-						<property name="com.jaspersoft.studio.unit.height" value="px"/>
-						<property name="com.jaspersoft.studio.unit.width" value="px"/>
-					</reportElement>
-					<textElement verticalAlignment="Middle">
-						<font fontName="微軟正黑體" size="10"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{itemName}]]></textFieldExpression>
-				</textField>
+			<band height="18">
 				<textField textAdjust="StretchHeight">
-					<reportElement x="681" y="4" width="119" height="18" uuid="2b79228e-37bd-42b5-a74c-a961fad87b91">
-						<property name="com.jaspersoft.studio.unit.height" value="px"/>
-						<property name="com.jaspersoft.studio.unit.width" value="px"/>
-					</reportElement>
-					<textElement verticalAlignment="Middle">
-						<font fontName="微軟正黑體" size="10"/>
+					<reportElement isPrintRepeatedValues="false" x="10" y="0" width="579" height="18" uuid="e4c7bd9f-44af-488b-89e4-d47e75bb2193"/>
+					<textElement textAlignment="Left" verticalAlignment="Top" markup="styled">
+						<font fontName="微軟正黑體" isBold="true"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{unitOfMeasure}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{itemNo}+"   "+$F{itemName}+"   "+$F{unitOfMeasure}]]></textFieldExpression>
 				</textField>
-				<staticText>
-					<reportElement x="0" y="4" width="50" height="18" uuid="9f067038-4a8e-49a3-8376-b828c5a32784">
-						<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"/>
-					</reportElement>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
-						<font fontName="微軟正黑體" size="10"/>
-					</textElement>
-					<text><![CDATA[貨品編號：]]></text>
-				</staticText>
-				<staticText>
-					<reportElement x="640" y="4" width="41" height="18" uuid="506dd341-6c6a-4280-902d-c1a47c6302d7">
-						<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"/>
-					</reportElement>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
-						<font fontName="微軟正黑體" size="10"/>
-					</textElement>
-					<text><![CDATA[單位：]]></text>
-				</staticText>
 			</band>
 		</groupHeader>
 		<groupFooter>
-			<band height="24">
+			<band height="19">
+				<printWhenExpression><![CDATA[$V{Group1_COUNT}  > 1]]></printWhenExpression>
 				<staticText>
-					<reportElement x="128" y="1" width="72" height="18" uuid="d10fdf4f-4a2a-439c-9877-125998c975db">
+					<reportElement x="190" y="0" width="70" 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"/>
 					</reportElement>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
+					<textElement textAlignment="Right" verticalAlignment="Top">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
 					<text><![CDATA[貨品總量：]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="250" y="1" width="61" height="18" uuid="0e884be5-64f2-4ade-a2bb-50275accbcdd"/>
+					<reportElement x="320" y="0" width="60" height="18" uuid="0e884be5-64f2-4ade-a2bb-50275accbcdd">
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+					</reportElement>
 					<textElement textAlignment="Right" verticalAlignment="Top">
 						<font fontName="微軟正黑體"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$F{totalCumStockIn}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement x="200" y="1" width="50" height="18" uuid="0a1320e0-dbbc-4da4-bc1e-ca3d21323ad8"/>
+					<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="320" y="1" width="60" height="18" uuid="d2bc3efc-fd44-42b8-b451-7b6bc5e77cea"/>
+					<reportElement x="380" y="0" width="60" height="18" uuid="d2bc3efc-fd44-42b8-b451-7b6bc5e77cea">
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+					</reportElement>
 					<textElement textAlignment="Right" verticalAlignment="Top">
 						<font fontName="微軟正黑體"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$F{totalCumStockOut}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement x="390" y="1" width="40" height="18" uuid="0994677f-b92e-4229-8540-98a41d6fb246"/>
+					<reportElement x="629" y="0" width="62" height="18" uuid="0994677f-b92e-4229-8540-98a41d6fb246"/>
 					<textElement textAlignment="Right" verticalAlignment="Top">
 						<font fontName="微軟正黑體"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$F{totalCurrentBalance}]]></textFieldExpression>
 				</textField>
 				<line>
-					<reportElement x="0" y="20" width="799" height="1" uuid="f22e204d-b70a-4e70-99ce-e1e6d60d6934">
-						<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					</reportElement>
-				</line>
-				<line>
-					<reportElement x="0" y="23" width="799" height="1" uuid="d0796042-728a-4d02-89f5-b71f13369e20">
+					<reportElement x="0" y="18" width="799" height="1" uuid="f22e204d-b70a-4e70-99ce-e1e6d60d6934">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 				</line>
+				<textField>
+					<reportElement x="440" y="0" width="76" height="18" uuid="395283de-c205-42dd-b8e7-dabb0741bc37"/>
+					<textElement textAlignment="Right" verticalAlignment="Top">
+						<font fontName="微軟正黑體"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{totalMisInputAndLost}]]></textFieldExpression>
+				</textField>
+				<textField textAdjust="StretchHeight">
+					<reportElement x="516" y="0" width="50" height="17" uuid="37e380f7-3103-4ec3-b273-d1fdb2aa3bc6"/>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font fontName="微軟正黑體"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{totalVariance}]]></textFieldExpression>
+				</textField>
+				<textField textAdjust="StretchHeight">
+					<reportElement x="566" y="0" width="63" height="17" uuid="5637ecb5-865d-42b1-a7b3-6d58f063365f"/>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font fontName="微軟正黑體"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{totalDefectiveGoods}]]></textFieldExpression>
+				</textField>
+			</band>
+			<band height="1">
+				<printWhenExpression><![CDATA[$V{Group1_COUNT}  == 1]]></printWhenExpression>
 				<line>
-					<reportElement x="0" y="0" width="799" height="1" uuid="fcb953a7-15a5-4292-9184-3deefba9e266">
+					<reportElement x="0" y="0" width="799" height="1" uuid="d0796042-728a-4d02-89f5-b71f13369e20">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 				</line>
@@ -312,160 +167,237 @@
 		</groupFooter>
 	</group>
 	<background>
-		<band splitType="Stretch"/>
+		<band height="17" splitType="Stretch"/>
 	</background>
 	<pageHeader>
-		<band height="87" splitType="Stretch">
-			<textField evaluationTime="Report">
-				<reportElement x="780" y="2" width="20" height="18" uuid="e45d9b93-df63-4fb5-bfe4-fca6a6d77b2e">
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+		<band height="77" splitType="Stretch">
+			<staticText>
+				<reportElement x="351" y="0" width="101" height="23" uuid="e670cb8d-d591-4418-8bce-36398e286e1f">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="微軟正黑體"/>
+					<font fontName="微軟正黑體" size="16" isBold="true"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
-			</textField>
+				<text><![CDATA[庫存結餘報告]]></text>
+			</staticText>
 			<staticText>
-				<reportElement x="700" y="2" width="40" height="18" uuid="76ebb84e-f341-4013-9530-981862f92bdb">
+				<reportElement x="567" y="58" width="62" height="18" uuid="b208e97a-9d94-40ba-9922-3399d8e2f3ac">
 					<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"/>
 				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="12"/>
+				<textElement textAlignment="Right" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="10"/>
 				</textElement>
-				<text><![CDATA[頁數]]></text>
+				<text><![CDATA[不良品棄置]]></text>
 			</staticText>
-			<textField>
-				<reportElement x="740" y="2" width="20" height="18" uuid="8bcc730d-901f-4731-bb50-453790eafdd7">
+			<staticText>
+				<reportElement x="110" y="58" width="60" height="18" uuid="a78ad88c-d542-4a5f-9662-c3f9f90776b8">
+					<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"/>
 				</reportElement>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="微軟正黑體"/>
+					<font fontName="微軟正黑體" size="10"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
-			</textField>
+				<text><![CDATA[到期日]]></text>
+			</staticText>
 			<staticText>
-				<reportElement x="760" y="2" width="20" height="18" uuid="73c874c9-4a43-4ece-aa41-54f8691ea66c">
+				<reportElement x="320" y="58" width="60" height="18" uuid="e95456ea-35da-4b71-8dc6-f11cf1c519d5">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="12"/>
+				<textElement textAlignment="Right" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="10"/>
 				</textElement>
-				<text><![CDATA[/]]></text>
+				<text><![CDATA[纍計存入量]]></text>
 			</staticText>
-			<line>
-				<reportElement x="0" y="86" width="799" height="1" uuid="aadb8fe1-98b7-49d3-b29d-be3b842e9cc7">
+			<staticText>
+				<reportElement x="10" y="58" width="100" height="18" uuid="aa7590f2-5ce0-4877-b98d-b197fa799fee">
+					<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"/>
 				</reportElement>
-			</line>
-			<line>
-				<reportElement x="0" y="82" width="799" height="1" uuid="f2f17fec-f257-4ad0-b2be-c929e86fb515">
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="10"/>
+				</textElement>
+				<text><![CDATA[批號]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="170" y="58" width="90" height="18" uuid="4bb9dbca-a6bb-4596-969e-86e8dd60c215">
+					<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"/>
 				</reportElement>
-			</line>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="10"/>
+				</textElement>
+				<text><![CDATA[存貨位置]]></text>
+			</staticText>
 			<staticText>
-				<reportElement x="0" y="35" width="90" height="23" uuid="c3ba97b4-0070-469b-8e29-7a77c543722c">
+				<reportElement x="440" y="58" width="76" height="18" uuid="7a1741f9-6a23-4c04-81dd-c5e87c7a5142">
 					<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"/>
 				</reportElement>
-				<textElement textAlignment="Left" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="16" isBold="true"/>
+				<textElement textAlignment="Right" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="10"/>
 				</textElement>
-				<text><![CDATA[報告日期：]]></text>
+				<text><![CDATA[錯誤輸入或遺失]]></text>
 			</staticText>
-			<textField>
-				<reportElement x="90" y="35" width="390" height="23" uuid="78413a52-e6d3-42e1-899e-6ffd451f8f84"/>
-				<textElement verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="16" isBold="true"/>
+			<staticText>
+				<reportElement x="516" y="58" width="51" height="18" uuid="66934b77-2d44-4218-b459-680e2aeca2e4">
+					<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"/>
+				</reportElement>
+				<textElement textAlignment="Right" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="10"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$P{reportDate}]]></textFieldExpression>
-			</textField>
+				<text><![CDATA[盤盈虧]]></text>
+			</staticText>
 			<textField>
-				<reportElement x="570" y="35" width="228" height="23" uuid="6695473c-6758-4c0a-ac1a-d8bcf2b107ca"/>
+				<reportElement x="100" y="30" width="335" height="23" uuid="849b3e33-5b07-41df-b761-2e2411d5d26e"/>
 				<textElement verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="16" isBold="true"/>
+					<font fontName="微軟正黑體" size="12" isBold="true"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$P{reportTime}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{reportDate}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement x="480" y="35" width="90" height="23" uuid="4f222c34-313a-48d1-8340-239a0c6ac6ac">
+				<reportElement x="640" y="29" width="68" height="23" uuid="38bc1ddd-2d49-417c-a0f4-15180f8dc295">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="16" isBold="true"/>
+					<font fontName="微軟正黑體" size="12" isBold="true"/>
 				</textElement>
 				<text><![CDATA[報告時間：]]></text>
 			</staticText>
+			<line>
+				<reportElement x="0" y="57" width="799" height="1" uuid="1c04b46e-491f-42a7-b8e0-2418dd068ace">
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+			</line>
 			<staticText>
-				<reportElement x="351" y="0" width="101" height="23" uuid="e670cb8d-d591-4418-8bce-36398e286e1f">
+				<reportElement x="677" y="0" width="40" height="23" uuid="0adb4709-fdd4-4c69-894e-6e4382527335">
 					<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"/>
 				</reportElement>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="16" isBold="true"/>
+					<font fontName="微軟正黑體" size="12"/>
 				</textElement>
-				<text><![CDATA[庫存結餘報告]]></text>
+				<text><![CDATA[頁數]]></text>
 			</staticText>
 			<textField>
-				<reportElement x="540" y="58" width="267" height="23" uuid="fa6f30ce-d5de-4183-85db-192effe5060a">
+				<reportElement x="708" y="29" width="90" height="23" uuid="dabd2770-cc5c-4337-8ba9-a09cd9fa2b32"/>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="12" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{reportTime}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="717" y="0" width="30" height="23" uuid="3e587156-dab8-4359-b08d-d8d501ddb9e7">
+					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="747" y="0" width="21" height="23" uuid="23430213-bfa0-4ba8-9eed-19ab51662a0c">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="12"/>
+				</textElement>
+				<text><![CDATA[/]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="10" y="30" width="90" height="23" uuid="d0a07e02-a35c-4a9c-aea7-e7a97465e6e4">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
-				<textElement textAlignment="Left" verticalAlignment="Top">
-					<font fontName="微軟正黑體" size="16" isBold="true"/>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="12" isBold="true"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$P{lastOutDateStart} +  " 到 " + $P{lastOutDateEnd}]]></textFieldExpression>
+				<text><![CDATA[報告日期：]]></text>
+			</staticText>
+			<textField evaluationTime="Report">
+				<reportElement x="768" y="0" width="30" height="23" uuid="de74acaa-0000-47f4-8358-825ac920082d">
+					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
 			</textField>
+			<line>
+				<reportElement x="0" y="53" width="799" height="1" uuid="b68828f3-fafc-410a-85b4-a9ea4037a28f">
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+			</line>
+			<line>
+				<reportElement x="0" y="76" width="799" height="1" uuid="bebf0ac8-d6c7-4bee-9f1c-fe064db93be5">
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+			</line>
 			<staticText>
-				<reportElement x="1" y="58" width="118" height="23" uuid="d7c154f8-2806-42f3-b81a-c5c0fcfe0671">
+				<reportElement isPrintRepeatedValues="false" x="691" y="58" width="107" height="18" isPrintInFirstWholeBand="true" uuid="5ae5e1a3-1742-4c46-a6f0-c3dae205c18d">
 					<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"/>
 				</reportElement>
-				<textElement textAlignment="Left" verticalAlignment="Top">
-					<font fontName="微軟正黑體" size="16" isBold="true"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="10"/>
 				</textElement>
-				<text><![CDATA[最後入倉日期：]]></text>
+				<text><![CDATA[最後出入倉日期]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="420" y="58" width="119" height="23" uuid="032b013c-942f-451a-a5ae-d0b58ab1e5bc">
+				<reportElement x="260" y="58" width="60" height="18" uuid="360cf13a-93e7-45d4-8a4d-9e9506a6ad3f">
 					<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"/>
 				</reportElement>
-				<textElement textAlignment="Left" verticalAlignment="Top">
-					<font fontName="微軟正黑體" size="16" isBold="true"/>
+				<textElement textAlignment="Right" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="10"/>
 				</textElement>
-				<text><![CDATA[最後出倉日期：]]></text>
+				<text><![CDATA[期初存量]]></text>
 			</staticText>
-			<textField>
-				<reportElement x="120" y="58" width="298" height="23" uuid="b26c6258-2ba6-4fb3-b371-a46d1709009d"/>
-				<textElement textAlignment="Left" verticalAlignment="Top">
-					<font fontName="微軟正黑體" size="16" isBold="true"/>
+			<staticText>
+				<reportElement x="380" y="58" width="60" height="18" uuid="a3ea1b07-2108-409f-adee-8478374d767a">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Right" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="10"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$P{lastInDateStart} +  " 到 " + $P{lastInDateEnd}]]></textFieldExpression>
-			</textField>
+				<text><![CDATA[纍計存出量]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="629" y="58" width="62" height="18" uuid="4efdbfd9-2ad2-45de-aab9-b234d43b6026">
+					<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"/>
+				</reportElement>
+				<textElement textAlignment="Right" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="10"/>
+				</textElement>
+				<text><![CDATA[現存存貨]]></text>
+			</staticText>
 		</band>
 	</pageHeader>
 	<detail>
-		<band height="19" splitType="Stretch">
+		<band height="18" splitType="Stretch">
 			<property name="com.jaspersoft.studio.unit.height" value="px"/>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="120" y="2" width="80" height="17" uuid="01dd0420-eac9-4e0a-b1a5-c74f164a59a5"/>
-				<textElement textAlignment="Left" verticalAlignment="Top">
+				<reportElement x="110" y="1" width="60" height="17" uuid="01dd0420-eac9-4e0a-b1a5-c74f164a59a5"/>
+				<textElement textAlignment="Center" verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{expiryDate}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="200" y="2" width="50" height="17" uuid="91b9dd25-38ac-42c6-8b10-9286ba2ad815"/>
-				<textElement textAlignment="Right" verticalAlignment="Top">
-					<font fontName="微軟正黑體"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{openingBalance}]]></textFieldExpression>
-			</textField>
-			<textField textAdjust="StretchHeight">
-				<reportElement x="0" y="2" width="120" height="17" uuid="8776b0f9-71ff-46be-b97a-1be0ea4c3bab">
+				<reportElement x="10" y="1" width="100" height="17" uuid="8776b0f9-71ff-46be-b97a-1be0ea4c3bab">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 				</reportElement>
@@ -475,62 +407,79 @@
 				<textFieldExpression><![CDATA[$F{lotNo}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="250" y="2" width="61" height="17" uuid="3e286375-b747-416e-8817-fe3290ca3d94"/>
+				<reportElement x="320" y="1" width="60" height="17" uuid="3e286375-b747-416e-8817-fe3290ca3d94">
+					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+				</reportElement>
 				<textElement textAlignment="Right" verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{cumStockIn}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="319" y="2" width="61" height="17" uuid="904a410e-b94f-4fe0-8659-0558e891fdaa"/>
+				<reportElement x="380" y="1" width="60" height="17" uuid="904a410e-b94f-4fe0-8659-0558e891fdaa">
+					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+				</reportElement>
 				<textElement textAlignment="Right" verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{cumStockOut}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="390" y="2" width="40" height="17" uuid="3d91b4d0-6775-4ea4-96cd-41251ad448c7"/>
+				<reportElement x="629" y="1" width="62" height="17" uuid="3d91b4d0-6775-4ea4-96cd-41251ad448c7"/>
 				<textElement textAlignment="Right" verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{currentBalance}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="440" y="2" width="40" height="17" uuid="cad40cb7-bf47-49ac-a3a4-db9b1912620a"/>
-				<textElement textAlignment="Right" verticalAlignment="Top">
+				<reportElement x="170" y="1" width="90" height="17" uuid="192315a1-142d-465e-8dfa-6e443fb12a3d">
+					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Center" verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{reOrderLevel}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{storeLocation}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="490" y="2" width="40" height="17" uuid="ec89f725-4d86-4e97-9ce1-9f7033ce23d0"/>
+				<reportElement x="260" y="1" width="60" height="17" uuid="91b9dd25-38ac-42c6-8b10-9286ba2ad815">
+					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+				</reportElement>
 				<textElement textAlignment="Right" verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{reOrderQty}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{openingBalance}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="540" y="2" width="110" height="17" uuid="192315a1-142d-465e-8dfa-6e443fb12a3d">
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+				<reportElement x="691" y="1" width="107" height="17" uuid="117ddf52-f659-41b2-a9ac-5b8af592a456">
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Top">
+				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="微軟正黑體"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{storeLocation}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{lastMovementDate}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="650" y="2" width="71" height="17" uuid="708c707e-8102-410e-9603-1e97c42a8680"/>
-				<textElement textAlignment="Center" verticalAlignment="Top">
+				<reportElement x="516" y="1" width="50" height="17" uuid="501c7609-a18e-4cab-8512-4ec78271cf51"/>
+				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font fontName="微軟正黑體"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{lastInDate}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{variance}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="730" y="2" width="70" height="17" uuid="b2f99c32-b666-4944-9ad4-8f83b080fee1"/>
-				<textElement textAlignment="Center" verticalAlignment="Top">
+				<reportElement x="440" y="1" width="76" height="17" uuid="bfcdaef4-f059-4c96-8d66-ed89fb7264e1">
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Right" verticalAlignment="Middle">
+					<font fontName="微軟正黑體"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{misInputAndLost}]]></textFieldExpression>
+			</textField>
+			<textField textAdjust="StretchHeight">
+				<reportElement x="566" y="1" width="63" height="17" uuid="00ec8d65-72fd-42b8-b7b6-6d30dac9cab3"/>
+				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font fontName="微軟正黑體"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{lastOutDate}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{defectiveGoods}]]></textFieldExpression>
 			</textField>
 		</band>
 	</detail>
diff --git a/src/main/resources/jasper/StockInTraceabilityReport.jrxml b/src/main/resources/jasper/StockInTraceabilityReport.jrxml
index 83f9d3b..09dc8d1 100644
--- a/src/main/resources/jasper/StockInTraceabilityReport.jrxml
+++ b/src/main/resources/jasper/StockInTraceabilityReport.jrxml
@@ -67,7 +67,7 @@
 			<band height="18">
 				<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				<textField textAdjust="StretchHeight">
-					<reportElement x="3" y="0" width="579" height="18" uuid="c5c88ad4-dfc4-4952-b7f0-4a727151d6f4"/>
+					<reportElement isPrintRepeatedValues="false" x="10" y="0" width="579" height="18" uuid="c5c88ad4-dfc4-4952-b7f0-4a727151d6f4"/>
 					<textElement textAlignment="Left" verticalAlignment="Top" markup="styled">
 						<font fontName="微軟正黑體" isBold="true"/>
 					</textElement>
@@ -79,7 +79,7 @@
 			<band height="19">
 				<printWhenExpression><![CDATA[$V{Group1_COUNT}  > 1]]></printWhenExpression>
 				<staticText>
-					<reportElement x="200" y="0" width="70" height="18" uuid="8d002bea-8762-4e6b-9101-35a570f55031">
+					<reportElement x="210" y="0" width="70" 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"/>
@@ -90,7 +90,7 @@
 					<text><![CDATA[總入倉數量：]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="270" y="0" width="50" height="18" uuid="d98c4478-22bd-4fd6-9be4-b3777f91de6d">
+					<reportElement x="280" y="0" width="50" height="18" uuid="d98c4478-22bd-4fd6-9be4-b3777f91de6d">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
@@ -99,7 +99,7 @@
 					<textFieldExpression><![CDATA[$F{totalStockInQty}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement x="320" y="0" width="50" height="18" uuid="bac1f216-48f1-4b5b-af50-f8ba18b97b78">
+					<reportElement x="330" y="0" width="50" height="18" uuid="bac1f216-48f1-4b5b-af50-f8ba18b97b78">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
@@ -108,7 +108,7 @@
 					<textFieldExpression><![CDATA[$F{totalIqcSampleQty}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement x="370" y="0" width="50" height="18" uuid="1fb42453-c956-4a2b-8a04-fd297a980b38">
+					<reportElement x="380" y="0" width="50" height="18" uuid="1fb42453-c956-4a2b-8a04-fd297a980b38">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
@@ -133,22 +133,7 @@
 		</groupFooter>
 	</group>
 	<pageHeader>
-		<band height="103" splitType="Stretch">
-			<line>
-				<reportElement x="0" y="70" width="799" height="1" uuid="8628d83e-856d-44d2-9454-b6d048e6ecae">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-			</line>
-			<staticText>
-				<reportElement x="760" y="0" width="20" height="18" uuid="c612993d-f309-41f0-bda2-abc0a7d5a3b5">
-					<property name="com.jaspersoft.studio.unit.y" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="12"/>
-				</textElement>
-				<text><![CDATA[/]]></text>
-			</staticText>
+		<band height="109" splitType="Stretch">
 			<staticText>
 				<reportElement x="335" y="0" width="100" height="23" uuid="15ab756b-0e92-466c-be47-112c2ee1aad1">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
@@ -159,108 +144,76 @@
 				</textElement>
 				<text><![CDATA[入倉追蹤報告]]></text>
 			</staticText>
-			<textField evaluationTime="Report">
-				<reportElement x="780" y="0" width="20" height="18" uuid="ad15e154-51b2-4775-8b7e-3cf2d3bc8da9">
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="微軟正黑體"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement x="570" y="23" width="230" height="22" uuid="bf131b2e-1da1-411a-b247-97280b89de21"/>
-				<textElement verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="14" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{reportTime}]]></textFieldExpression>
-			</textField>
 			<staticText>
-				<reportElement x="0" y="23" width="100" height="22" uuid="7338c712-b4ee-4194-9c37-07af197eee92">
+				<reportElement stretchType="RelativeToTallestObject" x="280" y="80" width="50" height="28" uuid="5c05c89c-843b-4fd6-928c-002c6a529679">
 					<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"/>
 				</reportElement>
-				<textElement textAlignment="Left" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="14" isBold="true"/>
+				<textElement textAlignment="Right" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="10"/>
 				</textElement>
-				<text><![CDATA[報告日期：]]></text>
+				<text><![CDATA[入庫數量]]></text>
 			</staticText>
-			<textField>
-				<reportElement x="740" y="0" width="20" height="18" uuid="c58d1f01-d047-414b-8436-b173dcb58d48">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="微軟正黑體"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement x="100" y="23" width="170" height="22" uuid="ff7dd53c-f505-4615-bed4-107d0f053ffe"/>
-				<textElement verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="14" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{reportDate}]]></textFieldExpression>
-			</textField>
 			<staticText>
-				<reportElement x="480" y="23" width="90" height="22" uuid="465d0d50-d1f6-49e2-966a-86c87294e1c3">
+				<reportElement stretchType="RelativeToTallestObject" x="10" y="80" width="110" height="28" uuid="3fa7c301-1c2a-430b-8985-338ebf7aa6cf">
 					<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"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="14" isBold="true"/>
+					<font fontName="微軟正黑體" size="10"/>
 				</textElement>
-				<text><![CDATA[報告時間：]]></text>
+				<text><![CDATA[送貨單編號]]></text>
 			</staticText>
-			<textField>
-				<reportElement x="100" y="45" width="380" height="22" uuid="b2f17ca6-bddc-4eb6-9960-f0e7fdf886af">
+			<staticText>
+				<reportElement stretchType="RelativeToTallestObject" x="690" y="80" width="108" height="28" uuid="db5b9c55-0185-420b-ba6c-0e10d154cc8a">
+					<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"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="14" isBold="true"/>
+					<font fontName="微軟正黑體" size="10"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$P{lastInDateStart} +  " 到 " + $P{lastInDateEnd}]]></textFieldExpression>
-			</textField>
+				<text><![CDATA[供應商名稱]]></text>
+			</staticText>
 			<staticText>
-				<reportElement x="700" y="0" width="40" height="18" uuid="375abc61-d5a7-4b06-8f95-b2ce305302c6">
+				<reportElement stretchType="RelativeToTallestObject" x="220" y="80" width="60" height="28" uuid="cd7a146a-1af0-4428-9b88-dcb159691656">
 					<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"/>
 				</reportElement>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="12"/>
+					<font fontName="微軟正黑體" size="10"/>
 				</textElement>
-				<text><![CDATA[頁數]]></text>
+				<text><![CDATA[到期日]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="0" y="45" width="100" height="22" uuid="83857f28-3707-4003-a7e7-26f3e6847e6b">
+				<reportElement stretchType="RelativeToTallestObject" x="540" y="80" width="60" height="28" uuid="58b33148-a772-4295-b10a-718fccc89683">
 					<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"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="14" isBold="true"/>
+					<font fontName="微軟正黑體" size="10"/>
 				</textElement>
-				<text><![CDATA[最後入倉日期:]]></text>
+				<text><![CDATA[入庫
+檢查備註]]></text>
 			</staticText>
-			<line>
-				<reportElement x="0" y="73" width="799" height="1" uuid="5ccabe1f-b89d-45ef-b334-7bfa17313962">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-			</line>
 			<staticText>
-				<reportElement stretchType="RelativeToTallestObject" x="670" y="74" width="40" height="28" uuid="0687499f-0edd-455b-b0a4-caf5725b5f81">
+				<reportElement stretchType="RelativeToTallestObject" x="430" y="80" width="60" height="28" uuid="c70088ac-bcf1-48a1-bb82-ad238a3dbe70">
 					<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"/>
 				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
+				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font fontName="微軟正黑體" size="10"/>
 				</textElement>
-				<text><![CDATA[供應商
-編號]]></text>
+				<text><![CDATA[入庫檢查
+缺陷百分比]]></text>
 			</staticText>
 			<staticText>
-				<reportElement stretchType="RelativeToTallestObject" x="270" y="74" width="50" height="28" uuid="5c05c89c-843b-4fd6-928c-002c6a529679">
+				<reportElement stretchType="RelativeToTallestObject" x="600" y="80" width="80" height="28" uuid="c1d0f0dd-34d6-4716-90bd-deb94e5084d2">
 					<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"/>
@@ -268,21 +221,22 @@
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="微軟正黑體" size="10"/>
 				</textElement>
-				<text><![CDATA[入庫數量]]></text>
+				<text><![CDATA[存貨位置]]></text>
 			</staticText>
 			<staticText>
-				<reportElement stretchType="RelativeToTallestObject" x="0" y="74" width="110" height="28" uuid="3fa7c301-1c2a-430b-8985-338ebf7aa6cf">
+				<reportElement stretchType="RelativeToTallestObject" x="330" y="80" width="50" height="28" uuid="006c5557-c246-47cd-b599-4775f71cbf16">
 					<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"/>
 				</reportElement>
-				<textElement textAlignment="Left" verticalAlignment="Middle">
+				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font fontName="微軟正黑體" size="10"/>
 				</textElement>
-				<text><![CDATA[送貨單編號]]></text>
+				<text><![CDATA[入庫檢查
+樣品數量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement stretchType="RelativeToTallestObject" x="710" y="74" width="90" height="28" uuid="db5b9c55-0185-420b-ba6c-0e10d154cc8a">
+				<reportElement stretchType="RelativeToTallestObject" x="120" y="80" width="100" height="28" uuid="2f1e753f-ee01-42a1-a4e3-f75985403431">
 					<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"/>
@@ -290,10 +244,10 @@
 				<textElement textAlignment="Left" verticalAlignment="Middle">
 					<font fontName="微軟正黑體" size="10"/>
 				</textElement>
-				<text><![CDATA[供應商名稱]]></text>
+				<text><![CDATA[批號]]></text>
 			</staticText>
 			<staticText>
-				<reportElement stretchType="RelativeToTallestObject" x="210" y="74" width="60" height="28" uuid="cd7a146a-1af0-4428-9b88-dcb159691656">
+				<reportElement stretchType="RelativeToTallestObject" x="490" y="80" width="50" height="28" uuid="3c732314-35c2-42ad-98e6-ef42a512c233">
 					<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"/>
@@ -301,92 +255,120 @@
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="微軟正黑體" size="10"/>
 				</textElement>
-				<text><![CDATA[到期日]]></text>
+				<text><![CDATA[入庫
+檢查結果]]></text>
 			</staticText>
 			<staticText>
-				<reportElement stretchType="RelativeToTallestObject" x="530" y="74" width="60" height="28" uuid="58b33148-a772-4295-b10a-718fccc89683">
+				<reportElement stretchType="RelativeToTallestObject" x="380" y="80" width="50" height="28" uuid="1f82d706-0492-46e4-b692-dced5c97c824">
 					<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"/>
 				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
+				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font fontName="微軟正黑體" size="10"/>
 				</textElement>
-				<text><![CDATA[進料
-檢查備註]]></text>
+				<text><![CDATA[入庫檢查
+缺陷數量]]></text>
 			</staticText>
+			<line>
+				<reportElement x="0" y="108" width="799" height="1" uuid="3190fa6b-3b27-4639-8de6-c93c8438ce35">
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+			</line>
+			<textField>
+				<reportElement x="100" y="30" width="335" height="23" uuid="02dd23b6-c192-43e5-9e33-afbb0f517ffa"/>
+				<textElement verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="12" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{reportDate}]]></textFieldExpression>
+			</textField>
 			<staticText>
-				<reportElement stretchType="RelativeToTallestObject" x="420" y="74" width="60" height="28" uuid="c70088ac-bcf1-48a1-bb82-ad238a3dbe70">
+				<reportElement x="640" y="29" width="68" height="23" uuid="20514f3e-91e7-4d98-ade8-725d4f390397">
 					<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"/>
 				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="10"/>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="12" isBold="true"/>
 				</textElement>
-				<text><![CDATA[進料檢查
-缺陷百分比]]></text>
+				<text><![CDATA[報告時間：]]></text>
 			</staticText>
+			<line>
+				<reportElement x="0" y="79" width="799" height="1" uuid="4ff25125-9aa9-4dae-8a3e-55ab708ed66a">
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+			</line>
+			<textField>
+				<reportElement x="100" y="53" width="560" height="23" uuid="e71f89ab-ac86-4736-88bf-9da220bea272"/>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="12" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{lastInDateStart} +  " 到 " + $P{lastInDateEnd}]]></textFieldExpression>
+			</textField>
 			<staticText>
-				<reportElement stretchType="RelativeToTallestObject" x="590" y="74" width="80" height="28" uuid="c1d0f0dd-34d6-4716-90bd-deb94e5084d2">
+				<reportElement x="677" y="0" width="40" height="23" uuid="2ebe654d-a62f-48a7-b5f5-af7e1089dc84">
 					<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"/>
 				</reportElement>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="10"/>
+					<font fontName="微軟正黑體" size="12"/>
 				</textElement>
-				<text><![CDATA[存貨位置]]></text>
+				<text><![CDATA[頁數]]></text>
 			</staticText>
+			<textField>
+				<reportElement x="708" y="29" width="90" height="23" uuid="e751b9ba-1906-455c-a638-f3923a29c78b"/>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="12" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{reportTime}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="717" y="0" width="30" height="23" uuid="40320740-c3b5-4288-b9bf-31b9b20a7f54">
+					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
+			</textField>
 			<staticText>
-				<reportElement stretchType="RelativeToTallestObject" x="320" y="74" width="50" height="28" uuid="006c5557-c246-47cd-b599-4775f71cbf16">
+				<reportElement x="747" y="0" width="21" height="23" uuid="c541089c-26ea-476f-b79f-e6f5104e6e49">
 					<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"/>
 				</reportElement>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="10"/>
+					<font fontName="微軟正黑體" size="12"/>
 				</textElement>
-				<text><![CDATA[進料檢查
-樣品數量]]></text>
+				<text><![CDATA[/]]></text>
 			</staticText>
 			<staticText>
-				<reportElement stretchType="RelativeToTallestObject" x="110" y="74" width="100" height="28" uuid="2f1e753f-ee01-42a1-a4e3-f75985403431">
+				<reportElement x="10" y="30" width="90" height="23" uuid="f57a2b35-2bb4-46cc-b4fc-80fc7adc8ee2">
 					<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"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="10"/>
+					<font fontName="微軟正黑體" size="12" isBold="true"/>
 				</textElement>
-				<text><![CDATA[批號]]></text>
+				<text><![CDATA[報告日期：]]></text>
 			</staticText>
 			<staticText>
-				<reportElement stretchType="RelativeToTallestObject" x="480" y="74" width="50" height="28" uuid="3c732314-35c2-42ad-98e6-ef42a512c233">
-					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+				<reportElement x="10" y="53" width="90" height="23" uuid="8c19e04a-12bc-4d58-9873-ffe83ae77811">
+					<property name="com.jaspersoft.studio.unit.y" value="pixel"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="10"/>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="12" isBold="true"/>
 				</textElement>
-				<text><![CDATA[進料
-檢查結果]]></text>
+				<text><![CDATA[最後入倉日期:]]></text>
 			</staticText>
-			<staticText>
-				<reportElement stretchType="RelativeToTallestObject" x="370" y="74" width="50" height="28" uuid="1f82d706-0492-46e4-b692-dced5c97c824">
-					<property name="com.jaspersoft.studio.unit.y" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+			<textField evaluationTime="Report">
+				<reportElement x="768" y="0" width="30" height="23" uuid="3ef90e65-b07e-46d1-828a-7a345f96dc0d">
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="10"/>
-				</textElement>
-				<text><![CDATA[進料檢查
-缺陷數量]]></text>
-			</staticText>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
+			</textField>
 			<line>
-				<reportElement x="0" y="102" width="799" height="1" uuid="3190fa6b-3b27-4639-8de6-c93c8438ce35">
+				<reportElement x="0" y="75" width="799" height="1" uuid="87180acc-1475-4285-aba1-820625847d5c">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 			</line>
@@ -395,7 +377,7 @@
 	<detail>
 		<band height="20" splitType="Stretch">
 			<textField textAdjust="StretchHeight">
-				<reportElement x="0" y="2" width="110" height="18" uuid="2e173086-b353-417e-9883-5374e9207e86">
+				<reportElement x="10" y="2" width="110" height="18" uuid="2e173086-b353-417e-9883-5374e9207e86">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Top">
@@ -404,7 +386,7 @@
 				<textFieldExpression><![CDATA[$F{dnNo}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="110" y="2" width="100" height="18" uuid="ec54cf40-555d-4307-921e-23d2cc35418d">
+				<reportElement x="120" y="2" width="100" height="18" uuid="ec54cf40-555d-4307-921e-23d2cc35418d">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Top">
@@ -413,14 +395,14 @@
 				<textFieldExpression><![CDATA[$F{lotNo}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="210" y="2" width="60" height="18" uuid="4c835a14-380f-46e3-a77e-6d61bbc6766a"/>
+				<reportElement x="220" y="2" width="60" height="18" uuid="4c835a14-380f-46e3-a77e-6d61bbc6766a"/>
 				<textElement textAlignment="Center" verticalAlignment="Top">
 					<font fontName="微軟正黑體" size="10"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{expiryDate}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="270" y="2" width="50" height="18" uuid="0e8b333b-88ec-4d30-8fca-b02bc906305f">
+				<reportElement x="280" y="2" width="50" height="18" uuid="0e8b333b-88ec-4d30-8fca-b02bc906305f">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Right" verticalAlignment="Top">
@@ -429,7 +411,7 @@
 				<textFieldExpression><![CDATA[$F{stockInQty}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="320" y="2" width="50" height="18" uuid="d6417d18-6b11-4964-8774-a8795bc0983b">
+				<reportElement x="330" y="2" width="50" height="18" uuid="d6417d18-6b11-4964-8774-a8795bc0983b">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Right" verticalAlignment="Top">
@@ -438,7 +420,7 @@
 				<textFieldExpression><![CDATA[$F{iqcSampleQty}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="370" y="2" width="50" height="18" uuid="5b94c23b-0ef3-4283-85ce-698ca4a2599e">
+				<reportElement x="380" y="2" width="50" height="18" uuid="5b94c23b-0ef3-4283-85ce-698ca4a2599e">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Right" verticalAlignment="Top">
@@ -447,7 +429,7 @@
 				<textFieldExpression><![CDATA[$F{iqcDefectQty}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="420" y="2" width="60" height="18" uuid="de73b394-93be-440e-9cf3-0ff402506a3a">
+				<reportElement x="430" y="2" width="60" height="18" uuid="de73b394-93be-440e-9cf3-0ff402506a3a">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Right" verticalAlignment="Top">
@@ -456,7 +438,7 @@
 				<textFieldExpression><![CDATA[$F{iqcDefectPercentage}+"%"]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="480" y="2" width="50" height="18" uuid="c2575894-67a5-4251-aebd-59999fec00b5">
+				<reportElement x="490" y="2" width="50" height="18" uuid="c2575894-67a5-4251-aebd-59999fec00b5">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Center" verticalAlignment="Top">
@@ -465,7 +447,7 @@
 				<textFieldExpression><![CDATA[$F{iqcResult}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="530" y="2" width="60" height="18" uuid="62104cab-dcd5-41f0-abbf-21d7badc0edb">
+				<reportElement x="540" y="2" width="60" height="18" uuid="62104cab-dcd5-41f0-abbf-21d7badc0edb">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Top">
@@ -474,7 +456,7 @@
 				<textFieldExpression><![CDATA[$F{iqcRemarks}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="590" y="2" width="80" height="18" uuid="091605c2-1a39-4823-ae74-1c8f51ac0145">
+				<reportElement x="600" y="2" width="80" height="18" uuid="091605c2-1a39-4823-ae74-1c8f51ac0145">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Center" verticalAlignment="Top">
@@ -483,16 +465,7 @@
 				<textFieldExpression><![CDATA[$F{storeLocation}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="670" y="2" width="40" height="18" uuid="18fceed4-b742-4cbe-87b2-90933c50965c">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Left" verticalAlignment="Top">
-					<font fontName="微軟正黑體" size="10"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{supplierID}]]></textFieldExpression>
-			</textField>
-			<textField textAdjust="StretchHeight">
-				<reportElement x="710" y="2" width="90" height="18" uuid="eb6ed0fc-bfda-4a89-a163-fe08b00a0120">
+				<reportElement x="690" y="2" width="108" height="18" uuid="eb6ed0fc-bfda-4a89-a163-fe08b00a0120">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Top">
diff --git a/src/main/resources/jasper/StockItemConsumptionTrendReport.jrxml b/src/main/resources/jasper/StockItemConsumptionTrendReport.jrxml
index f28327b..51411c0 100644
--- a/src/main/resources/jasper/StockItemConsumptionTrendReport.jrxml
+++ b/src/main/resources/jasper/StockItemConsumptionTrendReport.jrxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Jaspersoft Studio version 6.21.3.final using JasperReports Library version 6.21.3-4a3078d20785ebe464f18037d738d12fc98c13cf  -->
+<!-- Created with Jaspersoft Studio version 6.17.0.final using JasperReports Library version 6.17.0-6d93193241dd8cc42629e188b94f9e0bc5722efd  -->
 <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="055685d6-c02e-403a-8511-48e9df2752d3">
 	<property name="com.jaspersoft.studio.unit." value="pixel"/>
 	<property name="com.jaspersoft.studio.unit.pageHeight" value="pixel"/>
@@ -356,7 +356,7 @@
 		</groupHeader>
 	</group>
 	<pageHeader>
-		<band height="86" splitType="Stretch">
+		<band height="82" splitType="Stretch">
 			<property name="com.jaspersoft.studio.unit.height" value="px"/>
 			<textField evaluationTime="Report">
 				<reportElement x="768" y="0" width="30" height="23" uuid="6e9ed0a2-e1e6-4533-a786-f086b868a84c">
@@ -475,14 +475,19 @@
 				<text><![CDATA[材料消耗日期:]]></text>
 			</staticText>
 			<line>
-				<reportElement x="2" y="80" width="799" height="1" uuid="9e9ba4e3-e369-4180-b01b-1b581e8fa00d">
+				<reportElement x="0" y="76" width="799" height="1" uuid="c97a9d60-80d8-4bdb-b7ba-999b3959417b">
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+			</line>
+			<line>
+				<reportElement x="0" y="79" width="799" height="1" uuid="014f3f7d-4e54-432e-863c-b95aed3e92c4">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 			</line>
 		</band>
 	</pageHeader>
 	<columnHeader>
-		<band height="28">
+		<band height="29">
 			<staticText>
 				<reportElement x="200" y="0" width="45" height="20" uuid="e4267f38-4a00-4a22-965d-9ab531262592">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
@@ -613,7 +618,7 @@
 				<text><![CDATA[四月]]></text>
 			</staticText>
 			<line>
-				<reportElement x="2" y="23" width="799" height="1" uuid="ad5d85ce-e7fe-46c0-9b37-76b2ed3f4152">
+				<reportElement x="0" y="24" width="799" height="1" uuid="ad5d85ce-e7fe-46c0-9b37-76b2ed3f4152">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 			</line>
diff --git a/src/main/resources/jasper/StockLedgarReport.jrxml b/src/main/resources/jasper/StockLedgarReport.jrxml
index cfad12b..92893c1 100644
--- a/src/main/resources/jasper/StockLedgarReport.jrxml
+++ b/src/main/resources/jasper/StockLedgarReport.jrxml
@@ -78,7 +78,7 @@
 		<groupHeader>
 			<band height="18">
 				<textField textAdjust="StretchHeight">
-					<reportElement isPrintRepeatedValues="false" x="2" y="0" width="579" height="18" uuid="5b2d2e95-26eb-4e8c-93ba-99eaed3490df"/>
+					<reportElement isPrintRepeatedValues="false" x="11" y="0" width="579" height="18" uuid="5b2d2e95-26eb-4e8c-93ba-99eaed3490df"/>
 					<textElement textAlignment="Left" verticalAlignment="Top" markup="styled">
 						<font fontName="微軟正黑體" isBold="true"/>
 					</textElement>
@@ -90,7 +90,7 @@
 			<band height="19">
 				<printWhenExpression><![CDATA[$V{Group1_COUNT}  > 1]]></printWhenExpression>
 				<staticText>
-					<reportElement x="275" y="0" width="75" height="18" uuid="518b1512-2f82-48ca-b334-652fe5991b72">
+					<reportElement x="284" y="0" width="75" 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"/>
@@ -101,7 +101,7 @@
 					<text><![CDATA[貨品總量：]]></text>
 				</staticText>
 				<textField textAdjust="StretchHeight">
-					<reportElement x="350" y="0" width="57" height="18" uuid="44b1dc52-ca89-43b5-9828-31db7207ad22">
+					<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">
@@ -110,7 +110,7 @@
 					<textFieldExpression><![CDATA[$F{totalCumOpeningBal}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement x="407" y="0" width="50" height="18" uuid="6c141d7d-766e-49bf-b987-e790312573a5">
+					<reportElement x="416" y="0" width="50" height="18" uuid="6c141d7d-766e-49bf-b987-e790312573a5">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
@@ -119,7 +119,7 @@
 					<textFieldExpression><![CDATA[$F{totalStockIn}]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="StretchHeight">
-					<reportElement x="457" y="0" width="50" height="18" uuid="f6be72ca-650f-4c37-a149-26d5502be17a">
+					<reportElement x="466" y="0" width="50" height="18" uuid="f6be72ca-650f-4c37-a149-26d5502be17a">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
@@ -128,7 +128,7 @@
 					<textFieldExpression><![CDATA[$F{totalStockOut}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement x="515" y="0" width="75" height="18" uuid="636bf782-3020-4b49-837e-53ede91d1443">
+					<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">
@@ -165,93 +165,20 @@
 				<text><![CDATA[庫存明細報告]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="700" y="5" width="40" height="18" uuid="a1e0b60d-cb14-4854-b996-7823c975444d">
-					<property name="com.jaspersoft.studio.unit.y" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="12"/>
-				</textElement>
-				<text><![CDATA[頁數]]></text>
-			</staticText>
-			<textField>
-				<reportElement x="740" y="5" width="20" height="18" uuid="7e5c38a6-3c39-4baf-879e-64380d7e68ab">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="微軟正黑體"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement x="760" y="5" width="20" height="18" uuid="f972720c-7c8e-4b65-bd5e-f8b3dfc1b86a">
-					<property name="com.jaspersoft.studio.unit.y" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="12"/>
-				</textElement>
-				<text><![CDATA[/]]></text>
-			</staticText>
-			<textField evaluationTime="Report">
-				<reportElement x="780" y="5" width="20" height="18" uuid="2e42c0da-c0b4-49cc-9aef-86ab7cd3cdb1">
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="微軟正黑體"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement x="5" y="30" width="90" height="23" uuid="8ffd692b-4f51-43bc-8568-0b8e5c2a7679">
-					<property name="com.jaspersoft.studio.unit.y" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Left" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="16" isBold="true"/>
-				</textElement>
-				<text><![CDATA[報告日期：]]></text>
-			</staticText>
-			<staticText>
-				<reportElement x="485" y="30" width="90" height="23" uuid="9796c4a9-a9b6-492e-800a-49245e349339">
-					<property name="com.jaspersoft.studio.unit.y" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Left" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="16" isBold="true"/>
-				</textElement>
-				<text><![CDATA[報告時間：]]></text>
-			</staticText>
-			<textField>
-				<reportElement x="95" y="30" width="390" height="23" uuid="6ff739e1-2ee7-443f-85ab-7a23cabd63e0"/>
-				<textElement verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="16" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{reportDate}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement x="575" y="30" width="228" height="23" uuid="784ae665-6ae0-4282-84e7-1716df72cec0"/>
-				<textElement verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="16" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{reportTime}]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement x="5" y="53" width="90" height="23" uuid="231d8082-a2fb-42fd-9980-cef8382bdeb5">
+				<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="16" isBold="true"/>
+					<font fontName="微軟正黑體" size="12" isBold="true"/>
 				</textElement>
 				<text><![CDATA[查詢期間：]]></text>
 			</staticText>
 			<textField>
-				<reportElement x="95" y="53" width="490" height="23" uuid="3b98b6fa-9b8c-4248-9fb9-5923888c9569">
+				<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="16" isBold="true"/>
+					<font fontName="微軟正黑體" size="12" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$P{reportPeriodStart}+ " 到 " + $P{reportPeriodEnd}]]></textFieldExpression>
 			</textField>
@@ -266,17 +193,17 @@
 				</reportElement>
 			</line>
 			<staticText>
-				<reportElement x="407" y="84" width="50" height="32" uuid="75d5ce02-8001-4f6f-85ae-88c6c21c038a">
+				<reportElement x="416" y="84" 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>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
+				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font fontName="微軟正黑體" size="10"/>
 				</textElement>
 				<text><![CDATA[入庫]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="705" y="84" width="97" height="32" uuid="bb54ccd3-e003-4eba-9d95-d2c9c84767a5">
+				<reportElement x="704" y="84" 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"/>
@@ -287,7 +214,7 @@
 				<text><![CDATA[存貨位置]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="150" y="84" width="125" height="32" uuid="1a37e08c-8c54-462f-9a2d-876fc665cdba">
+				<reportElement x="159" y="84" 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"/>
@@ -298,7 +225,7 @@
 				<text><![CDATA[批號]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="2" y="84" width="78" height="32" uuid="29d7c8b3-689f-46c6-8283-ebc81c12e3b9">
+				<reportElement x="11" y="84" 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"/>
@@ -309,38 +236,38 @@
 				<text><![CDATA[出入賬日期]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="515" y="84" width="75" height="32" uuid="12c55779-4875-4d8b-914c-9bbf4dcd64ff">
+				<reportElement x="524" y="84" 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>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
+				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font fontName="微軟正黑體" size="10"/>
 				</textElement>
 				<text><![CDATA[累計存量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="593" y="84" width="112" height="32" uuid="19e06f3b-0c2a-4e9e-b436-79c21d497ebb">
+				<reportElement x="592" y="84" 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>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="微軟正黑體" size="10"/>
 				</textElement>
-				<text><![CDATA[工單/提料單編號]]></text>
+				<text><![CDATA[參考編號]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="457" y="84" width="50" height="32" uuid="86dcb3cb-197d-458e-9530-d2f4de6e5980">
+				<reportElement x="466" y="84" 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"/>
 				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
+				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font fontName="微軟正黑體" size="10"/>
 				</textElement>
 				<text><![CDATA[出庫]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="88" y="84" width="62" height="32" uuid="8fde28bc-907f-406e-9efc-b1e2ff54d819">
+				<reportElement x="97" y="84" 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"/>
@@ -348,22 +275,21 @@
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="微軟正黑體" size="10"/>
 				</textElement>
-				<text><![CDATA[出入賬
-參考編號]]></text>
+				<text><![CDATA[類型]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="350" y="84" width="57" height="32" uuid="9bfc6cdc-28da-4533-a349-5951fd3bdb8d">
+				<reportElement x="359" y="84" 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>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
+				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font fontName="微軟正黑體" size="10"/>
 				</textElement>
 				<text><![CDATA[累計期初
 存量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="275" y="84" width="75" height="32" uuid="42332f71-1b1f-4cef-a8c8-c2e66f125cb7">
+				<reportElement x="284" y="84" 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>
@@ -377,12 +303,81 @@
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 			</line>
+			<textField>
+				<reportElement x="738" y="29" width="60" height="23" uuid="f7eca55e-f990-4a60-a452-4d2c427db69f"/>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="12" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{reportTime}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="717" y="0" width="30" height="23" uuid="87ac305b-fac0-4ccb-b2a8-fa7c10756824">
+					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="670" y="29" width="68" height="23" uuid="743080b7-0b92-48b8-8a24-5fb93fb1a88d">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="12" isBold="true"/>
+				</textElement>
+				<text><![CDATA[報告時間：]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="747" y="0" width="21" height="23" uuid="98c8e822-fec6-445a-9d58-93bfb137f220">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="12"/>
+				</textElement>
+				<text><![CDATA[/]]></text>
+			</staticText>
+			<textField>
+				<reportElement x="100" y="30" width="190" height="23" uuid="8799fefb-deda-49b3-b66f-77cf08439a0e"/>
+				<textElement verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="12" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{reportDate}]]></textFieldExpression>
+			</textField>
+			<textField evaluationTime="Report">
+				<reportElement x="768" y="0" width="30" height="23" uuid="6292711f-b0da-4efd-8104-599db91ce5cc">
+					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="10" y="30" width="90" height="23" uuid="836037e7-c4d4-40ac-a079-aefcf0bac275">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="12" isBold="true"/>
+				</textElement>
+				<text><![CDATA[報告日期：]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="677" y="0" width="40" height="23" uuid="8beee270-4955-4bd8-b315-814bea3661e0">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="12"/>
+				</textElement>
+				<text><![CDATA[頁數]]></text>
+			</staticText>
 		</band>
 	</pageHeader>
 	<detail>
 		<band height="16" splitType="Stretch">
 			<textField textAdjust="StretchHeight">
-				<reportElement x="2" y="0" width="78" height="16" uuid="5fbbcd25-b23a-4c47-a71c-ba7c8d8f1b83">
+				<reportElement x="11" y="0" width="78" height="16" uuid="5fbbcd25-b23a-4c47-a71c-ba7c8d8f1b83">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 				</reportElement>
@@ -392,7 +387,7 @@
 				<textFieldExpression><![CDATA[$F{trnDate}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="150" y="0" width="125" height="16" uuid="c4015ede-c0e8-440f-86c9-05f0d446c774">
+				<reportElement x="159" y="0" width="125" height="16" uuid="c4015ede-c0e8-440f-86c9-05f0d446c774">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Center" verticalAlignment="Top">
@@ -401,7 +396,7 @@
 				<textFieldExpression><![CDATA[$F{lotNo}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="350" y="0" width="57" height="16" uuid="1984acde-9076-4256-a580-e5b5842fa849">
+				<reportElement x="359" y="0" width="57" height="16" uuid="1984acde-9076-4256-a580-e5b5842fa849">
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Right" verticalAlignment="Top">
@@ -413,7 +408,7 @@
 						.format(new java.math.BigDecimal($F{cumOpeningBal}))]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="457" y="0" width="50" height="16" uuid="ca781a08-f648-41bc-a44f-b4d3fc05bf24"/>
+				<reportElement x="466" y="0" width="50" height="16" uuid="ca781a08-f648-41bc-a44f-b4d3fc05bf24"/>
 				<textElement textAlignment="Right" verticalAlignment="Top">
 					<font fontName="微軟正黑體" size="10"/>
 				</textElement>
@@ -423,7 +418,7 @@
 						.format(new java.math.BigDecimal($F{stockOut}))]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="515" y="0" width="75" height="16" uuid="0011e1ab-a161-46d8-af84-629e955e5461">
+				<reportElement x="524" y="0" width="66" height="16" uuid="0011e1ab-a161-46d8-af84-629e955e5461">
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Right" verticalAlignment="Top">
@@ -435,7 +430,7 @@
 						.format(new java.math.BigDecimal($F{cumBalance}))]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="593" y="0" width="112" height="16" uuid="abcf9c0b-8e93-44b0-af99-8b7fe7812ff8">
+				<reportElement x="592" y="0" width="112" height="16" uuid="abcf9c0b-8e93-44b0-af99-8b7fe7812ff8">
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Center" verticalAlignment="Top">
@@ -444,7 +439,7 @@
 				<textFieldExpression><![CDATA[$F{orderRefNo}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="705" y="0" width="97" height="16" uuid="ce3e11a6-b071-4825-aa2c-ecd03f83c976">
+				<reportElement x="704" y="0" width="94" height="16" uuid="ce3e11a6-b071-4825-aa2c-ecd03f83c976">
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Center" verticalAlignment="Top">
@@ -453,7 +448,7 @@
 				<textFieldExpression><![CDATA[$F{storeLocation}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="88" y="0" width="62" height="16" uuid="e2282f48-5570-4344-aff3-cd3eee96bcb2">
+				<reportElement x="97" y="0" width="62" height="16" uuid="e2282f48-5570-4344-aff3-cd3eee96bcb2">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 				</reportElement>
@@ -463,7 +458,7 @@
 				<textFieldExpression><![CDATA[$F{trnRefNo}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="275" y="0" width="75" height="16" uuid="93210fc7-291c-453f-b543-b3da906c90ca">
+				<reportElement x="284" y="0" width="75" height="16" uuid="93210fc7-291c-453f-b543-b3da906c90ca">
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Center" verticalAlignment="Top">
@@ -472,7 +467,7 @@
 				<textFieldExpression><![CDATA[$F{expiryDate}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="407" y="0" width="50" height="16" uuid="ffe94de6-379f-4c80-a86f-33b8cb5b3830">
+				<reportElement x="416" y="0" width="50" height="16" uuid="ffe94de6-379f-4c80-a86f-33b8cb5b3830">
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Right" verticalAlignment="Top">
diff --git a/src/main/resources/jasper/StockTakeVarianceReport.jrxml b/src/main/resources/jasper/StockTakeVarianceReport.jrxml
index c21eaa5..d05523b 100644
--- a/src/main/resources/jasper/StockTakeVarianceReport.jrxml
+++ b/src/main/resources/jasper/StockTakeVarianceReport.jrxml
@@ -51,7 +51,7 @@
 	<field name="totalOpeningBalance" class="java.lang.String"/>
 	<field name="totalCumStockOut" class="java.lang.String"/>
 	<field name="totalCurrentBalance" class="java.lang.String"/>
-	<field name="lastOutDate" class="java.lang.String"/>
+	<field name="lastMovementDate" class="java.lang.String"/>
 	<field name="lastInDate" class="java.lang.String"/>
 	<field name="storeLocation" class="java.lang.String"/>
 	<field name="stockTakeQty" class="java.lang.String"/>
@@ -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="93" y="0" width="72" height="18" isRemoveLineWhenBlank="true" printWhenGroupChanges="Group1" uuid="73e4fded-40e2-44d5-b789-34a33978ed5a">
+					<reportElement isPrintRepeatedValues="false" x="264" y="0" width="72" 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"/>
@@ -87,16 +87,7 @@
 					<text><![CDATA[貨品總量：]]></text>
 				</staticText>
 				<textField textAdjust="StretchHeight" isBlankWhenNull="true">
-					<reportElement isPrintRepeatedValues="false" x="225" y="0" width="59" height="18" isRemoveLineWhenBlank="true" printWhenGroupChanges="Group1" uuid="f5110679-17e7-4ebe-91c7-d121585e8cb3">
-						<printWhenExpression><![CDATA[$V{Group1_COUNT} > 1]]></printWhenExpression>
-					</reportElement>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font fontName="微軟正黑體"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{totalCumStockIn}]]></textFieldExpression>
-				</textField>
-				<textField textAdjust="StretchHeight" isBlankWhenNull="true">
-					<reportElement isPrintRepeatedValues="false" x="345" y="0" width="48" height="18" isRemoveLineWhenBlank="true" printWhenGroupChanges="Group1" uuid="2a6656d2-98da-4b90-9c3b-e26f05ac07e2">
+					<reportElement isPrintRepeatedValues="false" x="337" y="0" width="64" height="18" isRemoveLineWhenBlank="true" printWhenGroupChanges="Group1" uuid="2a6656d2-98da-4b90-9c3b-e26f05ac07e2">
 						<printWhenExpression><![CDATA[$V{Group1_COUNT} > 1]]></printWhenExpression>
 					</reportElement>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
@@ -104,24 +95,6 @@
 					</textElement>
 					<textFieldExpression><![CDATA[$F{totalCurrentBalance}]]></textFieldExpression>
 				</textField>
-				<textField textAdjust="StretchHeight" isBlankWhenNull="true">
-					<reportElement isPrintRepeatedValues="false" x="284" y="0" width="61" height="18" isRemoveLineWhenBlank="true" printWhenGroupChanges="Group1" uuid="a3ba77c5-a47a-4add-8c47-c2b68d409643">
-						<printWhenExpression><![CDATA[$V{Group1_COUNT} > 1]]></printWhenExpression>
-					</reportElement>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font fontName="微軟正黑體"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{totalCumStockOut}]]></textFieldExpression>
-				</textField>
-				<textField textAdjust="StretchHeight" isBlankWhenNull="true">
-					<reportElement isPrintRepeatedValues="false" x="165" y="0" width="60" height="18" isRemoveLineWhenBlank="true" printWhenGroupChanges="Group1" uuid="4ff62b11-988c-4bf8-a851-203770c8206b">
-						<printWhenExpression><![CDATA[$V{Group1_COUNT} > 1]]></printWhenExpression>
-					</reportElement>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font fontName="微軟正黑體"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{totalOpeningBalance}]]></textFieldExpression>
-				</textField>
 				<line>
 					<reportElement isPrintRepeatedValues="false" x="0" y="19" width="799" height="1" isRemoveLineWhenBlank="true" printWhenGroupChanges="Group1" uuid="bb5e28fc-6ecd-4fd2-aef9-0729f29b8154">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
@@ -144,186 +117,113 @@
 		<band splitType="Stretch"/>
 	</background>
 	<pageHeader>
-		<band height="87" splitType="Stretch">
-			<textField evaluationTime="Report">
-				<reportElement x="780" y="12" width="20" height="18" uuid="3ab4080e-cc8d-4dfa-88f5-735d07ddc468">
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="微軟正黑體"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement x="700" y="12" width="40" height="18" uuid="c956dfbd-62a5-4622-8d39-2650f1715ed2">
-					<property name="com.jaspersoft.studio.unit.y" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="12"/>
-				</textElement>
-				<text><![CDATA[頁數]]></text>
-			</staticText>
-			<textField>
-				<reportElement x="740" y="12" width="20" height="18" uuid="821a1a2d-c892-40bd-b83a-70664069267e">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="微軟正黑體"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement x="760" y="12" width="20" height="18" uuid="3ed436a1-f986-4ced-a106-d8753f4500dc">
-					<property name="com.jaspersoft.studio.unit.y" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="12"/>
-				</textElement>
-				<text><![CDATA[/]]></text>
-			</staticText>
+		<band height="58" splitType="Stretch">
 			<line>
-				<reportElement x="0" y="86" width="799" height="1" uuid="f513c3ec-7fbf-471f-a2e4-253a28919190">
+				<reportElement x="0" y="57" width="799" height="1" uuid="f513c3ec-7fbf-471f-a2e4-253a28919190">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 			</line>
 			<line>
-				<reportElement x="0" y="82" width="799" height="1" uuid="351a15c1-61e4-4af3-bb48-dea07b8df3c2">
+				<reportElement x="0" y="53" width="799" height="1" uuid="351a15c1-61e4-4af3-bb48-dea07b8df3c2">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 			</line>
 			<staticText>
-				<reportElement x="0" y="35" width="90" height="23" uuid="9f0deae9-2ec2-4216-98a2-048ab9a5ef75">
+				<reportElement x="290" y="0" width="220" height="23" uuid="ae59d134-591e-4212-b594-6388bc15e629">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
-				<textElement textAlignment="Left" verticalAlignment="Middle">
+				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="微軟正黑體" size="16" isBold="true"/>
 				</textElement>
-				<text><![CDATA[報告日期：]]></text>
+				<text><![CDATA[庫存盤點報告]]></text>
 			</staticText>
 			<textField>
-				<reportElement x="90" y="35" width="330" height="23" uuid="e6b7b1f0-1979-4784-ba94-1472a0227945"/>
-				<textElement verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="16" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{reportDate}]]></textFieldExpression>
+				<reportElement x="717" y="0" width="30" height="23" uuid="2b671e24-ab30-4c72-8d3c-0e68a7b7cb36">
+					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="510" y="35" width="228" height="23" uuid="8480fa52-ad91-40da-99dc-43963f4435e8"/>
+				<reportElement x="100" y="30" width="335" height="23" uuid="d88b718c-786a-44b6-bdce-99e483bbe1f6"/>
 				<textElement verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="16" isBold="true"/>
+					<font fontName="微軟正黑體" size="12" isBold="true"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$P{reportTime}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{reportDate}]]></textFieldExpression>
 			</textField>
-			<staticText>
-				<reportElement x="420" y="35" width="90" height="23" uuid="72e0e86b-38e1-44cf-94dc-718a683005a0">
-					<property name="com.jaspersoft.studio.unit.y" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Left" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="16" isBold="true"/>
-				</textElement>
-				<text><![CDATA[報告時間：]]></text>
-			</staticText>
-			<staticText>
-				<reportElement x="290" y="0" width="220" height="23" uuid="ae59d134-591e-4212-b594-6388bc15e629">
-					<property name="com.jaspersoft.studio.unit.y" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="16" isBold="true"/>
-				</textElement>
-				<text><![CDATA[庫存盤點報告]]></text>
-			</staticText>
 			<textField>
-				<reportElement x="540" y="58" width="267" height="23" uuid="4ad21cfe-418e-411d-ad7a-33cfb73d0b75">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Left" verticalAlignment="Top">
-					<font fontName="微軟正黑體" size="16" isBold="true"/>
+				<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{lastOutDateStart} +  " 到 " + $P{lastOutDateEnd}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{reportTime}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement x="1" y="58" width="118" height="23" uuid="9df7eaca-7dfc-45e1-a75a-d193f39313be">
+				<reportElement x="747" y="0" width="21" height="23" uuid="5a1b4b58-b7b1-48c9-b229-7e96392c6425">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 				</reportElement>
-				<textElement textAlignment="Left" verticalAlignment="Top">
-					<font fontName="微軟正黑體" size="16" isBold="true"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="12"/>
 				</textElement>
-				<text><![CDATA[最後入倉日期：]]></text>
+				<text><![CDATA[/]]></text>
 			</staticText>
-			<staticText>
-				<reportElement x="420" y="58" width="119" height="23" uuid="736fdd8c-50a5-4936-8613-a8309d177516">
-					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+			<textField evaluationTime="Report">
+				<reportElement x="768" y="0" width="30" height="23" uuid="5b03c2ae-7466-4029-8d79-d3ea8f128e06">
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
-				<textElement textAlignment="Left" verticalAlignment="Top">
-					<font fontName="微軟正黑體" size="16" isBold="true"/>
-				</textElement>
-				<text><![CDATA[最後出倉日期：]]></text>
-			</staticText>
-			<textField>
-				<reportElement x="120" y="58" width="298" height="23" uuid="73468246-9034-4c32-bee8-9fb393fa6d62"/>
-				<textElement textAlignment="Left" verticalAlignment="Top">
-					<font fontName="微軟正黑體" size="16" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{lastInDateStart} +  " 到 " + $P{lastInDateEnd}]]></textFieldExpression>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
 			</textField>
-		</band>
-	</pageHeader>
-	<columnHeader>
-		<band height="20">
 			<staticText>
-				<reportElement isPrintRepeatedValues="false" x="164" y="1" width="60" height="18" isPrintInFirstWholeBand="true" uuid="79a1b667-cc70-4200-999e-d030f9aa0066">
+				<reportElement x="640" y="29" width="68" height="23" uuid="3741c716-b76a-442a-a4f8-0152853941d5">
 					<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"/>
 				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="10"/>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="12" isBold="true"/>
 				</textElement>
-				<text><![CDATA[期初存貨]]></text>
+				<text><![CDATA[報告時間：]]></text>
 			</staticText>
 			<staticText>
-				<reportElement isPrintRepeatedValues="false" x="224" y="1" width="59" height="18" isPrintInFirstWholeBand="true" uuid="b8754770-f8c2-4920-90d2-9578e5a1cbf9">
+				<reportElement x="10" y="30" width="90" height="23" uuid="0628b331-5736-4f93-bed3-2278011456aa">
 					<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"/>
 				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="10"/>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="12" isBold="true"/>
 				</textElement>
-				<text><![CDATA[累計存入量]]></text>
+				<text><![CDATA[報告日期：]]></text>
 			</staticText>
 			<staticText>
-				<reportElement isPrintRepeatedValues="false" x="283" y="1" width="61" height="18" isPrintInFirstWholeBand="true" uuid="59569258-e09a-40b4-9f37-5e3939fc294d">
+				<reportElement x="677" y="0" width="40" height="23" uuid="db6e3fb3-b375-497b-bfc2-1795ec7ecefb">
 					<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"/>
 				</reportElement>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="10"/>
+					<font fontName="微軟正黑體" size="12"/>
 				</textElement>
-				<text><![CDATA[累計存出量]]></text>
+				<text><![CDATA[頁數]]></text>
 			</staticText>
+		</band>
+	</pageHeader>
+	<columnHeader>
+		<band height="20">
 			<staticText>
-				<reportElement isPrintRepeatedValues="false" x="2" y="1" width="90" height="18" isPrintInFirstWholeBand="true" uuid="12b01171-4800-444d-b50a-e9b204f526a7">
+				<reportElement isPrintRepeatedValues="false" x="2" y="1" width="118" height="18" isPrintInFirstWholeBand="true" uuid="12b01171-4800-444d-b50a-e9b204f526a7">
 					<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"/>
 				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
+				<textElement textAlignment="Left" verticalAlignment="Middle">
 					<font fontName="微軟正黑體" size="10"/>
 				</textElement>
 				<text><![CDATA[批號]]></text>
 			</staticText>
 			<staticText>
-				<reportElement isPrintRepeatedValues="false" x="92" y="1" width="72" height="18" isPrintInFirstWholeBand="true" uuid="8d6b48f0-38f2-45b9-b306-9e7c81b99d5f">
+				<reportElement isPrintRepeatedValues="false" x="122" y="1" width="98" height="18" isPrintInFirstWholeBand="true" uuid="8d6b48f0-38f2-45b9-b306-9e7c81b99d5f">
 					<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"/>
@@ -334,18 +234,18 @@
 				<text><![CDATA[到期日]]></text>
 			</staticText>
 			<staticText>
-				<reportElement isPrintRepeatedValues="false" x="344" y="1" width="48" height="18" isPrintInFirstWholeBand="true" uuid="38b97df1-2013-4b2d-a48d-06015c159953">
+				<reportElement isPrintRepeatedValues="false" x="336" y="1" width="64" height="18" isPrintInFirstWholeBand="true" uuid="38b97df1-2013-4b2d-a48d-06015c159953">
 					<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"/>
 				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
+				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font fontName="微軟正黑體" size="10"/>
 				</textElement>
 				<text><![CDATA[現存存量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement isPrintRepeatedValues="false" x="404" y="1" width="80" height="18" isPrintInFirstWholeBand="true" uuid="e95a755d-4ecb-4900-ac9a-3a6e3b9b3470">
+				<reportElement isPrintRepeatedValues="false" x="220" y="1" width="110" height="18" isPrintInFirstWholeBand="true" uuid="e95a755d-4ecb-4900-ac9a-3a6e3b9b3470">
 					<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"/>
@@ -356,7 +256,7 @@
 				<text><![CDATA[存貨位置]]></text>
 			</staticText>
 			<staticText>
-				<reportElement isPrintRepeatedValues="false" x="644" y="1" width="80" height="18" isPrintInFirstWholeBand="true" uuid="12a99c2d-6eb7-44c3-b442-37a89be3fe15">
+				<reportElement isPrintRepeatedValues="false" x="680" y="1" width="118" height="18" isPrintInFirstWholeBand="true" uuid="12a99c2d-6eb7-44c3-b442-37a89be3fe15">
 					<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"/>
@@ -364,48 +264,37 @@
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="微軟正黑體" size="10"/>
 				</textElement>
-				<text><![CDATA[最後入倉日期]]></text>
+				<text><![CDATA[最後出入倉日期]]></text>
 			</staticText>
 			<staticText>
-				<reportElement isPrintRepeatedValues="false" x="724" y="1" width="78" height="18" isPrintInFirstWholeBand="true" uuid="3fa6b5c0-acca-4a1d-85c2-4d8badd928e1">
+				<reportElement isPrintRepeatedValues="false" x="550" y="1" width="100" height="18" isPrintInFirstWholeBand="true" uuid="921c16b3-172b-43b9-a090-24d2ee88a1b2">
 					<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"/>
 				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="10"/>
-				</textElement>
-				<text><![CDATA[最後出倉日期]]></text>
-			</staticText>
-			<staticText>
-				<reportElement isPrintRepeatedValues="false" x="582" y="1" width="62" height="18" isPrintInFirstWholeBand="true" uuid="921c16b3-172b-43b9-a090-24d2ee88a1b2">
-					<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"/>
-				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
+				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font fontName="微軟正黑體" size="10"/>
 				</textElement>
-				<text><![CDATA[超撿量百分比]]></text>
+				<text><![CDATA[盤盈虧百分比]]></text>
 			</staticText>
 			<staticText>
-				<reportElement isPrintRepeatedValues="false" x="532" y="1" width="50" height="18" isPrintInFirstWholeBand="true" uuid="5dfc210f-b576-472b-a8a2-9db870c19b92">
+				<reportElement isPrintRepeatedValues="false" x="473" y="1" width="74" height="18" isPrintInFirstWholeBand="true" uuid="5dfc210f-b576-472b-a8a2-9db870c19b92">
 					<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"/>
 				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
+				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font fontName="微軟正黑體" size="10"/>
 				</textElement>
-				<text><![CDATA[盤點差異]]></text>
+				<text><![CDATA[盤盈虧]]></text>
 			</staticText>
 			<staticText>
-				<reportElement isPrintRepeatedValues="false" x="484" y="1" width="48" height="18" isPrintInFirstWholeBand="true" uuid="1590e6c1-5f5a-46ca-84ae-a45e2d4c5a0b">
+				<reportElement isPrintRepeatedValues="false" x="400" y="1" width="72" height="18" isPrintInFirstWholeBand="true" uuid="1590e6c1-5f5a-46ca-84ae-a45e2d4c5a0b">
 					<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"/>
 				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
+				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font fontName="微軟正黑體" size="10"/>
 				</textElement>
 				<text><![CDATA[盤點數]]></text>
@@ -420,16 +309,7 @@
 	<detail>
 		<band height="18" splitType="Stretch">
 			<textField textAdjust="StretchHeight">
-				<reportElement x="284" y="0" width="61" height="18" uuid="19f83771-8676-4dea-8fe4-d17293cbc904">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Right" verticalAlignment="Middle">
-					<font fontName="微軟正黑體"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{cumStockOut}]]></textFieldExpression>
-			</textField>
-			<textField textAdjust="StretchHeight">
-				<reportElement x="93" y="0" width="72" height="18" uuid="608e1ba1-d37b-492e-a6c5-c8e97dfaf14a">
+				<reportElement x="123" y="0" width="98" height="18" uuid="608e1ba1-d37b-492e-a6c5-c8e97dfaf14a">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
@@ -438,16 +318,7 @@
 				<textFieldExpression><![CDATA[$F{expiryDate}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="165" y="0" width="60" height="18" uuid="f37e22a9-1ddd-4f18-82ca-07007187ecd5">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Right" verticalAlignment="Middle">
-					<font fontName="微軟正黑體"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{openingBalance}]]></textFieldExpression>
-			</textField>
-			<textField textAdjust="StretchHeight">
-				<reportElement x="3" y="0" width="90" height="18" uuid="1d7293e1-dab1-473e-bdb9-f13cc2b29e19">
+				<reportElement x="3" y="0" width="118" height="18" uuid="1d7293e1-dab1-473e-bdb9-f13cc2b29e19">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 				</reportElement>
@@ -457,16 +328,7 @@
 				<textFieldExpression><![CDATA[$F{lotNo}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="225" y="0" width="59" height="18" uuid="f885d459-39e5-49d4-9e7e-fad313f5858a">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Right" verticalAlignment="Middle">
-					<font fontName="微軟正黑體"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{cumStockIn}]]></textFieldExpression>
-			</textField>
-			<textField textAdjust="StretchHeight">
-				<reportElement x="345" y="0" width="48" height="18" uuid="48601d57-e240-4390-9ec7-71c77773ee86">
+				<reportElement x="337" y="0" width="64" height="18" uuid="48601d57-e240-4390-9ec7-71c77773ee86">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Right" verticalAlignment="Middle">
@@ -475,7 +337,7 @@
 				<textFieldExpression><![CDATA[$F{currentBookBalance}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="405" y="0" width="80" height="18" uuid="f8664cfc-0eb6-497a-bce6-2171e3d9e43a">
+				<reportElement x="221" y="0" width="110" height="18" uuid="f8664cfc-0eb6-497a-bce6-2171e3d9e43a">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
@@ -484,25 +346,16 @@
 				<textFieldExpression><![CDATA[$F{storeLocation}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement key="" x="725" y="0" width="78" height="18" uuid="f77b71a5-fd51-4d0b-86cd-fe556b5abfa0">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="微軟正黑體"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{lastOutDate}]]></textFieldExpression>
-			</textField>
-			<textField textAdjust="StretchHeight">
-				<reportElement x="645" y="0" width="80" height="18" uuid="19641d4c-43f5-42ef-b76a-1efc06f9805a">
+				<reportElement x="681" y="0" width="118" height="18" uuid="19641d4c-43f5-42ef-b76a-1efc06f9805a">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="微軟正黑體"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{lastInDate}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{lastMovementDate}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="485" y="0" width="48" height="18" uuid="02d11283-5166-45fd-a900-6ae62315ac0a">
+				<reportElement x="401" y="0" width="72" height="18" uuid="02d11283-5166-45fd-a900-6ae62315ac0a">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Right" verticalAlignment="Middle">
@@ -511,7 +364,7 @@
 				<textFieldExpression><![CDATA[$F{stockTakeQty}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="533" y="0" width="50" height="18" uuid="68b8a311-ac96-4df6-9b9f-fb0db60c8a2d">
+				<reportElement x="474" y="0" width="74" height="18" uuid="68b8a311-ac96-4df6-9b9f-fb0db60c8a2d">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Right" verticalAlignment="Middle">
@@ -520,7 +373,7 @@
 				<textFieldExpression><![CDATA[$F{variance}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="583" y="0" width="62" height="18" uuid="c49f3615-0417-4724-a048-127fafce1d10">
+				<reportElement x="551" y="0" width="100" height="18" uuid="c49f3615-0417-4724-a048-127fafce1d10">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Right" verticalAlignment="Middle">