From 817d812f78da85b86c98be2da7f230ad32174664 Mon Sep 17 00:00:00 2001
From: "B.E.N.S.O.N" <bensonhkbus@gmail.com>
Date: Mon, 9 Feb 2026 20:21:59 +0800
Subject: [PATCH] Update

---
 .../resources/jasper/FGDeliveryReport.jrxml   | 46 +++++++++----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/main/resources/jasper/FGDeliveryReport.jrxml b/src/main/resources/jasper/FGDeliveryReport.jrxml
index 45312ed..8c98ff9 100644
--- a/src/main/resources/jasper/FGDeliveryReport.jrxml
+++ b/src/main/resources/jasper/FGDeliveryReport.jrxml
@@ -71,16 +71,6 @@
         <groupExpression><![CDATA[$F{itemNo}]]></groupExpression>
         <groupHeader>
             <band height="40">
-                <textField>
-                    <reportElement x="570" y="0" width="118" height="18" uuid="8d42562f-843e-43e7-bb4a-5bf08f9adc89">
-                        <property name="com.jaspersoft.studio.unit.height" value="px"/>
-                        <property name="com.jaspersoft.studio.unit.width" value="px"/>
-                    </reportElement>
-                    <textElement verticalAlignment="Top">
-                        <font fontName="微軟正黑體" size="10"/>
-                    </textElement>
-                    <textFieldExpression><![CDATA[$F{deliveryOrderNo}]]></textFieldExpression>
-                </textField>
                 <textField>
                     <reportElement x="60" y="0" width="70" height="18" uuid="0817468e-35ff-45f0-b863-56dae97e9491">
                         <property name="com.jaspersoft.studio.unit.height" value="px"/>
@@ -112,7 +102,7 @@
                     <text><![CDATA[DN編號]]></text>
                 </staticText>
                 <staticText>
-                    <reportElement x="240" y="20" width="140" height="18" uuid="805d0e34-eda9-45a6-9490-83d2282db99b">
+                    <reportElement x="370" y="20" width="140" height="18" uuid="805d0e34-eda9-45a6-9490-83d2282db99b">
                         <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"/>
@@ -123,7 +113,7 @@
                     <text><![CDATA[門店名稱]]></text>
                 </staticText>
                 <staticText>
-                    <reportElement x="460" y="20" width="100" height="18" uuid="a9c9239d-6640-4196-9ce4-5be81522a99b">
+                    <reportElement x="590" y="20" width="100" height="18" uuid="a9c9239d-6640-4196-9ce4-5be81522a99b">
                         <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"/>
@@ -145,7 +135,7 @@
                     <text><![CDATA[送貨日期]]></text>
                 </staticText>
                 <staticText>
-                    <reportElement x="560" y="20" width="98" height="18" uuid="0f680edd-048d-4ee1-8a00-2ec33eaf2c88">
+                    <reportElement x="690" y="20" width="100" height="18" uuid="0f680edd-048d-4ee1-8a00-2ec33eaf2c88">
                         <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"/>
@@ -156,7 +146,7 @@
                     <text><![CDATA[貨車]]></text>
                 </staticText>
                 <staticText>
-                    <reportElement x="380" y="20" width="80" height="18" uuid="aa069323-43b9-448c-840e-97054ad358ef">
+                    <reportElement x="510" y="20" width="80" height="18" uuid="aa069323-43b9-448c-840e-97054ad358ef">
                         <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"/>
@@ -189,29 +179,29 @@
                     <text><![CDATA[貨品名稱：]]></text>
                 </staticText>
                 <staticText>
-                    <reportElement x="500" y="0" width="70" height="18" uuid="d8d2ecce-255a-46a5-9ded-949df09192de">
+                    <reportElement x="240" y="20" width="130" height="18" uuid="d8d2ecce-255a-46a5-9ded-949df09192de">
                         <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>
             </band>
         </groupHeader>
         <groupFooter>
             <band height="24">
                 <staticText>
-                    <reportElement x="302" y="0" width="78" height="19" uuid="17df3070-773d-4bac-8045-6b59d8673bb4"/>
+                    <reportElement x="432" y="0" width="78" height="19" uuid="17df3070-773d-4bac-8045-6b59d8673bb4"/>
                     <textElement textAlignment="Right" verticalAlignment="Middle">
                         <font fontName="微軟正黑體" size="10" isBold="true"/>
                     </textElement>
                     <text><![CDATA[每單交貨總數：]]></text>
                 </staticText>
                 <textField>
-                    <reportElement x="380" y="0" width="80" height="19" uuid="939e4c5b-176c-4154-aabd-bf06c2a0e594"/>
+                    <reportElement x="510" y="0" width="80" height="19" uuid="939e4c5b-176c-4154-aabd-bf06c2a0e594"/>
                     <textElement textAlignment="Right" verticalAlignment="Middle">
                         <font fontName="微軟正黑體" size="10" isBold="true"/>
                     </textElement>
@@ -378,7 +368,7 @@
                 <textFieldExpression><![CDATA[$F{dnNo}]]></textFieldExpression>
             </textField>
             <textField>
-                <reportElement x="240" y="0" width="140" height="18" uuid="f239f480-ae9f-45f3-a03e-562eab10c304">
+                <reportElement x="370" y="0" width="140" height="18" uuid="f239f480-ae9f-45f3-a03e-562eab10c304">
                     <property name="com.jaspersoft.studio.unit.height" value="px"/>
                     <property name="com.jaspersoft.studio.unit.width" value="px"/>
                 </reportElement>
@@ -388,7 +378,7 @@
                 <textFieldExpression><![CDATA[$F{customerName}]]></textFieldExpression>
             </textField>
             <textField>
-                <reportElement x="380" y="0" width="80" height="18" uuid="143501a2-6a00-4fe2-84c4-2689ad68cbc4">
+                <reportElement x="510" y="0" width="80" height="18" uuid="143501a2-6a00-4fe2-84c4-2689ad68cbc4">
                     <property name="com.jaspersoft.studio.unit.height" value="px"/>
                     <property name="com.jaspersoft.studio.unit.width" value="px"/>
                 </reportElement>
@@ -398,7 +388,7 @@
                 <textFieldExpression><![CDATA[$F{qty}]]></textFieldExpression>
             </textField>
             <textField>
-                <reportElement x="460" y="0" width="100" height="18" uuid="1d124434-b3f7-48dd-89c2-29ea10c28941">
+                <reportElement x="590" y="0" width="100" height="18" uuid="1d124434-b3f7-48dd-89c2-29ea10c28941">
                     <property name="com.jaspersoft.studio.unit.height" value="px"/>
                     <property name="com.jaspersoft.studio.unit.width" value="px"/>
                 </reportElement>
@@ -408,7 +398,7 @@
                 <textFieldExpression><![CDATA[$F{unitOfMeasure}]]></textFieldExpression>
             </textField>
             <textField>
-                <reportElement x="560" y="0" width="98" height="18" uuid="62c1bc61-05ac-450f-9385-75f2f1cba9fd">
+                <reportElement x="690" y="0" width="100" height="18" uuid="62c1bc61-05ac-450f-9385-75f2f1cba9fd">
                     <property name="com.jaspersoft.studio.unit.height" value="px"/>
                     <property name="com.jaspersoft.studio.unit.width" value="px"/>
                 </reportElement>
@@ -417,6 +407,16 @@
                 </textElement>
                 <textFieldExpression><![CDATA[$F{truckNo}]]></textFieldExpression>
             </textField>
+            <textField>
+                <reportElement x="240" y="0" width="130" height="18" uuid="8d42562f-843e-43e7-bb4a-5bf08f9adc89">
+                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
+                    <property name="com.jaspersoft.studio.unit.width" value="px"/>
+                </reportElement>
+                <textElement verticalAlignment="Top">
+                    <font fontName="微軟正黑體" size="10"/>
+                </textElement>
+                <textFieldExpression><![CDATA[$F{deliveryOrderNo}]]></textFieldExpression>
+            </textField>
         </band>
     </detail>
 </jasperReport>