diff --git a/src/main/resources/jasper/FGStockOutTraceabilityReport.jrxml b/src/main/resources/jasper/FGStockOutTraceabilityReport.jrxml
index be6a93e..a25106c 100644
--- a/src/main/resources/jasper/FGStockOutTraceabilityReport.jrxml
+++ b/src/main/resources/jasper/FGStockOutTraceabilityReport.jrxml
@@ -41,11 +41,11 @@
 		<fieldDescription><![CDATA[]]></fieldDescription>
 	</field>
 	<field name="stockSubCategory" class="java.lang.Long">
-    <property name="com.jaspersoft.studio.field.name" value="categoryId"/>
-    <property name="com.jaspersoft.studio.field.label" value="categoryId"/>
-    <property name="com.jaspersoft.studio.field.tree.path" value="items"/>
-    <fieldDescription><![CDATA[]]></fieldDescription>
-</field>
+		<property name="com.jaspersoft.studio.field.name" value="categoryId"/>
+		<property name="com.jaspersoft.studio.field.label" value="categoryId"/>
+		<property name="com.jaspersoft.studio.field.tree.path" value="items"/>
+		<fieldDescription><![CDATA[]]></fieldDescription>
+	</field>
 	<field name="unitOfMeasure" class="java.lang.String"/>
 	<field name="stockReqNo" class="java.lang.String"/>
 	<field name="lotNo" class="java.lang.String"/>
@@ -58,11 +58,11 @@
 	<field name="deliveryOrderNo" class="java.lang.String"/>
 	<field name="totalStockOutQty" class="java.lang.String"/>
 	<group name="Group1">
-	<groupExpression><![CDATA[$F{itemNo}]]></groupExpression>
+		<groupExpression><![CDATA[$F{itemNo}]]></groupExpression>
 		<groupHeader>
-			<band height="69">
+			<band height="44">
 				<staticText>
-					<reportElement x="279" y="12" width="41" height="18" uuid="56e4c1a6-6cea-4a96-9786-4ef15ec86108">
+					<reportElement x="640" y="4" width="41" height="18" uuid="56e4c1a6-6cea-4a96-9786-4ef15ec86108">
 						<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"/>
@@ -70,30 +70,30 @@
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
-					<text><![CDATA[單位]]></text>
+					<text><![CDATA[單位：]]></text>
 				</staticText>
-				<textField>
-					<reportElement x="279" y="30" width="41" height="18" uuid="803e2090-9724-4931-9d47-a59ca88bf3b3">
+				<textField textAdjust="StretchHeight">
+					<reportElement x="681" y="4" width="119" height="18" uuid="803e2090-9724-4931-9d47-a59ca88bf3b3">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$F{unitOfMeasure}]]></textFieldExpression>
 				</textField>
-				<textField>
-					<reportElement x="179" y="30" width="100" height="18" uuid="0d04b8dd-a7dc-4a99-a43c-4cc44381362d">
+				<textField textAdjust="StretchHeight">
+					<reportElement x="160" y="4" width="480" height="18" uuid="0d04b8dd-a7dc-4a99-a43c-4cc44381362d">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$F{itemName}]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement x="0" y="12" width="60" height="18" uuid="879f1b5d-226d-4f75-8a24-ab12514c0cab">
+					<reportElement x="110" y="4" width="50" height="18" uuid="abce60ab-269f-4957-862e-0b8ac1c5ee71">
 						<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,10 +101,10 @@
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
-					<text><![CDATA[貨物子分類]]></text>
+					<text><![CDATA[貨品名稱：]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="179" y="12" width="100" height="18" uuid="abce60ab-269f-4957-862e-0b8ac1c5ee71">
+					<reportElement x="0" y="4" width="50" height="18" uuid="2307a460-b0d0-4ad2-87e5-261638ff4020">
 						<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"/>
@@ -112,44 +112,24 @@
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
-					<text><![CDATA[貨品名稱]]></text>
+					<text><![CDATA[貨品編號：]]></text>
 				</staticText>
-				<textField>
-					<reportElement x="0" y="30" width="60" height="18" uuid="56b1877f-757e-45b3-8060-f92a5c89dacf">
-						<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					</reportElement>
-					<textElement verticalAlignment="Top">
-						<font fontName="微軟正黑體" size="10"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{stockSubCategory}]]></textFieldExpression>
-				</textField>
-				<staticText>
-					<reportElement x="60" y="12" width="119" height="18" uuid="2307a460-b0d0-4ad2-87e5-261638ff4020">
-						<property name="com.jaspersoft.studio.unit.y" value="px"/>
+				<line>
+					<reportElement x="0" y="43" width="800" height="1" uuid="6202c33a-fe13-4e44-b26f-7d17980e79e9">
 						<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>
-					<reportElement x="60" y="30" width="119" height="18" uuid="ad155e90-c05b-4b7f-983b-129904eb2061">
+				</line>
+				<textField textAdjust="StretchHeight">
+					<reportElement x="50" y="4" width="60" height="18" uuid="ad155e90-c05b-4b7f-983b-129904eb2061">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$F{itemNo}]]></textFieldExpression>
 				</textField>
-				<line>
-					<reportElement x="0" y="68" width="800" height="1" uuid="6202c33a-fe13-4e44-b26f-7d17980e79e9">
-						<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					</reportElement>
-				</line>
 				<staticText>
-					<reportElement x="709" y="50" width="91" height="18" uuid="0f155dfc-0aff-4935-aa8f-54b4f01af51e">
+					<reportElement x="709" y="24" width="91" 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>
@@ -159,7 +139,7 @@
 					<text><![CDATA[提料備注]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="470" y="50" width="98" height="18" uuid="baf88ec4-c0d6-4af2-a86f-52c3db3365bf">
+					<reportElement x="470" y="24" width="90" height="18" uuid="baf88ec4-c0d6-4af2-a86f-52c3db3365bf">
 						<property name="com.jaspersoft.studio.unit.y" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
@@ -169,7 +149,7 @@
 					<text><![CDATA[成品提料編號]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="270" y="50" width="130" height="18" uuid="a2e0f22f-b299-4712-84f7-7ba3b54b1d1c">
+					<reportElement x="320" y="24" 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"/>
@@ -180,7 +160,7 @@
 					<text><![CDATA[到期日]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="0" y="50" width="130" height="18" uuid="5db44150-7e52-40dc-9fab-fe174d818c61">
+					<reportElement x="0" y="24" 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"/>
@@ -191,29 +171,29 @@
 					<text><![CDATA[送貨訂單編號]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="130" y="50" width="70" height="18" uuid="ccda69a3-43de-413b-b53c-1b572e92fcf8">
+					<reportElement x="120" y="24" 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"/>
 					</reportElement>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
+					<textElement textAlignment="Left" verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
 					<text><![CDATA[提料單編號]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="200" y="50" width="70" height="18" uuid="03fc341e-7026-4f5e-b975-264097a7aeda">
+					<reportElement x="220" y="24" 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"/>
 					</reportElement>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
+					<textElement textAlignment="Left" verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
 					<text><![CDATA[批號]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="639" y="50" width="70" height="18" uuid="b20762b2-25ab-4fde-a693-a8b32776d866">
+					<reportElement x="609" y="24" width="100" 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>
@@ -223,7 +203,7 @@
 					<text><![CDATA[店鋪位置]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="400" y="50" width="59" height="18" uuid="7950d513-4660-445b-9b18-08e062b66f30">
+					<reportElement x="400" y="24" 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"/>
@@ -234,7 +214,7 @@
 					<text><![CDATA[出貨數量]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="568" y="50" width="71" height="18" uuid="21d9afe9-fd02-4896-a478-60967afc50f4">
+					<reportElement x="560" y="24" 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>
@@ -286,9 +266,9 @@
 		<band splitType="Stretch"/>
 	</background>
 	<pageHeader>
-		<band height="155">
+		<band height="72">
 			<textField evaluationTime="Report">
-				<reportElement x="780" y="12" width="20" height="18" uuid="8ebe39b1-11cd-4058-a4c5-a32de40e2235">
+				<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>
@@ -298,7 +278,7 @@
 				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement x="700" y="12" width="40" height="18" uuid="72b82b4b-6d4d-4b58-860a-1d5fcdc5b1ca">
+				<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>
@@ -308,7 +288,7 @@
 				<text><![CDATA[頁數]]></text>
 			</staticText>
 			<textField>
-				<reportElement x="740" y="12" width="20" height="18" uuid="e00bc834-695d-4b57-a95b-b6628d45ae9b">
+				<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">
@@ -317,7 +297,7 @@
 				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement x="760" y="12" width="20" height="18" uuid="de9992f2-b449-46a5-a38b-d5af9dc2754f">
+				<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>
@@ -327,22 +307,17 @@
 				<text><![CDATA[/]]></text>
 			</staticText>
 			<line>
-				<reportElement x="0" y="84" width="800" height="1" uuid="ab5d4dc6-0edf-48c8-94ae-9b364c8a4ba0">
+				<reportElement x="0" y="71" 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="154" 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="150" width="799" height="1" uuid="bf9e8b27-bbc8-4e9a-92e6-0874549f6d29">
+				<reportElement x="0" y="67" 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="35" width="90" height="23" uuid="e57917d9-23c2-45fe-9d23-a799b975755a">
+				<reportElement x="0" y="25" width="90" 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>
@@ -352,21 +327,21 @@
 				<text><![CDATA[報告日期：]]></text>
 			</staticText>
 			<textField>
-				<reportElement x="90" y="35" width="390" height="23" uuid="867346a2-5f97-425c-a9b9-34fa8ce513d0"/>
+				<reportElement x="90" y="25" width="390" 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="35" width="228" height="23" uuid="65cfb017-1dfb-4a15-a21a-6fb2399de1b0"/>
+				<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="35" width="90" height="23" uuid="d5b2cd04-3c71-4d7d-90ef-9e4cd38918af">
+				<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>
@@ -375,74 +350,18 @@
 				</textElement>
 				<text><![CDATA[報告時間：]]></text>
 			</staticText>
-			<staticText>
-				<reportElement x="0" y="58" width="90" height="23" uuid="2f2b9ee7-8493-461d-8435-6bc7a5afb63b">
-					<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="58" width="708" height="23" uuid="a1d65535-42ee-4f34-bc04-f214dc3b31ea"/>
-				<textElement>
-					<font fontName="微軟正黑體" size="16" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{stockCategory}]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement x="0" y="90" width="78" height="18" uuid="9ba9eac8-8ddd-4c8d-9926-d7aa85ba527f">
-					<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="12"/>
-				</textElement>
-				<text><![CDATA[貨物子分類：]]></text>
-			</staticText>
-			<textField>
-				<reportElement x="84" y="90" width="720" height="18" uuid="7dd5625c-823e-43a7-87fd-d69cf27387c2">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Left" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="12"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{stockSubCategory}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement x="84" y="108" width="720" height="18" uuid="672947b9-b1e9-4415-8438-8d1f5bd370c0">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Left" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="12"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{itemNo}]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement x="0" y="108" width="78" height="18" uuid="605cc1f9-b4de-4cb4-9356-00799b16a1e3">
-					<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="12"/>
-				</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"/>
 					<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[FG Stock Out Traceability Report		
-]]></text>
+				<text><![CDATA[成品出倉追蹤報告]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="0" y="126" width="84" height="18" uuid="297107ea-5827-41bc-83a0-8d966b714e0f">
+				<reportElement x="0" y="48" width="84" height="18" uuid="297107ea-5827-41bc-83a0-8d966b714e0f">
 					<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"/>
@@ -453,7 +372,7 @@
 				<text><![CDATA[最後出倉日期:]]></text>
 			</staticText>
 			<textField>
-				<reportElement x="84" y="126" width="336" height="18" uuid="76ed89e6-9e70-4cc3-9d38-ff5dc24cd094">
+				<reportElement x="84" y="48" width="336" height="18" uuid="76ed89e6-9e70-4cc3-9d38-ff5dc24cd094">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Top">
@@ -465,8 +384,8 @@
 	</pageHeader>
 	<detail>
 		<band height="17" splitType="Stretch">
-			<textField>
-				<reportElement x="0" y="0" width="130" height="17" uuid="78ffaf9e-52c3-4d50-94ac-73f826d2448a">
+			<textField textAdjust="StretchHeight">
+				<reportElement x="0" 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>
@@ -475,53 +394,53 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{deliveryOrderNo}]]></textFieldExpression>
 			</textField>
-			<textField>
-				<reportElement x="130" y="0" width="70" height="17" uuid="939193b3-e573-4e5d-af6c-da58910f03a1"/>
+			<textField textAdjust="StretchHeight">
+				<reportElement x="120" 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>
-				<reportElement x="200" y="0" width="70" height="17" uuid="92aae78d-2b61-4e61-9b18-574a9a7d515c"/>
+			<textField textAdjust="StretchHeight">
+				<reportElement x="220" 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>
-				<reportElement x="270" y="0" width="130" height="17" uuid="696e6d6c-101c-4e4e-b0c8-b3aabefb78ab"/>
+			<textField textAdjust="StretchHeight">
+				<reportElement x="320" 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>
+			<textField textAdjust="StretchHeight">
 				<reportElement x="400" 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>
-				<reportElement x="470" y="0" width="98" height="17" uuid="663019ce-959c-47dc-8c39-2a285c6cdc1f">
+			<textField textAdjust="StretchHeight">
+				<reportElement x="470" y="0" width="90" height="17" uuid="663019ce-959c-47dc-8c39-2a285c6cdc1f">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
-				<textElement verticalAlignment="Top">
+				<textElement textAlignment="Center" verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{fgPickOrderNo}]]></textFieldExpression>
 			</textField>
-			<textField>
-				<reportElement x="568" y="0" width="71" height="17" uuid="6384ebfc-6d01-404a-bea1-73d4e4ac5fc3"/>
-				<textElement verticalAlignment="Top">
+			<textField textAdjust="StretchHeight">
+				<reportElement x="560" 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>
-				<reportElement x="639" y="0" width="70" height="17" uuid="bb1402fd-a96e-4345-b48c-7aeeeadbf57d"/>
-				<textElement verticalAlignment="Top">
+			<textField textAdjust="StretchHeight">
+				<reportElement x="609" y="0" width="100" height="17" uuid="bb1402fd-a96e-4345-b48c-7aeeeadbf57d"/>
+				<textElement textAlignment="Center" verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{storeLocation}]]></textFieldExpression>