From 58644ed2dc426e850fbc79aab6d46262342c4dd4 Mon Sep 17 00:00:00 2001
From: "Tommy\\2Fi-Staff" <tommy.lu@2fi-solutions.com.hk>
Date: Tue, 10 Feb 2026 12:40:30 +0800
Subject: [PATCH] report update

---
 .../jasper/FGStockOutTraceabilityReport.jrxml |   2 +-
 .../jasper/MaterialStockOutTraceability.jrxml |   6 +-
 .../resources/jasper/StockBalanceReport.jrxml | 108 +++++------
 .../jasper/StockInTraceabilityReport.jrxml    | 180 +++++++++---------
 4 files changed, 146 insertions(+), 150 deletions(-)

diff --git a/src/main/resources/jasper/FGStockOutTraceabilityReport.jrxml b/src/main/resources/jasper/FGStockOutTraceabilityReport.jrxml
index db099fa..5b96e71 100644
--- a/src/main/resources/jasper/FGStockOutTraceabilityReport.jrxml
+++ b/src/main/resources/jasper/FGStockOutTraceabilityReport.jrxml
@@ -57,7 +57,7 @@
 	<field name="pickRemark" class="java.lang.String"/>
 	<field name="deliveryOrderNo" class="java.lang.String"/>
 	<field name="totalStockOutQty" class="java.lang.String"/>
-	<group name="Group1">
+	<group name="Group1" keepTogether="true">
 		<groupExpression><![CDATA[$F{itemNo}]]></groupExpression>
 		<groupHeader>
 			<band height="44">
diff --git a/src/main/resources/jasper/MaterialStockOutTraceability.jrxml b/src/main/resources/jasper/MaterialStockOutTraceability.jrxml
index 7942a35..52381f5 100644
--- a/src/main/resources/jasper/MaterialStockOutTraceability.jrxml
+++ b/src/main/resources/jasper/MaterialStockOutTraceability.jrxml
@@ -363,7 +363,7 @@
 	</pageHeader>
 	<detail>
 		<band height="17" splitType="Stretch">
-			<textField>
+			<textField textAdjust="StretchHeight">
 				<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"/>
@@ -373,14 +373,14 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{jobOrderNo}]]></textFieldExpression>
 			</textField>
-			<textField>
+			<textField textAdjust="StretchHeight">
 				<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>
+			<textField textAdjust="StretchHeight">
 				<reportElement x="620" y="0" width="180" height="17" uuid="37e635a3-bb5b-4435-8508-414a373f7002"/>
 				<textElement verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
diff --git a/src/main/resources/jasper/StockBalanceReport.jrxml b/src/main/resources/jasper/StockBalanceReport.jrxml
index b1497d9..2a3d263 100644
--- a/src/main/resources/jasper/StockBalanceReport.jrxml
+++ b/src/main/resources/jasper/StockBalanceReport.jrxml
@@ -63,44 +63,12 @@
 	<field name="reOrderLevel" class="java.lang.String"/>
 	<field name="reOrderQty" class="java.lang.String"/>
 	<field name="storeLocation" class="java.lang.String"/>
-	<group name="Group1">
+	<group name="Group1" keepTogether="true">
 		<groupExpression><![CDATA[$F{itemNo}]]></groupExpression>
 		<groupHeader>
-			<band height="38">
+			<band height="42">
 				<staticText>
-					<reportElement x="0" y="0" width="50" height="18" uuid="327927e0-1d3b-4395-9b0c-acdac889d91e">
-						<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="0" width="50" height="18" uuid="474493a2-7188-4ae2-8536-be93c7bbd0bd">
-						<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="320" y="0" width="30" height="18" uuid="9e4bc6c5-bdaa-41cd-ba0f-b7229a7bc091">
-						<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="10"/>
-					</textElement>
-					<text><![CDATA[單位：]]></text>
-				</staticText>
-				<staticText>
-					<reportElement x="0" y="18" width="120" height="18" uuid="aa7590f2-5ce0-4877-b98d-b197fa799fee">
+					<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"/>
@@ -111,7 +79,7 @@
 					<text><![CDATA[批號]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="120" y="18" width="80" height="18" uuid="a78ad88c-d542-4a5f-9662-c3f9f90776b8">
+					<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"/>
@@ -122,7 +90,7 @@
 					<text><![CDATA[到期日]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="200" y="18" width="40" height="18" uuid="360cf13a-93e7-45d4-8a4d-9e9506a6ad3f">
+					<reportElement x="200" y="23" width="40" 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"/>
@@ -133,7 +101,7 @@
 					<text><![CDATA[期初存量]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="250" y="18" width="61" height="18" uuid="e95456ea-35da-4b71-8dc6-f11cf1c519d5">
+					<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"/>
@@ -144,7 +112,7 @@
 					<text><![CDATA[累計存入量]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="319" y="18" width="61" height="18" uuid="2e7bbc7e-bc76-45d6-9f32-099e3058ce7b">
+					<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"/>
@@ -155,7 +123,7 @@
 					<text><![CDATA[累計存出量]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="390" y="18" width="40" height="18" uuid="b208e97a-9d94-40ba-9922-3399d8e2f3ac">
+					<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"/>
@@ -166,7 +134,7 @@
 					<text><![CDATA[現存存貨]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="440" y="18" width="40" height="18" uuid="3866d462-c233-4998-a0f4-fa527b89bc0e">
+					<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"/>
@@ -177,7 +145,7 @@
 					<text><![CDATA[補貨位]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="490" y="18" width="40" height="18" uuid="eaf55a87-c36f-4b9e-8957-2747bce9d43d">
+					<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"/>
@@ -188,7 +156,7 @@
 					<text><![CDATA[補貨數量]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="540" y="18" width="110" height="18" uuid="4bb9dbca-a6bb-4596-969e-86e8dd60c215">
+					<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"/>
@@ -199,7 +167,7 @@
 					<text><![CDATA[ 店鋪位置]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="650" y="18" width="71" height="18" uuid="8913364c-9f76-4bf6-bbcf-456e92d75f5c">
+					<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"/>
@@ -210,7 +178,7 @@
 					<text><![CDATA[最後入倉日期]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="730" y="18" width="70" height="18" uuid="49a89912-a5e5-4d5b-9ecd-fcf3169bed84">
+					<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"/>
@@ -220,40 +188,68 @@
 					</textElement>
 					<text><![CDATA[最後出倉日期]]></text>
 				</staticText>
-				<line>
-					<reportElement x="0" y="37" width="799" height="1" uuid="008bb275-0f55-4cfa-afe3-bd4b3a90db19">
+				<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>
-				</line>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
+						<font fontName="微軟正黑體" size="10"/>
+					</textElement>
+					<text><![CDATA[貨品名稱：]]></text>
+				</staticText>
 				<textField textAdjust="StretchHeight">
-					<reportElement x="50" y="0" width="70" height="18" uuid="81a938f8-9081-468e-be58-e98d3afd75f8">
+					<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 textAlignment="Left" verticalAlignment="Middle">
+					<textElement verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$F{itemNo}]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="StretchHeight">
-					<reportElement x="170" y="0" width="80" height="18" uuid="2f8b6c65-41f4-44ac-89df-0b10cfa2c701">
+					<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 textAlignment="Left" verticalAlignment="Middle">
+					<textElement verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$F{itemName}]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="StretchHeight">
-					<reportElement x="350" y="0" width="120" height="18" uuid="6bc40724-586f-44e6-ab5a-dcfd6d51d1d4">
+					<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 textAlignment="Left" verticalAlignment="Middle">
+					<textElement verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$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>
@@ -499,7 +495,7 @@
 		</band>
 	</pageHeader>
 	<detail>
-		<band height="20" splitType="Stretch">
+		<band height="19" 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"/>
@@ -567,7 +563,7 @@
 				<textElement textAlignment="Left" verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
 				</textElement>
-				<textFieldExpression><![CDATA[ $F{storeLocation}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{storeLocation}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
 				<reportElement x="650" y="2" width="71" height="17" uuid="708c707e-8102-410e-9603-1e97c42a8680"/>
diff --git a/src/main/resources/jasper/StockInTraceabilityReport.jrxml b/src/main/resources/jasper/StockInTraceabilityReport.jrxml
index ba7e47a..0c4a6cc 100644
--- a/src/main/resources/jasper/StockInTraceabilityReport.jrxml
+++ b/src/main/resources/jasper/StockInTraceabilityReport.jrxml
@@ -61,32 +61,25 @@
 	<field name="totalIqcSampleQty" class="java.lang.String"/>
 	<field name="totalIqcDefectQty" class="java.lang.String"/>
 	<field name="stockInQty" class="java.lang.String"/>
-	<group name="Group1" isStartNewPage="true">
+	<group name="Group1" keepTogether="true">
 		<groupExpression><![CDATA[$F{itemNo}]]></groupExpression>
 		<groupHeader>
 			<band height="51">
 				<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				<textField>
-					<reportElement x="380" y="2" width="179" height="18" uuid="751247a0-9870-48dd-b854-75d105fb13cd">
+				<staticText>
+					<reportElement stretchType="RelativeToTallestObject" x="370" y="23" 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 verticalAlignment="Middle">
+					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{unitOfMeasure}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement x="61" y="2" width="79" height="18" uuid="d52a8b20-92ea-478c-a5e5-fccae4664baa">
-						<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					</reportElement>
-					<textElement verticalAlignment="Middle">
-						<font fontName="微軟正黑體" size="10"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{itemNo}]]></textFieldExpression>
-				</textField>
+					<text><![CDATA[進料檢查
+缺陷數量]]></text>
+				</staticText>
 				<staticText>
-					<reportElement x="141" y="2" width="59" height="18" uuid="5d687dac-ddbb-4071-901d-65e8c988ad7b">
+					<reportElement stretchType="RelativeToTallestObject" x="0" y="23" 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"/>
@@ -94,31 +87,34 @@
 					<textElement textAlignment="Left" verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
-					<text><![CDATA[貨品名稱：]]></text>
+					<text><![CDATA[送貨單編號]]></text>
 				</staticText>
-				<textField>
-					<reportElement x="200" y="2" width="151" height="18" uuid="f21e9d4e-ef66-4c17-83df-f5fb411e460f">
+				<staticText>
+					<reportElement stretchType="RelativeToTallestObject" x="670" y="23" width="40" height="28" uuid="0687499f-0edd-455b-b0a4-caf5725b5f81">
+						<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="Middle">
+					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{itemName}]]></textFieldExpression>
-				</textField>
+					<text><![CDATA[供應商
+編號]]></text>
+				</staticText>
 				<staticText>
-					<reportElement x="1" y="2" width="59" height="18" uuid="00ef3912-d68e-4354-94ad-8e074f903526">
+					<reportElement stretchType="RelativeToTallestObject" x="320" y="23" 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="Center" verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
-					<text><![CDATA[貨品編號：]]></text>
+					<text><![CDATA[進料檢查
+樣品數量]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="349" y="2" width="31" height="18" uuid="08922c86-bd48-42ab-acc3-5157ae295a9d">
+					<reportElement stretchType="RelativeToTallestObject" x="110" y="23" 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"/>
@@ -126,10 +122,10 @@
 					<textElement textAlignment="Left" verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
-					<text><![CDATA[單位：]]></text>
+					<text><![CDATA[批號]]></text>
 				</staticText>
 				<staticText>
-					<reportElement stretchType="RelativeToTallestObject" x="360" y="20" width="50" height="28" uuid="1f82d706-0492-46e4-b692-dced5c97c824">
+					<reportElement stretchType="RelativeToTallestObject" x="710" y="23" width="90" 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"/>
@@ -137,11 +133,10 @@
 					<textElement textAlignment="Left" verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
-					<text><![CDATA[進料檢查
-缺陷數量]]></text>
+					<text><![CDATA[供應商名稱]]></text>
 				</staticText>
 				<staticText>
-					<reportElement stretchType="RelativeToTallestObject" x="0" y="20" width="110" height="28" uuid="3fa7c301-1c2a-430b-8985-338ebf7aa6cf">
+					<reportElement stretchType="RelativeToTallestObject" x="590" y="23" 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"/>
@@ -149,128 +144,128 @@
 					<textElement textAlignment="Left" verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
-					<text><![CDATA[送貨單編號]]></text>
+					<text><![CDATA[存貨位置]]></text>
 				</staticText>
 				<staticText>
-					<reportElement stretchType="RelativeToTallestObject" x="670" y="20" width="40" height="28" uuid="0687499f-0edd-455b-b0a4-caf5725b5f81">
+					<reportElement stretchType="RelativeToTallestObject" x="210" y="23" 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="Left" verticalAlignment="Middle">
+					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
-					<text><![CDATA[供應商
-編號]]></text>
+					<text><![CDATA[到期日]]></text>
 				</staticText>
 				<staticText>
-					<reportElement stretchType="RelativeToTallestObject" x="310" y="20" width="50" height="28" uuid="006c5557-c246-47cd-b599-4775f71cbf16">
+					<reportElement stretchType="RelativeToTallestObject" x="480" y="23" 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"/>
 					</reportElement>
-					<textElement textAlignment="Left" verticalAlignment="Middle">
+					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
-					<text><![CDATA[進料檢查
-樣品數量]]></text>
+					<text><![CDATA[進料
+檢查結果]]></text>
 				</staticText>
 				<staticText>
-					<reportElement stretchType="RelativeToTallestObject" x="110" y="20" width="90" height="28" uuid="2f1e753f-ee01-42a1-a4e3-f75985403431">
+					<reportElement stretchType="RelativeToTallestObject" x="270" y="23" 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">
+					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
-					<text><![CDATA[批號]]></text>
+					<text><![CDATA[入庫數量]]></text>
 				</staticText>
 				<staticText>
-					<reportElement stretchType="RelativeToTallestObject" x="710" y="20" width="90" height="28" uuid="db5b9c55-0185-420b-ba6c-0e10d154cc8a">
+					<reportElement stretchType="RelativeToTallestObject" x="530" y="23" 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">
+					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
-					<text><![CDATA[供應商名稱]]></text>
+					<text><![CDATA[進料
+檢查備註]]></text>
 				</staticText>
 				<staticText>
-					<reportElement stretchType="RelativeToTallestObject" x="590" y="20" width="80" height="28" uuid="c1d0f0dd-34d6-4716-90bd-deb94e5084d2">
+					<reportElement stretchType="RelativeToTallestObject" x="420" y="23" 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="Left" verticalAlignment="Middle">
+					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
-					<text><![CDATA[存貨位置]]></text>
+					<text><![CDATA[進料檢查
+缺陷百分比]]></text>
 				</staticText>
 				<staticText>
-					<reportElement stretchType="RelativeToTallestObject" x="200" y="20" width="60" height="28" uuid="cd7a146a-1af0-4428-9b88-dcb159691656">
+					<reportElement x="110" y="4" width="50" height="18" uuid="305dd66b-33b6-4dc4-bd13-c77ae457884b">
 						<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="Center" verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
-					<text><![CDATA[到期日]]></text>
+					<text><![CDATA[貨品名稱：]]></text>
 				</staticText>
-				<staticText>
-					<reportElement stretchType="RelativeToTallestObject" x="470" y="20" width="50" height="28" uuid="3c732314-35c2-42ad-98e6-ef42a512c233">
-						<property name="com.jaspersoft.studio.unit.y" value="px"/>
+				<textField textAdjust="StretchHeight">
+					<reportElement x="50" y="4" width="60" height="18" uuid="930d6c96-9abe-4242-a3f0-3c3a84e7f1da">
+						<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="7ee60e77-8eaa-4f80-a5d5-8916151b6b8f">
 						<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 verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
-					<text><![CDATA[進料
-檢查結果]]></text>
-				</staticText>
-				<staticText>
-					<reportElement stretchType="RelativeToTallestObject" x="260" y="20" width="50" height="28" uuid="5c05c89c-843b-4fd6-928c-002c6a529679">
-						<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<textFieldExpression><![CDATA[$F{itemName}]]></textFieldExpression>
+				</textField>
+				<textField textAdjust="StretchHeight">
+					<reportElement x="681" y="4" width="119" height="18" uuid="b0ba730f-e406-43e3-81cc-faf4dc89eafe">
 						<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 verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
-					<text><![CDATA[入庫數量]]></text>
-				</staticText>
+					<textFieldExpression><![CDATA[$F{unitOfMeasure}]]></textFieldExpression>
+				</textField>
 				<staticText>
-					<reportElement stretchType="RelativeToTallestObject" x="520" y="20" width="70" height="28" uuid="58b33148-a772-4295-b10a-718fccc89683">
+					<reportElement x="0" y="4" width="50" height="18" uuid="bf65e88d-23db-45f6-bec1-5c6312fa9de6">
 						<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="Center" verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
-					<text><![CDATA[進料
-檢查備註]]></text>
+					<text><![CDATA[貨品編號：]]></text>
 				</staticText>
 				<staticText>
-					<reportElement stretchType="RelativeToTallestObject" x="410" y="20" width="60" height="28" uuid="c70088ac-bcf1-48a1-bb82-ad238a3dbe70">
+					<reportElement x="640" y="4" width="41" height="18" uuid="81a6f1cd-0a18-44d9-8839-b4a7a6acf4ef">
 						<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="Center" verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
-					<text><![CDATA[進料檢查
-缺陷百分比]]></text>
+					<text><![CDATA[單位：]]></text>
 				</staticText>
-				<line>
-					<reportElement x="0" y="50" width="799" height="1" uuid="6032b143-631d-4978-8f0a-68a7febeef78">
-						<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					</reportElement>
-				</line>
 			</band>
 		</groupHeader>
 		<groupFooter>
@@ -332,7 +327,7 @@
 		</groupFooter>
 	</group>
 	<pageHeader>
-		<band height="71" splitType="Stretch">
+		<band height="74" 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"/>
@@ -395,7 +390,7 @@
 				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="100" y="23" width="90" height="22" uuid="ff7dd53c-f505-4615-bed4-107d0f053ffe"/>
+				<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>
@@ -412,7 +407,7 @@
 				<text><![CDATA[報告時間：]]></text>
 			</staticText>
 			<textField>
-				<reportElement x="100" y="45" width="298" height="22" uuid="b2f17ca6-bddc-4eb6-9960-f0e7fdf886af">
+				<reportElement x="100" y="45" width="380" height="22" uuid="b2f17ca6-bddc-4eb6-9960-f0e7fdf886af">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
@@ -441,6 +436,11 @@
 				</textElement>
 				<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>
 		</band>
 	</pageHeader>
 	<detail>
@@ -455,7 +455,7 @@
 				<textFieldExpression><![CDATA[$F{dnNo}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="110" y="2" width="90" height="18" uuid="ec54cf40-555d-4307-921e-23d2cc35418d">
+				<reportElement x="110" 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">
@@ -464,14 +464,14 @@
 				<textFieldExpression><![CDATA[$F{lotNo}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="200" y="2" width="60" height="18" uuid="4c835a14-380f-46e3-a77e-6d61bbc6766a"/>
-				<textElement textAlignment="Left" verticalAlignment="Top">
+				<reportElement x="210" 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="260" y="2" width="50" height="18" uuid="0e8b333b-88ec-4d30-8fca-b02bc906305f">
+				<reportElement x="270" 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">
@@ -480,7 +480,7 @@
 				<textFieldExpression><![CDATA[$F{stockInQty}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="310" y="2" width="50" height="18" uuid="d6417d18-6b11-4964-8774-a8795bc0983b">
+				<reportElement x="320" 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">
@@ -489,7 +489,7 @@
 				<textFieldExpression><![CDATA[$F{iqcSampleQty}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="360" y="2" width="50" height="18" uuid="5b94c23b-0ef3-4283-85ce-698ca4a2599e">
+				<reportElement x="370" 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">
@@ -498,7 +498,7 @@
 				<textFieldExpression><![CDATA[$F{iqcDefectQty}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="410" y="2" width="60" height="18" uuid="de73b394-93be-440e-9cf3-0ff402506a3a">
+				<reportElement x="420" 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">
@@ -507,7 +507,7 @@
 				<textFieldExpression><![CDATA[$F{iqcDefectPercentage}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="470" y="2" width="50" height="18" uuid="c2575894-67a5-4251-aebd-59999fec00b5">
+				<reportElement x="480" 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">
@@ -516,7 +516,7 @@
 				<textFieldExpression><![CDATA[$F{iqcResult}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement x="520" y="2" width="70" height="18" uuid="62104cab-dcd5-41f0-abbf-21d7badc0edb">
+				<reportElement x="530" 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">