diff --git a/src/main/resources/PickRecord/PickRecordPDF.jrxml b/src/main/resources/PickRecord/PickRecordPDF.jrxml
index b0dc32b..7b9869c 100644
--- a/src/main/resources/PickRecord/PickRecordPDF.jrxml
+++ b/src/main/resources/PickRecord/PickRecordPDF.jrxml
@@ -1,31 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 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="PickRecord" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" isIgnorePagination="true" uuid="63c880e0-c8f6-4221-b8c9-868f8eb315a8">
-    <property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/>
+<!-- Created with Jaspersoft Studio version 6.21.3.final using JasperReports Library version 6.21.3-4a3078d20785ebe464f18037d738d12fc98c13cf  -->
+<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="PickRecordv2" language="javascript" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" isTitleNewPage="true" uuid="a037339e-92cf-44fd-9360-64465f285f3c">
     <parameter name="JobOrderCode" class="java.lang.String"/>
-    <parameter name="ProductionDate" class="java.lang.String"/>
-    <parameter name="RequiredQuantity" class="java.lang.String"/>
-    <parameter name="FGName" class="java.lang.String"/>
     <parameter name="FGCode" class="java.lang.String"/>
     <parameter name="unit" class="java.lang.String"/>
+    <parameter name="ProductionDate" class="java.lang.String"/>
+    <parameter name="FGName" class="java.lang.String"/>
+    <parameter name="RequiredQuantity" class="java.lang.String"/>
     <queryString>
         <![CDATA[]]>
     </queryString>
-    <field name="sequenceNumber" class="java.lang.String"/>
     <field name="route" class="java.lang.String"/>
-    <field name="itemName" class="java.lang.String"/>
     <field name="itemNo" class="java.lang.String"/>
     <field name="uom" class="java.lang.String"/>
     <field name="lotNo" class="java.lang.String"/>
     <field name="qty" class="java.lang.String"/>
     <field name="shortName" class="java.lang.String"/>
+    <field name="sequenceNumber" class="java.lang.String"/>
+    <field name="itemName" class="java.lang.String"/>
     <background>
-        <band/>
+        <band splitType="Stretch"/>
     </background>
-    <title>
-        <band height="49" splitType="Stretch">
+    <pageHeader>
+        <band height="103" splitType="Stretch">
             <staticText>
-                <reportElement x="223" y="0" width="108" height="23" uuid="a8b42d41-fd8e-4071-a6ac-d29ae8817d5a">
+                <reportElement x="225" y="5" width="108" height="23" uuid="324397fb-d07b-4748-a917-7de93ebbe012">
                     <property name="com.jaspersoft.studio.unit.width" value="px"/>
                     <property name="com.jaspersoft.studio.unit.height" value="px"/>
                 </reportElement>
@@ -34,57 +33,53 @@
                 </textElement>
                 <text><![CDATA[板頭紙]]></text>
             </staticText>
-        </band>
-    </title>
-    <pageHeader>
-        <band height="67" splitType="Stretch">
             <staticText>
-                <reportElement x="430" y="-40" width="40" height="18" uuid="08da12ed-8c2c-45a2-8b21-2654e7e78f9f">
+                <reportElement x="535" y="5" width="25" height="18" uuid="178c50a8-90e2-4c80-95f8-7c27dcc5ce02">
                     <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="12"/>
                 </textElement>
-                <text><![CDATA[頁數]]></text>
+                <text><![CDATA[頁]]></text>
             </staticText>
-            <textField>
-                <reportElement x="470" y="-40" width="20" height="18" uuid="789d3ab7-1b4b-4a56-82fd-460f4ccfa68a">
+            <textField evaluationTime="Report">
+                <reportElement x="515" y="5" width="20" height="18" uuid="9d782ac8-6fd4-4336-abfe-436435476462">
+                    <property name="com.jaspersoft.studio.unit.width" value="px"/>
                     <property name="com.jaspersoft.studio.unit.height" value="px"/>
                 </reportElement>
                 <textElement textAlignment="Center" verticalAlignment="Middle"/>
                 <textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
             </textField>
             <staticText>
-                <reportElement x="530" y="-40" width="25" height="18" uuid="1004a3c8-2b90-4011-a2a4-2b6122306cdb">
+                <reportElement x="495" y="5" width="20" height="18" uuid="bb483d46-d12d-40a4-ab31-5353cdf68162">
                     <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="Center" verticalAlignment="Justified">
                     <font fontName="微軟正黑體" size="12"/>
                 </textElement>
-                <text><![CDATA[頁]]></text>
+                <text><![CDATA[/]]></text>
             </staticText>
-            <textField evaluationTime="Report">
-                <reportElement x="510" y="-40" width="20" height="18" uuid="11007a4e-87af-42ba-a978-30934d4ecc22">
-                    <property name="com.jaspersoft.studio.unit.width" value="px"/>
+            <textField>
+                <reportElement x="475" y="5" width="20" height="18" uuid="7b27be01-3bb1-42f5-a4b1-6dd3674c2b8d">
                     <property name="com.jaspersoft.studio.unit.height" value="px"/>
                 </reportElement>
                 <textElement textAlignment="Center" verticalAlignment="Middle"/>
                 <textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
             </textField>
             <staticText>
-                <reportElement x="490" y="-40" width="20" height="18" uuid="b9168c5b-b877-49c1-98e7-e87db5d77f8d">
+                <reportElement x="435" y="5" width="40" height="18" uuid="e9a7bc86-91db-4ea2-ae67-89f596f356de">
                     <property name="com.jaspersoft.studio.unit.y" value="px"/>
                     <property name="com.jaspersoft.studio.unit.height" value="px"/>
                 </reportElement>
-                <textElement textAlignment="Center" verticalAlignment="Justified">
+                <textElement textAlignment="Center" verticalAlignment="Middle">
                     <font fontName="微軟正黑體" size="12"/>
                 </textElement>
-                <text><![CDATA[/]]></text>
+                <text><![CDATA[頁數]]></text>
             </staticText>
             <staticText>
-                <reportElement x="0" y="0" width="80" height="18" uuid="cf828c0c-977d-4338-98b0-ff3680ba4d98">
+                <reportElement x="5" y="35" width="80" height="18" uuid="11b7324d-086a-427b-bd9b-78ca6789f1fa">
                     <property name="com.jaspersoft.studio.unit.y" value="px"/>
                     <property name="com.jaspersoft.studio.unit.height" value="px"/>
                 </reportElement>
@@ -94,16 +89,16 @@
                 <text><![CDATA[工單編號：]]></text>
             </staticText>
             <textField>
-                <reportElement x="80" y="0" width="150" height="18" uuid="0c64d973-2553-4a43-9f7e-60722bcf28fa">
+                <reportElement x="85" y="35" width="150" height="18" uuid="abfe6fd4-11e3-463b-b075-ed6b335e4a97">
                     <property name="com.jaspersoft.studio.unit.height" value="px"/>
                 </reportElement>
                 <textElement verticalAlignment="Middle">
-                    <font fontName="微軟正黑體"/>
+                    <font fontName="微軟正黑體" size="12"/>
                 </textElement>
                 <textFieldExpression><![CDATA[$P{JobOrderCode}]]></textFieldExpression>
             </textField>
             <staticText>
-                <reportElement x="0" y="20" width="80" height="18" uuid="591d3291-7a4f-41bf-9b7e-86b48c341cbe">
+                <reportElement x="5" y="55" width="80" height="18" uuid="17445159-6cfb-46a0-835d-8cdc1585b793">
                     <property name="com.jaspersoft.studio.unit.y" value="px"/>
                     <property name="com.jaspersoft.studio.unit.height" value="px"/>
                 </reportElement>
@@ -113,16 +108,16 @@
                 <text><![CDATA[成品編號：]]></text>
             </staticText>
             <textField>
-                <reportElement x="80" y="20" width="150" height="18" uuid="5e1e4cbb-4ecc-4132-87ce-28d856af35a0">
+                <reportElement x="85" y="55" width="150" height="18" uuid="c9a7aaad-ef1a-4e42-9c32-794dcf5d8ca9">
                     <property name="com.jaspersoft.studio.unit.height" value="px"/>
                 </reportElement>
                 <textElement verticalAlignment="Middle">
-                    <font fontName="微軟正黑體"/>
+                    <font fontName="微軟正黑體" size="12"/>
                 </textElement>
                 <textFieldExpression><![CDATA[$P{FGCode}]]></textFieldExpression>
             </textField>
             <staticText>
-                <reportElement x="280" y="20" width="80" height="18" uuid="3196ab21-a4c1-4c2e-a42c-b2b46ae31f5c">
+                <reportElement x="285" y="55" width="80" height="18" uuid="12a14105-c207-4550-a9bd-30a74a25a5c4">
                     <property name="com.jaspersoft.studio.unit.y" value="px"/>
                     <property name="com.jaspersoft.studio.unit.height" value="px"/>
                 </reportElement>
@@ -132,16 +127,16 @@
                 <text><![CDATA[成品名稱：]]></text>
             </staticText>
             <textField>
-                <reportElement x="360" y="20" width="150" height="18" uuid="af8e72b2-88ca-4069-a2c4-2d2969a5e62c">
+                <reportElement x="365" y="55" width="150" height="18" uuid="62720d55-e8e1-49c8-a420-8318685e9e58">
                     <property name="com.jaspersoft.studio.unit.height" value="px"/>
                 </reportElement>
                 <textElement verticalAlignment="Middle">
-                    <font fontName="微軟正黑體"/>
+                    <font fontName="微軟正黑體" size="12"/>
                 </textElement>
                 <textFieldExpression><![CDATA[$P{FGName}]]></textFieldExpression>
             </textField>
             <staticText>
-                <reportElement x="280" y="40" width="80" height="18" uuid="aef62434-b98d-4072-804b-30793c6638ae">
+                <reportElement x="285" y="75" width="80" height="18" uuid="3ec46348-493e-403f-aefb-5f4aef992877">
                     <property name="com.jaspersoft.studio.unit.y" value="px"/>
                     <property name="com.jaspersoft.studio.unit.height" value="px"/>
                 </reportElement>
@@ -151,16 +146,16 @@
                 <text><![CDATA[需求數量：]]></text>
             </staticText>
             <textField>
-                <reportElement x="360" y="40" width="150" height="18" uuid="328bbf03-e9e7-4d11-be7b-c1378614e416">
+                <reportElement x="365" y="75" width="150" height="18" uuid="367706ae-196f-4b5d-b9b2-5fbc4d70ce9b">
                     <property name="com.jaspersoft.studio.unit.height" value="px"/>
                 </reportElement>
                 <textElement verticalAlignment="Middle">
-                    <font fontName="微軟正黑體"/>
+                    <font fontName="微軟正黑體" size="12"/>
                 </textElement>
                 <textFieldExpression><![CDATA[$P{RequiredQuantity}]]></textFieldExpression>
             </textField>
             <staticText>
-                <reportElement x="280" y="0" width="80" height="18" uuid="c3cf5d66-192f-429e-a7f2-09fcf3a8acc2">
+                <reportElement x="285" y="35" width="80" height="18" uuid="411116fd-f273-4eed-bd6c-1db269cd9adb">
                     <property name="com.jaspersoft.studio.unit.y" value="px"/>
                     <property name="com.jaspersoft.studio.unit.height" value="px"/>
                 </reportElement>
@@ -170,16 +165,16 @@
                 <text><![CDATA[生產日期：]]></text>
             </staticText>
             <textField>
-                <reportElement x="360" y="0" width="150" height="18" uuid="ca8ef46f-67c8-4064-9cdb-4fd1fb4c5255">
+                <reportElement x="365" y="35" width="150" height="18" uuid="f044c78b-cdcb-4a90-81c5-a6fc81b73efc">
                     <property name="com.jaspersoft.studio.unit.height" value="px"/>
                 </reportElement>
                 <textElement verticalAlignment="Middle">
-                    <font fontName="微軟正黑體"/>
+                    <font fontName="微軟正黑體" size="12"/>
                 </textElement>
                 <textFieldExpression><![CDATA[$P{ProductionDate}]]></textFieldExpression>
             </textField>
             <staticText>
-                <reportElement x="0" y="40" width="80" height="18" uuid="a10306aa-d29d-4f57-a78e-36ce6f27d8e2">
+                <reportElement x="5" y="75" width="80" height="18" uuid="e280f805-b423-4ac7-a429-2d5d81edf3bc">
                     <property name="com.jaspersoft.studio.unit.y" value="px"/>
                     <property name="com.jaspersoft.studio.unit.height" value="px"/>
                 </reportElement>
@@ -189,20 +184,20 @@
                 <text><![CDATA[銷售單位：]]></text>
             </staticText>
             <textField>
-                <reportElement x="80" y="40" width="150" height="18" uuid="d712eadd-c351-4497-a4fa-8b28af934053">
+                <reportElement x="85" y="75" width="150" height="18" uuid="ee5b0bcd-5a86-43e1-a003-ea5c7b9dd147">
                     <property name="com.jaspersoft.studio.unit.height" value="px"/>
                 </reportElement>
                 <textElement verticalAlignment="Middle">
-                    <font fontName="微軟正黑體"/>
+                    <font fontName="微軟正黑體" size="12"/>
                 </textElement>
                 <textFieldExpression><![CDATA[$P{unit}]]></textFieldExpression>
             </textField>
         </band>
     </pageHeader>
     <columnHeader>
-        <band height="31" splitType="Stretch">
+        <band height="42" splitType="Stretch">
             <staticText>
-                <reportElement x="0" y="5" width="50" height="18" uuid="217b23a0-55c2-4530-a39f-75f59124eeb8">
+                <reportElement x="0" y="10" width="50" height="18" uuid="c4baf479-7a41-49cb-a2cf-be798e11b2c1">
                     <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"/>
@@ -213,7 +208,7 @@
                 <text><![CDATA[序號]]></text>
             </staticText>
             <staticText>
-                <reportElement x="50" y="5" width="50" height="18" uuid="b0a7c4c9-246d-41d3-a277-0ddcc2cedfc7">
+                <reportElement x="50" y="10" width="95" height="18" uuid="e66fdecd-3672-423d-8a10-ed078a5ac5bf">
                     <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"/>
@@ -224,7 +219,7 @@
                 <text><![CDATA[路綫]]></text>
             </staticText>
             <staticText>
-                <reportElement x="100" y="5" width="140" height="18" uuid="51a88f87-33d7-47cf-b2a4-255d93860243">
+                <reportElement x="145" y="10" width="80" height="18" uuid="38721c72-5f81-4be3-b1e1-335562f1dc38">
                     <property name="com.jaspersoft.studio.unit.y" value="px"/>
                     <property name="com.jaspersoft.studio.unit.height" value="px"/>
                 </reportElement>
@@ -234,7 +229,7 @@
                 <text><![CDATA[貨品編號]]></text>
             </staticText>
             <staticText>
-                <reportElement x="240" y="5" width="230" height="18" uuid="0d311aa9-9b98-41a6-9573-df8dd6774d43">
+                <reportElement x="225" y="10" width="245" height="18" uuid="558582fa-0269-47d6-960b-305e51a8ff0c">
                     <property name="com.jaspersoft.studio.unit.y" value="px"/>
                     <property name="com.jaspersoft.studio.unit.height" value="px"/>
                 </reportElement>
@@ -244,7 +239,7 @@
                 <text><![CDATA[貨品名稱]]></text>
             </staticText>
             <staticText>
-                <reportElement x="470" y="5" width="84" height="18" uuid="9fafa39e-44bb-422e-8af5-0ba39b6b61c2">
+                <reportElement x="470" y="10" width="84" height="18" uuid="bae79e0c-96f8-45dc-a5db-1c85466f860a">
                     <property name="com.jaspersoft.studio.unit.y" value="px"/>
                     <property name="com.jaspersoft.studio.unit.height" value="px"/>
                 </reportElement>
@@ -254,21 +249,21 @@
                 <text><![CDATA[已提數量]]></text>
             </staticText>
             <line>
-                <reportElement x="0" y="28" width="554" height="1" uuid="9fd6de66-9d8c-40f0-b924-9122c08d2e7f">
+                <reportElement x="0" y="33" width="554" height="1" uuid="ff5ea71d-829e-40f0-bfa8-d223d9fc7769">
                     <property name="com.jaspersoft.studio.unit.height" value="px"/>
                 </reportElement>
             </line>
             <line>
-                <reportElement x="0" y="23" width="554" height="1" uuid="bc56e45d-0100-4268-81d4-f660c1b3e92c">
+                <reportElement x="0" y="28" width="554" height="1" uuid="f8aa06c3-5656-4ce4-9e16-71ca47e0036f">
                     <property name="com.jaspersoft.studio.unit.height" value="px"/>
                 </reportElement>
             </line>
         </band>
     </columnHeader>
     <detail>
-        <band height="41" splitType="Stretch">
+        <band height="44" splitType="Stretch">
             <textField>
-                <reportElement x="100" y="0" width="140" height="18" uuid="754bac1b-aca4-4877-9985-2181fef7daa0">
+                <reportElement x="145" y="0" width="80" height="18" uuid="115d523b-e9c3-484e-9663-4f4953555258">
                     <property name="com.jaspersoft.studio.unit.height" value="px"/>
                 </reportElement>
                 <textElement verticalAlignment="Top">
@@ -277,7 +272,7 @@
                 <textFieldExpression><![CDATA[$F{itemNo}]]></textFieldExpression>
             </textField>
             <textField>
-                <reportElement x="0" y="0" width="50" height="18" uuid="70949de9-80b1-4b52-9890-58b6f4771881">
+                <reportElement x="0" y="0" width="50" height="18" uuid="619701f2-9515-433e-9bb5-cfe5d0a3e8c6">
                     <property name="com.jaspersoft.studio.unit.height" value="px"/>
                 </reportElement>
                 <textElement verticalAlignment="Top">
@@ -286,7 +281,7 @@
                 <textFieldExpression><![CDATA[$F{sequenceNumber}]]></textFieldExpression>
             </textField>
             <textField>
-                <reportElement x="50" y="0" width="50" height="18" uuid="e488844e-60b1-4d4a-a354-75854743ca6f">
+                <reportElement x="50" y="0" width="95" height="18" uuid="d6f3c123-c7e2-4c98-b14c-4e6e27197b78">
                     <property name="com.jaspersoft.studio.unit.height" value="px"/>
                 </reportElement>
                 <textElement verticalAlignment="Top">
@@ -295,7 +290,7 @@
                 <textFieldExpression><![CDATA[$F{route}]]></textFieldExpression>
             </textField>
             <textField>
-                <reportElement x="240" y="0" width="230" height="18" uuid="f83fe83d-cac2-4acf-ab0b-5e083b96ff9d">
+                <reportElement x="225" y="0" width="245" height="18" uuid="7b2f23a2-277f-4eec-af2b-468e5000d801">
                     <property name="com.jaspersoft.studio.unit.height" value="px"/>
                 </reportElement>
                 <textElement verticalAlignment="Top">
@@ -304,7 +299,7 @@
                 <textFieldExpression><![CDATA[$F{itemName} + "(" +  $F{uom}  + ")"]]></textFieldExpression>
             </textField>
             <textField>
-                <reportElement x="240" y="17" width="230" height="18" uuid="63718c20-dff3-44b1-98a7-5ebffb387ba0">
+                <reportElement x="225" y="17" width="245" height="18" uuid="11233863-3357-4fe3-9b32-31e93927f23e">
                     <property name="com.jaspersoft.studio.unit.height" value="px"/>
                 </reportElement>
                 <textElement verticalAlignment="Top">
@@ -313,22 +308,19 @@
                 <textFieldExpression><![CDATA[$F{lotNo}]]></textFieldExpression>
             </textField>
             <textField>
-                <reportElement x="470" y="-1" width="84" height="18" uuid="d68ec026-2bc5-42c5-86ed-c965029eda73">
+                <reportElement x="470" y="-1" width="84" height="18" uuid="1ae1c905-d97b-4f47-b72d-f11789ee5891">
                     <property name="com.jaspersoft.studio.unit.height" value="px"/>
                 </reportElement>
-                <textElement verticalAlignment="Top">
+                <textElement textAlignment="Left" verticalAlignment="Top">
                     <font fontName="微軟正黑體"/>
                 </textElement>
                 <textFieldExpression><![CDATA[$F{qty} + $F{shortName}]]></textFieldExpression>
             </textField>
             <line>
-                <reportElement x="0" y="35" width="554" height="1" uuid="dc31083e-6b91-4c66-a4b1-96eed417bbcb">
+                <reportElement x="0" y="35" width="554" height="1" uuid="d7111b08-77a9-4f83-931a-985d2768ddb6">
                     <property name="com.jaspersoft.studio.unit.height" value="px"/>
                 </reportElement>
             </line>
         </band>
     </detail>
-    <pageFooter>
-        <band height="655"/>
-    </pageFooter>
 </jasperReport>