diff --git a/src/main/resources/jasper/FGStockOutTraceabilityReport.jrxml b/src/main/resources/jasper/FGStockOutTraceabilityReport.jrxml
index a25106c..db099fa 100644
--- a/src/main/resources/jasper/FGStockOutTraceabilityReport.jrxml
+++ b/src/main/resources/jasper/FGStockOutTraceabilityReport.jrxml
@@ -114,11 +114,6 @@
 					</textElement>
 					<text><![CDATA[貨品編號：]]></text>
 				</staticText>
-				<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"/>
-					</reportElement>
-				</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"/>
@@ -129,25 +124,15 @@
 					<textFieldExpression><![CDATA[$F{itemNo}]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement x="709" y="24" width="91" height="18" uuid="0f155dfc-0aff-4935-aa8f-54b4f01af51e">
+					<reportElement x="620" y="24" width="180" 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">
+					<textElement textAlignment="Left" verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
 					<text><![CDATA[提料備注]]></text>
 				</staticText>
-				<staticText>
-					<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>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
-						<font fontName="微軟正黑體" size="10"/>
-					</textElement>
-					<text><![CDATA[成品提料編號]]></text>
-				</staticText>
 				<staticText>
 					<reportElement x="320" y="24" width="80" height="18" uuid="a2e0f22f-b299-4712-84f7-7ba3b54b1d1c">
 						<property name="com.jaspersoft.studio.unit.y" value="px"/>
@@ -165,7 +150,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>
@@ -193,7 +178,7 @@
 					<text><![CDATA[批號]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="609" y="24" width="100" height="18" uuid="b20762b2-25ab-4fde-a693-a8b32776d866">
+					<reportElement x="508" y="24" 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>
@@ -214,7 +199,7 @@
 					<text><![CDATA[出貨數量]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="560" y="24" width="49" height="18" uuid="21d9afe9-fd02-4896-a478-60967afc50f4">
+					<reportElement x="459" 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>
@@ -266,7 +251,7 @@
 		<band splitType="Stretch"/>
 	</background>
 	<pageHeader>
-		<band height="72">
+		<band height="80">
 			<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"/>
@@ -307,17 +292,17 @@
 				<text><![CDATA[/]]></text>
 			</staticText>
 			<line>
-				<reportElement x="0" y="71" width="799" height="1" uuid="8d4d2060-74a7-486f-9647-d0f12e817e0a">
+				<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="67" width="799" height="1" uuid="bf9e8b27-bbc8-4e9a-92e6-0874549f6d29">
+				<reportElement x="0" y="75" 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="90" height="23" uuid="e57917d9-23c2-45fe-9d23-a799b975755a">
+				<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>
@@ -327,7 +312,7 @@
 				<text><![CDATA[報告日期：]]></text>
 			</staticText>
 			<textField>
-				<reportElement x="90" y="25" width="390" height="23" uuid="867346a2-5f97-425c-a9b9-34fa8ce513d0"/>
+				<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>
@@ -361,22 +346,20 @@
 				<text><![CDATA[成品出倉追蹤報告]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="0" y="48" width="84" height="18" uuid="297107ea-5827-41bc-83a0-8d966b714e0f">
+				<reportElement x="0" y="49" width="110" height="23" 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"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Top">
-					<font fontName="微軟正黑體" size="12"/>
+					<font fontName="微軟正黑體" size="16" isBold="true"/>
 				</textElement>
 				<text><![CDATA[最後出倉日期:]]></text>
 			</staticText>
 			<textField>
-				<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>
+				<reportElement x="110" y="49" width="560" height="23" uuid="76ed89e6-9e70-4cc3-9d38-ff5dc24cd094"/>
 				<textElement textAlignment="Left" verticalAlignment="Top">
-					<font fontName="微軟正黑體" size="12"/>
+					<font fontName="微軟正黑體" size="16" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$P{lastOutDateStart} +  " 到 " + $P{lastOutDateEnd}]]></textFieldExpression>
 			</textField>
@@ -423,30 +406,21 @@
 				<textFieldExpression><![CDATA[$F{stockOutQty}]]></textFieldExpression>
 			</textField>
 			<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 textAlignment="Center" verticalAlignment="Top">
-					<font fontName="微軟正黑體"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{fgPickOrderNo}]]></textFieldExpression>
-			</textField>
-			<textField textAdjust="StretchHeight">
-				<reportElement x="560" y="0" width="49" height="17" uuid="6384ebfc-6d01-404a-bea1-73d4e4ac5fc3"/>
+				<reportElement x="459" 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="609" y="0" width="100" height="17" uuid="bb1402fd-a96e-4345-b48c-7aeeeadbf57d"/>
+				<reportElement x="508" 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="709" y="0" width="91" height="17" uuid="35b41bee-4246-4cc7-ab30-4966c185a73b"/>
+				<reportElement x="620" y="0" width="180" height="17" uuid="35b41bee-4246-4cc7-ab30-4966c185a73b"/>
 				<textElement verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
 				</textElement>
diff --git a/src/main/resources/jasper/MaterialStockOutTraceability.jrxml b/src/main/resources/jasper/MaterialStockOutTraceability.jrxml
index a1f8da1..7942a35 100644
--- a/src/main/resources/jasper/MaterialStockOutTraceability.jrxml
+++ b/src/main/resources/jasper/MaterialStockOutTraceability.jrxml
@@ -37,11 +37,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"/>
@@ -56,51 +56,50 @@
 	<group name="Group1">
 		<groupExpression><![CDATA[$F{itemNo}]]></groupExpression>
 		<groupHeader>
-			<band height="61">
+			<band height="42">
 				<staticText>
-					<reportElement x="279" y="4" width="61" height="18" uuid="36a97aa4-bfd3-4e52-a9e0-9914a9786045">
+					<reportElement x="0" y="24" 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"/>
 					</reportElement>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
+					<textElement textAlignment="Left" verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
-					<text><![CDATA[單位]]></text>
+					<text><![CDATA[工單編號]]></text>
 				</staticText>
-				<textField>
-					<reportElement x="279" y="22" width="61" height="18" uuid="3eaff6bd-a1e6-412b-8889-b88c84a59443">
+				<staticText>
+					<reportElement x="120" y="24" 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"/>
 					</reportElement>
-					<textElement verticalAlignment="Top">
+					<textElement textAlignment="Left" verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{unitOfMeasure}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement x="179" y="22" width="100" height="18" uuid="1b1fe4b9-24de-4e10-abd5-82b113174754">
+					<text><![CDATA[提料單編號]]></text>
+				</staticText>
+				<textField textAdjust="StretchHeight">
+					<reportElement x="50" y="4" width="60" height="18" uuid="37bfad84-a622-4315-aa5d-f3e2770b2cdd">
 						<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>
+					<textFieldExpression><![CDATA[$F{itemNo}]]></textFieldExpression>
 				</textField>
-				<staticText>
-					<reportElement x="0" y="4" width="60" height="18" uuid="39019fb0-e784-4ee4-982b-544320b1e574">
-						<property name="com.jaspersoft.studio.unit.y" value="px"/>
+				<textField textAdjust="StretchHeight">
+					<reportElement x="160" y="4" width="480" height="18" uuid="582d4186-af99-4408-942d-65d88549e5f4">
 						<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 verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
-					<text><![CDATA[貨物子分類]]></text>
-				</staticText>
+					<textFieldExpression><![CDATA[$F{itemName}]]></textFieldExpression>
+				</textField>
 				<staticText>
-					<reportElement x="179" y="4" width="100" height="18" uuid="542267ba-173a-4aa6-a945-23b31f26bb78">
+					<reportElement x="0" y="4" width="50" height="18" uuid="c43e8542-2a90-4cb6-88b4-ed70a0a225cd">
 						<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"/>
@@ -108,19 +107,10 @@
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
-					<text><![CDATA[貨品名稱]]></text>
+					<text><![CDATA[貨品編號：]]></text>
 				</staticText>
-				<textField>
-					<reportElement x="0" y="22" width="60" height="18" uuid="b2e77384-156e-43f9-8c1d-dc330bbb1e57">
-						<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="4" width="119" height="18" uuid="1915d144-078f-4802-91d6-e9efc11a53f6">
+					<reportElement x="640" y="4" width="41" height="18" uuid="edee761e-7166-41f0-a41a-826c12c244c0">
 						<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"/>
@@ -128,66 +118,51 @@
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
-					<text><![CDATA[貨品編號]]></text>
+					<text><![CDATA[單位：]]></text>
 				</staticText>
-				<textField>
-					<reportElement x="60" y="22" width="119" height="18" uuid="24654eee-9dea-4b3f-9afc-b06f42939701">
+				<textField textAdjust="StretchHeight">
+					<reportElement x="681" y="4" width="119" height="18" uuid="b42c04ef-8d2a-4c12-b345-898568d292d8">
 						<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{itemNo}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{unitOfMeasure}]]></textFieldExpression>
 				</textField>
-				<line>
-					<reportElement x="0" y="60" width="800" height="1" uuid="171f7316-71b9-48dd-8311-b3812d9a102d">
-						<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					</reportElement>
-				</line>
 				<staticText>
-					<reportElement x="709" y="42" width="91" height="18" uuid="c26f9801-f913-42db-9aed-a1e5d6aa0889">
-						<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>
-				</staticText>
-				<staticText>
-					<reportElement x="470" y="42" width="98" height="18" uuid="51f40dc7-1234-4b45-a60a-365c0afd442e">
+					<reportElement x="110" y="4" width="50" height="18" uuid="3e729ce6-ad36-4e54-8e6b-884d620649c0">
 						<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>
+					<text><![CDATA[貨品名稱：]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="270" y="42" width="130" height="18" uuid="80122626-76d1-4935-961d-0ff898ba50d7">
+					<reportElement x="508" y="24" width="112" 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"/>
-						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
-					<text><![CDATA[到期日]]></text>
+					<text><![CDATA[店鋪位置]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="0" y="42" width="130" height="18" uuid="53dda4bc-e6ba-40de-8bdb-cf9dc0803b23">
+					<reportElement x="459" y="24" width="49" 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"/>
-						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
-					<text><![CDATA[工單編號]]></text>
+					<text><![CDATA[提料人]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="130" y="42" width="70" height="18" uuid="58633e83-5a17-4b4c-91fb-0a1e95377b78">
+					<reportElement x="320" y="24" 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"/>
@@ -195,31 +170,31 @@
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
-					<text><![CDATA[提料單編號]]></text>
+					<text><![CDATA[到期日]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="200" y="42" width="70" height="18" uuid="1c84fc41-458d-40eb-808c-6e3b4cce6a31">
+					<reportElement x="220" y="24" 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"/>
 					</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="42" width="70" height="18" uuid="3522f4bb-d26b-4e43-856f-fd421f152603">
+					<reportElement x="620" y="24" width="180" 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>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
+					<textElement textAlignment="Left" verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
-					<text><![CDATA[店鋪位置]]></text>
+					<text><![CDATA[提料備注]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="400" y="42" width="59" height="18" uuid="66c7964d-9b00-41a8-b6b8-2253811221aa">
+					<reportElement x="400" y="24" 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"/>
@@ -229,16 +204,6 @@
 					</textElement>
 					<text><![CDATA[出貨數量]]></text>
 				</staticText>
-				<staticText>
-					<reportElement x="568" y="42" width="71" height="18" uuid="bba77954-176b-4539-8b39-1164cc7b0b25">
-						<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>
-				</staticText>
 			</band>
 		</groupHeader>
 		<groupFooter>
@@ -282,9 +247,9 @@
 		<band splitType="Stretch"/>
 	</background>
 	<pageHeader>
-		<band height="151" splitType="Stretch">
+		<band height="80" splitType="Stretch">
 			<textField evaluationTime="Report">
-				<reportElement x="780" y="12" width="20" height="18" uuid="8e4c063b-81a9-4d2f-854c-f848bf4f7360">
+				<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>
@@ -294,7 +259,7 @@
 				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement x="700" y="12" width="40" height="18" uuid="1a7ea384-c006-440a-8bfc-e89d5aa069a8">
+				<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>
@@ -304,7 +269,7 @@
 				<text><![CDATA[頁數]]></text>
 			</staticText>
 			<textField>
-				<reportElement x="740" y="12" width="20" height="18" uuid="3e9443de-9543-4560-8f00-4e8648313e5c">
+				<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">
@@ -313,7 +278,7 @@
 				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement x="760" y="12" width="20" height="18" uuid="ce2c0dcc-1973-4758-aa68-264d242cd806">
+				<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>
@@ -323,211 +288,139 @@
 				<text><![CDATA[/]]></text>
 			</staticText>
 			<line>
-				<reportElement x="0" y="84" width="800" height="1" uuid="5fe9edbb-119f-48bb-a4b3-8d6343916312">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-			</line>
-			<line>
-				<reportElement x="0" y="150" width="799" height="1" uuid="588519b2-2b53-447d-a94a-f5323a5071b6">
+				<reportElement x="0" y="79" width="799" height="1" uuid="588519b2-2b53-447d-a94a-f5323a5071b6">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 			</line>
 			<line>
-				<reportElement x="0" y="146" width="799" height="1" uuid="f40ccafa-719f-4a70-86ff-d7b4f09b5ea5">
+				<reportElement x="0" y="75" width="799" height="1" uuid="f40ccafa-719f-4a70-86ff-d7b4f09b5ea5">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 			</line>
 			<staticText>
-				<reportElement x="0" y="35" width="90" height="23" uuid="cdb24c4b-7773-4d7e-acdc-316c97e6e805">
+				<reportElement x="254" y="0" width="295" height="23" uuid="7de5fed6-2cd8-43a5-a81c-7dca66433be5">
 					<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="390" height="23" uuid="c89b6f83-ff7f-4064-b133-4ea20faf1055"/>
-				<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="11725e9f-491c-48cc-925c-4a825784d791"/>
-				<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="ef8bb37a-2782-42f2-a7b1-8c9cd48ae8da">
+				<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="Middle">
+				<textElement textAlignment="Left" verticalAlignment="Top">
 					<font fontName="微軟正黑體" size="16" isBold="true"/>
 				</textElement>
-				<text><![CDATA[報告時間：]]></text>
+				<text><![CDATA[最後出倉日期:]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="0" y="58" width="90" height="23" uuid="25617109-8f54-4625-a812-c7a230af3f7b">
+				<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>
+				<text><![CDATA[報告日期：]]></text>
 			</staticText>
 			<textField>
-				<reportElement x="90" y="58" width="708" height="23" uuid="7152114f-d191-4d82-b9bd-b25135f95ed7"/>
-				<textElement>
+				<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{stockCategory}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{reportDate}]]></textFieldExpression>
 			</textField>
-			<staticText>
-				<reportElement x="0" y="90" width="84" height="18" uuid="aee255d0-8d35-493c-8935-09c8d1ddfdc2">
-					<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="6055c7e7-945d-40c5-ac97-0ce9c0a403c2">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Left" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="12"/>
+				<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{stockSubCategory}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{reportTime}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="84" y="108" width="720" height="18" uuid="cab4b1ce-de25-42e0-aca2-8ef08e8b48a4">
-					<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="84" height="18" uuid="ddeb7829-92cc-4e0a-8334-9e9577254471">
-					<property name="com.jaspersoft.studio.unit.y" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
+				<reportElement x="110" y="49" width="560" height="23" uuid="05970209-7fd1-40c6-9d9e-c19570093c09"/>
 				<textElement textAlignment="Left" verticalAlignment="Top">
-					<font fontName="微軟正黑體" size="12"/>
-				</textElement>
-				<text><![CDATA[貨品編號：]]></text>
-			</staticText>
-			<staticText>
-				<reportElement x="254" y="0" width="295" height="23" uuid="7de5fed6-2cd8-43a5-a81c-7dca66433be5">
-					<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[Material Stock Out Traceability Report		
-]]></text>
-			</staticText>
-			<textField>
-				<reportElement x="84" y="126" width="336" height="18" uuid="a1c3ef9e-92c7-44fe-9f27-aa686f69da04">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Left" verticalAlignment="Top">
-					<font fontName="微軟正黑體" size="12"/>
-				</textElement>
 				<textFieldExpression><![CDATA[$P{lastOutDateStart} +  " 到 " + $P{lastOutDateEnd}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement x="0" y="126" width="84" height="18" uuid="ecbb5380-5b61-497c-bb77-4d2bd9ad1b3a">
+				<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"/>
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 				</reportElement>
-				<textElement textAlignment="Left" verticalAlignment="Top">
-					<font fontName="微軟正黑體" size="12"/>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font fontName="微軟正黑體" size="16" isBold="true"/>
 				</textElement>
-				<text><![CDATA[最後出倉日期:]]></text>
+				<text><![CDATA[報告時間：]]></text>
 			</staticText>
 		</band>
 	</pageHeader>
 	<detail>
 		<band height="17" splitType="Stretch">
 			<textField>
-				<reportElement x="0" y="0" width="130" height="17" uuid="5f8e4b35-01b2-4fb1-96c4-47fbc6f8d1a6">
+				<reportElement x="0" 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>
-				<textElement verticalAlignment="Top">
+				<textElement textAlignment="Left" verticalAlignment="Top">
 					<font fontName="微軟正黑體" size="10"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{jobOrderNo}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="130" y="0" width="70" height="17" uuid="b7492ff2-eb72-42cb-ab6e-73181dd2daa8"/>
+				<reportElement x="120" 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>
-				<reportElement x="200" y="0" width="70" height="17" uuid="5c934899-ecd8-456e-be2e-d2b00c9e5cd1"/>
+				<reportElement x="620" y="0" width="180" height="17" uuid="37e635a3-bb5b-4435-8508-414a373f7002"/>
 				<textElement verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{lotNo}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{pickRemark}]]></textFieldExpression>
 			</textField>
-			<textField>
-				<reportElement x="270" y="0" width="130" height="17" uuid="a2f20304-2a4a-457b-be8c-79f6995f060f"/>
+			<textField textAdjust="StretchHeight">
+				<reportElement x="508" y="0" width="112" height="17" uuid="9df68816-6fde-4922-8ce0-b7234e076029"/>
 				<textElement textAlignment="Center" verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{expiryDate}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement x="400" y="0" width="59" height="17" uuid="14ac3dc6-86b2-48a3-bd85-7250d1c20f24"/>
-				<textElement textAlignment="Right" verticalAlignment="Top">
-					<font fontName="微軟正黑體"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{stockOutQty}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{storeLocation}]]></textFieldExpression>
 			</textField>
-			<textField>
-				<reportElement x="470" y="0" width="98" height="17" uuid="038f0832-75fa-4fd8-b537-a1065f3b0e38">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
+			<textField textAdjust="StretchHeight">
+				<reportElement x="220" y="0" width="100" height="17" uuid="cdf35daf-76bd-4244-9c5f-4dec5fc38740"/>
 				<textElement verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{materialPickOrderNo}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{lotNo}]]></textFieldExpression>
 			</textField>
-			<textField>
-				<reportElement x="568" y="0" width="71" height="17" uuid="cdb1f6fc-5d11-4f78-a746-7093a5a45af5"/>
-				<textElement verticalAlignment="Top">
+			<textField textAdjust="StretchHeight">
+				<reportElement x="459" y="0" width="49" height="17" uuid="0c22894f-8cca-4a97-a0d4-d069b99631b0"/>
+				<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="9307101e-6eba-4d8a-b0d7-3d6061daa45b"/>
-				<textElement verticalAlignment="Top">
+			<textField textAdjust="StretchHeight">
+				<reportElement x="320" y="0" width="80" height="17" uuid="044e670f-8c24-41bc-9865-153eeefec098"/>
+				<textElement textAlignment="Center" verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{storeLocation}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{expiryDate}]]></textFieldExpression>
 			</textField>
-			<textField>
-				<reportElement x="709" y="0" width="91" height="17" uuid="5531dc2b-bba6-4d4e-bf4b-5167a9a17b2d"/>
-				<textElement verticalAlignment="Top">
+			<textField textAdjust="StretchHeight">
+				<reportElement x="400" y="0" width="59" height="17" uuid="66a8a739-66f8-4f86-9f02-5de5c2520aef"/>
+				<textElement textAlignment="Right" verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{pickRemark}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{stockOutQty}]]></textFieldExpression>
 			</textField>
 		</band>
 	</detail>