Merge remote-tracking branch 'origin/master'

src/main/java/com/ffii/fpsms/modules/report/service/StockTakeVarianceReportService.kt

@@ -82,16 +82,7 @@ open class StockTakeVarianceReportService(
                 /* ====== 基本資料 ====== */
                 COALESCE(it.type, '') AS stockSubCategory,
                 COALESCE(it.code, '') AS itemNo,
-                COALESCE(
-                    CONCAT(
-                        it.name,
-                        CASE
-                            WHEN it.description IS NULL OR it.description = '' THEN ''
-                            ELSE CONCAT('\n', it.description)
-                        END
-                    ),
-                    ''
-                ) AS itemName,
+                COALESCE(it.name, '') AS itemName,
                 COALESCE(uc.udfudesc, '') AS unitOfMeasure,
                 COALESCE(il.lotNo, '') AS lotNo,
                 COALESCE(DATE_FORMAT(il.expiryDate, '%Y-%m-%d'), '') AS expiryDate,

src/main/resources/jasper/FGStockOutTraceabilityReport.jrxml

@@ -185,7 +185,7 @@
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
-					<text><![CDATA[店鋪位置]]></text>
+					<text><![CDATA[存貨位置]]></text>
 				</staticText>
 				<staticText>
 					<reportElement x="400" y="24" width="59" height="18" uuid="7950d513-4660-445b-9b18-08e062b66f30">

src/main/resources/jasper/ItemQCReport.jrxml

@@ -109,7 +109,7 @@
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
-					<text><![CDATA[批量]]></text>
+					<text><![CDATA[數量]]></text>
 				</staticText>
 				<staticText>
 					<reportElement x="539" y="26" width="50" height="18" uuid="7d8c7616-20d1-4081-853b-34bf90711d8f">
@@ -312,7 +312,7 @@
 				<text><![CDATA[報告時間：]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="336" y="0" width="130" height="23" uuid="0102d5e8-f072-4701-abff-8f62a4dc8463">
+				<reportElement x="322" y="0" width="158" height="23" uuid="0102d5e8-f072-4701-abff-8f62a4dc8463">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>

src/main/resources/jasper/MaterialStockOutTraceability.jrxml

@@ -53,7 +53,7 @@
 	<field name="pickRemark" class="java.lang.String"/>
 	<field name="jobOrderNo" 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="42">
@@ -149,7 +149,7 @@
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
-					<text><![CDATA[店鋪位置]]></text>
+					<text><![CDATA[存倉位置]]></text>
 				</staticText>
 				<staticText>
 					<reportElement x="459" y="24" width="49" height="18" uuid="c17221d2-b543-4558-a530-e2b0fe57815c">

src/main/resources/jasper/StockBalanceReport.jrxml

@@ -164,7 +164,7 @@
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
-					<text><![CDATA[ 店鋪位置]]></text>
+					<text><![CDATA[存貨位置]]></text>
 				</staticText>
 				<staticText>
 					<reportElement x="650" y="23" width="71" height="18" uuid="8913364c-9f76-4bf6-bbcf-456e92d75f5c">

src/main/resources/jasper/StockTakeVarianceReport.jrxml

@@ -57,12 +57,12 @@
 	<field name="stockTakeQty" class="java.lang.String"/>
 	<field name="variance" class="java.lang.String"/>
 	<field name="variancePercentage" class="java.lang.String"/>
-	<group name="Group1">
-			<groupExpression><![CDATA[$F{itemNo}]]></groupExpression>
+	<group name="Group1" keepTogether="true">
+		<groupExpression><![CDATA[$F{itemNo}]]></groupExpression>
 		<groupHeader>
-			<band height="69">
+			<band height="44">
 				<staticText>
-					<reportElement x="162" y="50" width="60" height="18" uuid="c43ed9ca-fc56-45ec-b0ee-226cfcff8aa3">
+					<reportElement x="162" y="25" width="60" height="18" uuid="c43ed9ca-fc56-45ec-b0ee-226cfcff8aa3">
 						<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"/>
@@ -73,7 +73,7 @@
 					<text><![CDATA[期初存貨]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="222" y="50" width="59" height="18" uuid="03e2ea49-2624-4d3d-a8a5-5ddb555cf70c">
+					<reportElement x="222" y="25" width="59" height="18" uuid="03e2ea49-2624-4d3d-a8a5-5ddb555cf70c">
 						<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"/>
@@ -84,7 +84,7 @@
 					<text><![CDATA[累計存入量]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="281" y="50" width="61" height="18" uuid="8e6ca12d-b2e5-422e-96e1-71f547b00e8b">
+					<reportElement x="281" y="25" width="61" height="18" uuid="8e6ca12d-b2e5-422e-96e1-71f547b00e8b">
 						<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"/>
@@ -95,7 +95,7 @@
 					<text><![CDATA[累計存出量]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="0" y="50" width="72" height="18" uuid="9b1a4488-b6df-4700-8016-83b36aa7e295">
+					<reportElement x="0" y="25" width="90" height="18" uuid="9b1a4488-b6df-4700-8016-83b36aa7e295">
 						<property name="com.jaspersoft.studio.unit.y" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
@@ -106,7 +106,7 @@
 					<text><![CDATA[批號]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="72" y="50" width="90" height="18" uuid="c88c7ca8-d64c-46b6-9725-f12734d6796a">
+					<reportElement x="90" y="25" width="72" height="18" uuid="c88c7ca8-d64c-46b6-9725-f12734d6796a">
 						<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"/>
@@ -117,7 +117,7 @@
 					<text><![CDATA[到期日]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="342" y="50" width="60" height="18" uuid="dc169b7d-17b6-4d09-b222-c8f7a3e594ec">
+					<reportElement x="342" y="25" width="48" height="18" uuid="dc169b7d-17b6-4d09-b222-c8f7a3e594ec">
 						<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,7 +128,7 @@
 					<text><![CDATA[現存存量]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="402" y="50" width="80" height="18" uuid="ed517641-4204-4b0d-8bd8-c5c2a2d880c5">
+					<reportElement x="402" y="25" width="80" height="18" uuid="ed517641-4204-4b0d-8bd8-c5c2a2d880c5">
 						<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"/>
@@ -136,10 +136,10 @@
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
-					<text><![CDATA[店鋪位置]]></text>
+					<text><![CDATA[存貨位置]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="642" y="50" width="80" height="18" uuid="2a6b0aa8-6959-4850-a55c-76d3a1236619">
+					<reportElement x="642" y="25" width="80" height="18" uuid="2a6b0aa8-6959-4850-a55c-76d3a1236619">
 						<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"/>
@@ -150,7 +150,7 @@
 					<text><![CDATA[最後入倉日期]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="722" y="50" width="78" height="18" uuid="c4154ab0-b050-4007-a9a5-617cb45395a5">
+					<reportElement x="722" y="25" width="78" height="18" uuid="c4154ab0-b050-4007-a9a5-617cb45395a5">
 						<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"/>
@@ -161,7 +161,7 @@
 					<text><![CDATA[最後出倉日期]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="60" y="12" width="119" height="18" uuid="147aafe2-44f4-4ad2-82bc-f280d0d1cf3b">
+					<reportElement x="580" y="25" width="62" height="18" uuid="cc9aeff5-5e31-442c-97af-344d62028419">
 						<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"/>
@@ -169,10 +169,10 @@
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
-					<text><![CDATA[貨品編號]]></text>
+					<text><![CDATA[超撿量百分比]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="279" y="12" width="61" height="18" uuid="3bde86a7-2374-42e3-ae4d-d723d8c26d59">
+					<reportElement x="530" y="25" width="50" height="18" uuid="e4ad84ad-9203-464f-a21c-b9c1214eabfb">
 						<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,19 +180,10 @@
 					<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="19e1fecf-2351-4256-acbd-3c532ecd3053">
-						<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="179" y="12" width="100" height="18" uuid="7dae262b-f67c-4e41-b377-4309e64966e3">
+					<reportElement x="482" y="25" width="48" height="18" uuid="d27b0108-c671-44ac-8af3-3c5f68a5ff4f">
 						<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"/>
@@ -200,30 +191,25 @@
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
-					<text><![CDATA[貨品名稱]]></text>
+					<text><![CDATA[取貨量]]></text>
 				</staticText>
-				<textField>
-					<reportElement x="279" y="30" width="61" height="18" uuid="9c1a6ce6-e459-4be8-8caa-eee298377f0a">
+				<line>
+					<reportElement x="0" y="43" width="800" height="1" uuid="3d8c17c8-9bfb-4d3a-9513-1fd1e0cfa876">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
-						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
-					<textElement textAlignment="Center" verticalAlignment="Top">
-						<font fontName="微軟正黑體" size="10"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{unitOfMeasure}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement x="179" y="30" width="100" height="18" uuid="4ba9a34e-fdbb-4e81-8826-c741c60e5776">
+				</line>
+				<textField textAdjust="StretchHeight">
+					<reportElement x="160" y="4" width="440" height="18" uuid="49bfb864-a907-432f-af61-36787209e742">
 						<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="92479227-2add-4390-a07c-b3d740dc74f4">
+					<reportElement x="600" y="4" width="41" height="18" uuid="9de069f1-dc9f-43ac-8a4d-3f0576a0020b">
 						<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"/>
@@ -231,19 +217,10 @@
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
-					<text><![CDATA[貨物子分類]]></text>
+					<text><![CDATA[單位：]]></text>
 				</staticText>
-				<textField>
-					<reportElement x="60" y="30" width="119" height="18" uuid="aeb5fe9d-7092-46d6-b990-591f95388d80">
-						<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					</reportElement>
-					<textElement verticalAlignment="Top">
-						<font fontName="微軟正黑體" size="10"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{itemNo}]]></textFieldExpression>
-				</textField>
 				<staticText>
-					<reportElement x="580" y="50" width="62" height="18" uuid="cc9aeff5-5e31-442c-97af-344d62028419">
+					<reportElement x="0" y="4" width="50" height="18" uuid="5cc056c2-ccd8-49c4-bea6-377a6effb8b3">
 						<property name="com.jaspersoft.studio.unit.y" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
@@ -251,21 +228,19 @@
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
-					<text><![CDATA[超撿量百分比]]></text>
+					<text><![CDATA[貨品編號：]]></text>
 				</staticText>
-				<staticText>
-					<reportElement x="530" y="50" width="50" height="18" uuid="e4ad84ad-9203-464f-a21c-b9c1214eabfb">
-						<property name="com.jaspersoft.studio.unit.y" value="px"/>
+				<textField textAdjust="StretchHeight">
+					<reportElement x="50" y="4" width="60" height="18" uuid="c09a61b3-69a8-4c7a-933f-de3a6cd1e2ea">
 						<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{itemNo}]]></textFieldExpression>
+				</textField>
 				<staticText>
-					<reportElement x="482" y="50" width="48" height="18" uuid="d27b0108-c671-44ac-8af3-3c5f68a5ff4f">
+					<reportElement x="110" y="4" width="50" height="18" uuid="80442c10-b1a1-4b04-8acb-2b0c4fdf7c78">
 						<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"/>
@@ -273,19 +248,24 @@
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font fontName="微軟正黑體" size="10"/>
 					</textElement>
-					<text><![CDATA[取貨量]]></text>
+					<text><![CDATA[貨品名稱：]]></text>
 				</staticText>
-				<line>
-					<reportElement x="0" y="68" width="800" height="1" uuid="3d8c17c8-9bfb-4d3a-9513-1fd1e0cfa876">
+				<textField textAdjust="StretchHeight">
+					<reportElement x="641" y="4" width="159" height="18" uuid="669a9e33-9af0-45a2-a2a0-b8f47122c5b5">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
-				</line>
+					<textElement verticalAlignment="Middle">
+						<font fontName="微軟正黑體" size="10"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{unitOfMeasure}]]></textFieldExpression>
+				</textField>
 			</band>
 		</groupHeader>
 		<groupFooter>
 			<band height="25">
 				<staticText>
-					<reportElement x="0" y="0" width="72" height="18" uuid="73e4fded-40e2-44d5-b789-34a33978ed5a">
+					<reportElement x="90" y="0" width="72" height="18" uuid="73e4fded-40e2-44d5-b789-34a33978ed5a">
 						<property name="com.jaspersoft.studio.unit.y" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
@@ -300,7 +280,7 @@
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 				</line>
-				<textField>
+				<textField textAdjust="StretchHeight">
 					<reportElement x="222" y="0" width="59" height="18" uuid="f5110679-17e7-4ebe-91c7-d121585e8cb3"/>
 					<textElement textAlignment="Right" verticalAlignment="Top">
 						<font fontName="微軟正黑體"/>
@@ -312,21 +292,21 @@
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 				</line>
-				<textField>
-					<reportElement x="342" y="0" width="60" height="18" uuid="2a6656d2-98da-4b90-9c3b-e26f05ac07e2"/>
+				<textField textAdjust="StretchHeight">
+					<reportElement x="342" y="0" width="48" height="18" uuid="2a6656d2-98da-4b90-9c3b-e26f05ac07e2"/>
 					<textElement textAlignment="Right" verticalAlignment="Top">
 						<font fontName="微軟正黑體"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$F{totalCurrentBalance}]]></textFieldExpression>
 				</textField>
-				<textField>
+				<textField textAdjust="StretchHeight">
 					<reportElement x="281" y="0" width="61" height="18" uuid="a3ba77c5-a47a-4add-8c47-c2b68d409643"/>
 					<textElement textAlignment="Right" verticalAlignment="Top">
 						<font fontName="微軟正黑體"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$F{totalCumStockOut}]]></textFieldExpression>
 				</textField>
-				<textField>
+				<textField textAdjust="StretchHeight">
 					<reportElement x="162" y="0" width="60" height="18" uuid="4ff62b11-988c-4bf8-a851-203770c8206b"/>
 					<textElement textAlignment="Right" verticalAlignment="Top">
 						<font fontName="微軟正黑體"/>
@@ -345,25 +325,7 @@
 		<band splitType="Stretch"/>
 	</background>
 	<pageHeader>
-		<band height="177" splitType="Stretch">
-			<textField>
-				<reportElement x="90" y="58" width="390" height="23" uuid="055d995c-21f5-4c0f-877b-01e3f5b5bcee">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="16" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{stockCategory}]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement x="0" y="58" width="90" height="23" uuid="29921a47-81f3-4a87-a028-9774a52d9d11">
-					<property name="com.jaspersoft.studio.unit.y" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Left" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="16" isBold="true"/>
-				</textElement>
-				<text><![CDATA[貨物分類：]]></text>
-			</staticText>
+		<band height="87" splitType="Stretch">
 			<textField evaluationTime="Report">
 				<reportElement x="780" y="12" width="20" height="18" uuid="3ab4080e-cc8d-4dfa-88f5-735d07ddc468">
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
@@ -404,17 +366,12 @@
 				<text><![CDATA[/]]></text>
 			</staticText>
 			<line>
-				<reportElement x="0" y="90" width="800" height="1" uuid="1798b029-2455-47f7-bc74-71a510296848">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-			</line>
-			<line>
-				<reportElement x="0" y="176" width="799" height="1" uuid="f513c3ec-7fbf-471f-a2e4-253a28919190">
+				<reportElement x="0" y="86" width="799" height="1" uuid="f513c3ec-7fbf-471f-a2e4-253a28919190">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 			</line>
 			<line>
-				<reportElement x="0" y="172" width="799" height="1" uuid="351a15c1-61e4-4af3-bb48-dea07b8df3c2">
+				<reportElement x="0" y="82" width="799" height="1" uuid="351a15c1-61e4-4af3-bb48-dea07b8df3c2">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 			</line>
@@ -457,135 +414,74 @@
 					<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[Stock Take Variance Report]]></text>
+				<text><![CDATA[庫存盤點報告]]></text>
 			</staticText>
 			<textField>
-				<reportElement x="462" y="154" width="336" height="18" uuid="5f48b4ac-c22a-4021-b248-aebd1b92d034">
+				<reportElement x="540" y="58" width="267" height="23" uuid="4ad21cfe-418e-411d-ad7a-33cfb73d0b75">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Top">
-					<font fontName="微軟正黑體" size="12"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{lastOutDateStart} +  " 到 " + $P{lastOutDateEnd} ]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement x="82" y="136" width="716" height="18" uuid="6623c592-7ad7-47a1-88d5-fb090e696173">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement verticalAlignment="Top">
-					<font fontName="微軟正黑體" size="12"/>
+					<font fontName="微軟正黑體" size="16" isBold="true"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$P{storeLocation}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{lastOutDateStart} +  " 到 " + $P{lastOutDateEnd}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement x="0" y="154" width="82" height="18" uuid="87ef77ed-11ea-4b39-8a6d-3d59ff6237c5">
+				<reportElement x="1" y="58" width="118" height="23" uuid="9df7eaca-7dfc-45e1-a75a-d193f39313be">
 					<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>
+				<text><![CDATA[最後入倉日期：]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="0" y="136" width="82" height="18" uuid="d996cf2f-4d33-4670-847c-92972493dfa3">
+				<reportElement x="420" y="58" width="119" height="23" uuid="736fdd8c-50a5-4936-8613-a8309d177516">
 					<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="82" y="100" width="716" height="18" uuid="ac6afeca-fefd-4bd0-bff4-eea61fe8466a">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement verticalAlignment="Top">
-					<font fontName="微軟正黑體" size="12"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{stockSubCategory}]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement x="0" y="100" width="82" height="18" uuid="2458c6d8-ccd9-4681-85e4-282758424b65">
-					<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>
+				<text><![CDATA[最後出倉日期：]]></text>
 			</staticText>
 			<textField>
-				<reportElement x="82" y="154" width="298" height="18" uuid="6fa32fce-a0ee-4d45-9493-4dc2e7a285cb">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Left" verticalAlignment="Top">
-					<font fontName="微軟正黑體" size="12"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{lastInDateStart} +  " 到 " + $P{lastInDateEnd} ]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement x="0" y="118" width="82" height="18" uuid="31dcbc27-d256-4a03-af5b-9ee67096c433">
-					<property name="com.jaspersoft.studio.unit.y" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
+				<reportElement x="120" y="58" width="298" height="23" uuid="73468246-9034-4c32-bee8-9fb393fa6d62"/>
 				<textElement textAlignment="Left" verticalAlignment="Top">
-					<font fontName="微軟正黑體" size="12"/>
-				</textElement>
-				<text><![CDATA[存量：]]></text>
-			</staticText>
-			<textField>
-				<reportElement x="82" y="118" width="716" height="18" uuid="a71100ea-1dd7-493a-b0cc-13d505825b89">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement verticalAlignment="Top">
-					<font fontName="微軟正黑體" size="12"/>
+					<font fontName="微軟正黑體" size="16" isBold="true"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$P{balanceFilterStart}+"件"+ "  ~ " + $P{balanceFilterEnd}+"件"]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{lastInDateStart} +  " 到 " + $P{lastInDateEnd}]]></textFieldExpression>
 			</textField>
-			<staticText>
-				<reportElement x="380" y="154" width="82" height="18" uuid="a967dd17-63af-4315-9421-634ed6063bf8">
-					<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>
-				<text><![CDATA[最後出倉日期:]]></text>
-			</staticText>
 		</band>
 	</pageHeader>
 	<detail>
 		<band height="31" splitType="Stretch">
-			<textField>
+			<textField textAdjust="StretchHeight">
 				<reportElement x="281" y="0" width="61" height="30" uuid="19f83771-8676-4dea-8fe4-d17293cbc904"/>
 				<textElement textAlignment="Right" verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{cumStockOut}]]></textFieldExpression>
 			</textField>
-			<textField>
-				<reportElement x="72" y="0" width="90" height="30" uuid="608e1ba1-d37b-492e-a6c5-c8e97dfaf14a"/>
-				<textElement textAlignment="Right" verticalAlignment="Top">
+			<textField textAdjust="StretchHeight">
+				<reportElement x="90" y="0" width="72" height="30" uuid="608e1ba1-d37b-492e-a6c5-c8e97dfaf14a"/>
+				<textElement textAlignment="Center" verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{expiryDate}]]></textFieldExpression>
 			</textField>
-			<textField>
+			<textField textAdjust="StretchHeight">
 				<reportElement x="162" y="0" width="60" height="30" uuid="f37e22a9-1ddd-4f18-82ca-07007187ecd5"/>
 				<textElement textAlignment="Right" verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{openingBalance}]]></textFieldExpression>
 			</textField>
-			<textField>
-				<reportElement x="0" y="0" width="72" height="30" uuid="1d7293e1-dab1-473e-bdb9-f13cc2b29e19">
+			<textField textAdjust="StretchHeight">
+				<reportElement x="0" y="0" width="90" height="30" uuid="1d7293e1-dab1-473e-bdb9-f13cc2b29e19">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 				</reportElement>
@@ -594,56 +490,56 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{lotNo}]]></textFieldExpression>
 			</textField>
-			<textField>
+			<textField textAdjust="StretchHeight">
 				<reportElement x="222" y="0" width="59" height="30" uuid="f885d459-39e5-49d4-9e7e-fad313f5858a"/>
 				<textElement textAlignment="Right" verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{cumStockIn}]]></textFieldExpression>
 			</textField>
-			<textField>
-				<reportElement x="342" y="0" width="60" height="30" uuid="48601d57-e240-4390-9ec7-71c77773ee86"/>
+			<textField textAdjust="StretchHeight">
+				<reportElement x="342" y="0" width="48" height="30" uuid="48601d57-e240-4390-9ec7-71c77773ee86"/>
 				<textElement textAlignment="Right" verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{currentBookBalance}]]></textFieldExpression>
 			</textField>
-			<textField>
+			<textField textAdjust="StretchHeight">
 				<reportElement x="402" y="0" width="80" height="30" uuid="f8664cfc-0eb6-497a-bce6-2171e3d9e43a"/>
-				<textElement textAlignment="Left" verticalAlignment="Top">
+				<textElement textAlignment="Center" verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{storeLocation}]]></textFieldExpression>
 			</textField>
-			<textField>
+			<textField textAdjust="StretchHeight">
 				<reportElement x="722" y="0" width="78" height="30" uuid="f77b71a5-fd51-4d0b-86cd-fe556b5abfa0"/>
-				<textElement textAlignment="Right" verticalAlignment="Top">
+				<textElement textAlignment="Center" verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{lastOutDate}]]></textFieldExpression>
 			</textField>
-			<textField>
+			<textField textAdjust="StretchHeight">
 				<reportElement x="642" y="0" width="80" height="30" uuid="19641d4c-43f5-42ef-b76a-1efc06f9805a"/>
-				<textElement textAlignment="Right" verticalAlignment="Top">
+				<textElement textAlignment="Center" verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{lastInDate}]]></textFieldExpression>
 			</textField>
-			<textField>
+			<textField textAdjust="StretchHeight">
 				<reportElement x="482" y="0" width="48" height="30" uuid="02d11283-5166-45fd-a900-6ae62315ac0a"/>
 				<textElement textAlignment="Right" verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{stockTakeQty}]]></textFieldExpression>
 			</textField>
-			<textField>
+			<textField textAdjust="StretchHeight">
 				<reportElement x="530" y="0" width="50" height="30" uuid="68b8a311-ac96-4df6-9b9f-fb0db60c8a2d"/>
 				<textElement textAlignment="Right" verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{variance}]]></textFieldExpression>
 			</textField>
-			<textField>
+			<textField textAdjust="StretchHeight">
 				<reportElement x="580" y="0" width="62" height="30" uuid="c49f3615-0417-4724-a048-127fafce1d10"/>
 				<textElement textAlignment="Right" verticalAlignment="Top">
 					<font fontName="微軟正黑體"/>