diff --git a/src/main/resources/jasper/FGDeliveryReport.jrxml b/src/main/resources/jasper/FGDeliveryReport.jrxml
index 53b3819..eb39192 100644
--- a/src/main/resources/jasper/FGDeliveryReport.jrxml
+++ b/src/main/resources/jasper/FGDeliveryReport.jrxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Jaspersoft Studio version 6.21.3.final using JasperReports Library version 6.21.3-4a3078d20785ebe464f18037d738d12fc98c13cf  -->
+<!-- Created with Jaspersoft Studio version 6.17.0.final using JasperReports Library version 6.17.0-6d93193241dd8cc42629e188b94f9e0bc5722efd  -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="FGStockOutTraceabilityReport" pageWidth="842" pageHeight="595" orientation="Landscape" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="c40e235b-365d-48a0-a1b8-a8e0ece2cdd3">
 	<property name="com.jaspersoft.studio.unit." value="pixel"/>
 	<property name="com.jaspersoft.studio.unit.pageHeight" value="pixel"/>
@@ -224,7 +224,7 @@
 				<textElement textAlignment="Left" verticalAlignment="Middle">
 					<font fontName="微軟正黑體" size="12" isBold="true"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$P{lastOutDateStart} +  " 到 " + $P{lastOutDateEnd}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{lastOutDateStart} +  " 至 " + $P{lastOutDateEnd}]]></textFieldExpression>
 			</textField>
 			<staticText>
 				<reportElement x="8" y="53" width="90" height="23" uuid="1543eecf-9964-43b0-9103-e885209265e4">
diff --git a/src/main/resources/jasper/FGStockOutTraceabilityReport.jrxml b/src/main/resources/jasper/FGStockOutTraceabilityReport.jrxml
index 7fe5400..6959ca0 100644
--- a/src/main/resources/jasper/FGStockOutTraceabilityReport.jrxml
+++ b/src/main/resources/jasper/FGStockOutTraceabilityReport.jrxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Jaspersoft Studio version 6.21.3.final using JasperReports Library version 6.21.3-4a3078d20785ebe464f18037d738d12fc98c13cf  -->
+<!-- Created with Jaspersoft Studio version 6.17.0.final using JasperReports Library version 6.17.0-6d93193241dd8cc42629e188b94f9e0bc5722efd  -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="SemiFGProductionAnalysisReport" pageWidth="842" pageHeight="595" orientation="Landscape" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="a2a84586-3f53-476e-9c1f-6b13ad75908a">
 	<property name="com.jaspersoft.studio.data.sql.tables" value=""/>
 	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/>
@@ -153,7 +153,7 @@
 				<textElement textAlignment="Left" verticalAlignment="Middle">
 					<font fontName="微軟正黑體" size="12" isBold="true"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$P{lastOutDateStart} +  " 到 " + $P{lastOutDateEnd}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{lastOutDateStart} +  " 至 " + $P{lastOutDateEnd}]]></textFieldExpression>
 			</textField>
 			<staticText>
 				<reportElement x="490" y="80" width="59" height="18" uuid="7950d513-4660-445b-9b18-08e062b66f30">
diff --git a/src/main/resources/jasper/ItemQCReport.jrxml b/src/main/resources/jasper/ItemQCReport.jrxml
index fdb7fdb..5aa3a2e 100644
--- a/src/main/resources/jasper/ItemQCReport.jrxml
+++ b/src/main/resources/jasper/ItemQCReport.jrxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Jaspersoft Studio version 6.21.3.final using JasperReports Library version 6.21.3-4a3078d20785ebe464f18037d738d12fc98c13cf  -->
+<!-- Created with Jaspersoft Studio version 6.17.0.final using JasperReports Library version 6.17.0-6d93193241dd8cc42629e188b94f9e0bc5722efd  -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="ItemQCReport" pageWidth="842" pageHeight="595" orientation="Landscape" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="6a86bad3-14fb-475b-b1eb-824e47f43432">
 	<subDataset name="Empty Dataset1" uuid="b8103bc4-ba4d-4924-9104-c2a6b6737612"/>
 	<parameter name="stockSubCategory" class="java.lang.String">
@@ -278,7 +278,7 @@
 				<textElement textAlignment="Left" verticalAlignment="Middle">
 					<font fontName="微軟正黑體" size="12" isBold="true"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$P{lastInDateStart} +  " 到 " + $P{lastInDateEnd}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{lastInDateStart} +  " 至 " + $P{lastInDateEnd}]]></textFieldExpression>
 			</textField>
 		</band>
 	</pageHeader>
diff --git a/src/main/resources/jasper/MaterialStockOutTraceability.jrxml b/src/main/resources/jasper/MaterialStockOutTraceability.jrxml
index caa7b9b..6bfa86e 100644
--- a/src/main/resources/jasper/MaterialStockOutTraceability.jrxml
+++ b/src/main/resources/jasper/MaterialStockOutTraceability.jrxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Jaspersoft Studio version 6.21.3.final using JasperReports Library version 6.21.3-4a3078d20785ebe464f18037d738d12fc98c13cf  -->
+<!-- Created with Jaspersoft Studio version 6.17.0.final using JasperReports Library version 6.17.0-6d93193241dd8cc42629e188b94f9e0bc5722efd  -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="MaterialStockOutTraceability" pageWidth="842" pageHeight="595" orientation="Landscape" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="70a1aa41-cdaf-4e67-a3f4-b5983ddcf764">
 	<parameter name="stockSubCategory" class="java.lang.String">
 		<defaultValueExpression><![CDATA["stockSubCategory"]]></defaultValueExpression>
@@ -308,7 +308,7 @@
 				<textElement textAlignment="Left" verticalAlignment="Middle">
 					<font fontName="微軟正黑體" size="12" isBold="true"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$P{lastOutDateStart} +  " 到 " + $P{lastOutDateEnd}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{lastOutDateStart} +  " 至 " + $P{lastOutDateEnd}]]></textFieldExpression>
 			</textField>
 		</band>
 	</pageHeader>
diff --git a/src/main/resources/jasper/SemiFGProductionAnalysisReport.jrxml b/src/main/resources/jasper/SemiFGProductionAnalysisReport.jrxml
index 63524a7..fb5a959 100644
--- a/src/main/resources/jasper/SemiFGProductionAnalysisReport.jrxml
+++ b/src/main/resources/jasper/SemiFGProductionAnalysisReport.jrxml
@@ -461,7 +461,7 @@
 				<textElement textAlignment="Left" verticalAlignment="Middle">
 					<font fontName="微軟正黑體" size="12" isBold="true"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$P{lastOutDateStart} +  " 到 " + $P{lastOutDateEnd}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{lastOutDateStart} +  " 至 " + $P{lastOutDateEnd}]]></textFieldExpression>
 			</textField>
 			<staticText>
 				<reportElement x="10" y="53" width="90" height="23" uuid="fb09a559-f5fa-4e56-a891-87c600a2745a">
diff --git a/src/main/resources/jasper/StockInTraceabilityReport.jrxml b/src/main/resources/jasper/StockInTraceabilityReport.jrxml
index 5a0b805..a3ce02c 100644
--- a/src/main/resources/jasper/StockInTraceabilityReport.jrxml
+++ b/src/main/resources/jasper/StockInTraceabilityReport.jrxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Jaspersoft Studio version 6.21.3.final using JasperReports Library version 6.21.3-4a3078d20785ebe464f18037d738d12fc98c13cf  -->
+<!-- Created with Jaspersoft Studio version 6.17.0.final using JasperReports Library version 6.17.0-6d93193241dd8cc42629e188b94f9e0bc5722efd  -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="StockInTraceability" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="AllSectionsNoDetail" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="ed7bc020-85fe-4ae0-83d4-107bf939c670">
 	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/>
 	<parameter name="stockSubCategory" class="java.lang.String">
@@ -308,7 +308,7 @@
 				<textElement textAlignment="Left" verticalAlignment="Middle">
 					<font fontName="微軟正黑體" size="12" isBold="true"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$P{lastInDateStart} +  " 到 " + $P{lastInDateEnd}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{lastInDateStart} +  " 至 " + $P{lastInDateEnd}]]></textFieldExpression>
 			</textField>
 			<staticText>
 				<reportElement x="677" y="0" width="40" height="23" uuid="2ebe654d-a62f-48a7-b5f5-af7e1089dc84">
diff --git a/src/main/resources/jasper/StockTakeVarianceReport.jrxml b/src/main/resources/jasper/StockTakeVarianceReport.jrxml
index 8ad9452..74b9632 100644
--- a/src/main/resources/jasper/StockTakeVarianceReport.jrxml
+++ b/src/main/resources/jasper/StockTakeVarianceReport.jrxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Jaspersoft Studio version 6.21.3.final using JasperReports Library version 6.21.3-4a3078d20785ebe464f18037d738d12fc98c13cf  -->
+<!-- Created with Jaspersoft Studio version 6.17.0.final using JasperReports Library version 6.17.0-6d93193241dd8cc42629e188b94f9e0bc5722efd  -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="StockTakeVarianceReport" pageWidth="842" pageHeight="595" orientation="Landscape" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="f00b4a24-af11-4263-9e82-3966acf01017">
 	<parameter name="stockSubCategory" class="java.lang.String">
 		<defaultValueExpression><![CDATA["stockSubCategory"]]></defaultValueExpression>
@@ -23,11 +23,11 @@
 	<parameter name="balanceFilterEnd" class="java.lang.String">
 		<parameterDescription><![CDATA["balanceFilterEnd"]]></parameterDescription>
 	</parameter>
-	<parameter name="lastInDateStart" class="java.lang.String">
-		<parameterDescription><![CDATA["lastInDateStart"]]></parameterDescription>
+	<parameter name="stockTakeDateStart" class="java.lang.String">
+		<parameterDescription><![CDATA["stockTakeDateStart"]]></parameterDescription>
 	</parameter>
-	<parameter name="lastOutDateStart" class="java.lang.String">
-		<parameterDescription><![CDATA["lastOutDateStart"]]></parameterDescription>
+	<parameter name="stockTakeDateEnd" class="java.lang.String">
+		<parameterDescription><![CDATA["stockTakeDateEnd"]]></parameterDescription>
 	</parameter>
 	<parameter name="lastInDateEnd" class="java.lang.String">
 		<parameterDescription><![CDATA["lastInDateStart"]]></parameterDescription>
@@ -58,7 +58,6 @@
 	<field name="stockTakeQty" class="java.lang.String"/>
 	<field name="variance" class="java.lang.String"/>
 	<field name="variancePercentage" class="java.lang.String"/>
-	
 	<group name="Group1" keepTogether="true" preventOrphanFooter="true">
 		<groupExpression><![CDATA[$F{itemNo}]]></groupExpression>
 		<groupHeader>
@@ -161,11 +160,11 @@
 				<textFieldExpression><![CDATA[$P{reportDate} + "(" + $P{reportTime}+")"]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="708" y="29" width="90" height="23" uuid="d117e97e-8158-4aef-9e48-d19456c4073c"/>
+				<reportElement x="578" y="30" width="219" height="23" uuid="d117e97e-8158-4aef-9e48-d19456c4073c"/>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
 					<font fontName="微軟正黑體" size="12" isBold="true"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$P{stockTakeDate}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{stockTakeDateStart}+"至"+$P{stockTakeDateEnd}]]></textFieldExpression>
 			</textField>
 			<staticText>
 				<reportElement x="747" y="0" width="21" height="23" uuid="5a1b4b58-b7b1-48c9-b229-7e96392c6425">
@@ -186,7 +185,7 @@
 				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement x="640" y="29" width="68" height="23" uuid="3741c716-b76a-442a-a4f8-0152853941d5">
+				<reportElement x="510" y="30" width="68" height="23" uuid="3741c716-b76a-442a-a4f8-0152853941d5">
 					<property name="com.jaspersoft.studio.unit.y" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>