FIX FONT + NEW VER DN LABELS

src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DeliveryOrderService.kt

@@ -1360,7 +1360,11 @@ open class DeliveryOrderService(
         }
         params["deliveryNoteCode"] = doPickOrderRecord.deliveryNoteCode ?: ""
         params["shopAddress"] = cartonLabelInfo[0].shopAddress ?: ""
-        params["shopName"] = doPickOrderRecord.shopName ?: cartonLabelInfo[0].shopName ?: ""
+        val rawShopLabel = doPickOrderRecord.shopName ?: cartonLabelInfo[0].shopName ?: ""
+        val parsedShopLabel = parseShopLabelForCartonLabel(rawShopLabel)
+        params["shopCode"] = parsedShopLabel.shopCode
+        params["shopCodeAbbr"] = parsedShopLabel.shopCodeAbbr
+        params["shopName"] = parsedShopLabel.shopNameForLabel
         params["truckNo"] = doPickOrderRecord.truckLanceCode ?: ""
 
         for (cartonNumber in 1..request.numOfCarton) {
@@ -1374,6 +1378,44 @@ open class DeliveryOrderService(
         )
     }
 
+    private data class ParsedShopLabelForCartonLabel(
+        val shopCode: String,
+        val shopCodeAbbr: String,
+        val shopNameForLabel: String
+    )
+
+    private fun parseShopLabelForCartonLabel(rawInput: String): ParsedShopLabelForCartonLabel {
+        // Fixed input format: shopCode - shopName1-shopName2
+        val raw = rawInput.trim()
+
+        val (shopCodePartRaw, restPart) = raw.split(" - ", limit = 2).let { parts ->
+            (parts.getOrNull(0)?.trim().orEmpty()) to (parts.getOrNull(1)?.trim().orEmpty())
+        }
+
+        val shopCode = shopCodePartRaw.let { code ->
+            val trimmed = code.trim()
+            if (trimmed.length > 5) trimmed.substring(0, 5) else trimmed
+        }
+
+        val (shopName1, shopName2) = restPart.split("-", limit = 2).let { parts ->
+            (parts.getOrNull(0)?.trim().orEmpty()) to (parts.getOrNull(1)?.trim().orEmpty())
+        }
+
+        val shopNameForLabel = if (shopName2.isNotBlank()) {
+            "$shopName1\n$shopName2"
+        } else {
+            shopName1
+        }
+
+        val shopCodeAbbr = if (shopCode.length >= 2) shopCode.substring(0, 2) else shopCode
+
+        return ParsedShopLabelForCartonLabel(
+            shopCode = shopCode,
+            shopCodeAbbr = shopCodeAbbr,
+            shopNameForLabel = shopNameForLabel
+        )
+    }
+
 
     //Print Carton Labels
     @Transactional

src/main/resources/DeliveryNote/DeliveryNoteCartonLabelsPDF.jrxml

@@ -1,166 +1,180 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 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="Blank_A4" pageWidth="425" pageHeight="283" columnWidth="385" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="baa9f270-b398-4f1c-b01e-ba216b7997e9">
-	<property name="com.jaspersoft.studio.unit." value="pixel"/>
-	<property name="com.jaspersoft.studio.unit.pageHeight" value="pixel"/>
-	<property name="com.jaspersoft.studio.unit.pageWidth" value="pixel"/>
-	<property name="com.jaspersoft.studio.unit.topMargin" value="pixel"/>
-	<property name="com.jaspersoft.studio.unit.bottomMargin" value="pixel"/>
-	<property name="com.jaspersoft.studio.unit.leftMargin" value="pixel"/>
-	<property name="com.jaspersoft.studio.unit.rightMargin" value="pixel"/>
-	<property name="com.jaspersoft.studio.unit.columnWidth" value="pixel"/>
-	<property name="com.jaspersoft.studio.unit.columnSpacing" value="pixel"/>
-	<parameter name="shopPurchaseOrderNo" class="java.lang.String"/>
-	<parameter name="shopName" class="java.lang.String"/>
-	<parameter name="shopAddress" class="java.lang.String"/>
-	<parameter name="deliveryNoteCode" class="java.lang.String"/>
-	<parameter name="truckNo" class="java.lang.String"/>
-	<queryString>
-		<![CDATA[]]>
-	</queryString>
-	<background>
-		<band splitType="Stretch"/>
-	</background>
-	<detail>
-		<band height="243" splitType="Stretch">
-			<property name="com.jaspersoft.studio.unit.height" value="px"/>
-			<textField>
-				<reportElement x="140" y="180" width="240" height="30" uuid="8fac39f8-4936-43a5-8e1f-1afbc8ccca9c">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-				</reportElement>
-				<textElement verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="16"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{shopPurchaseOrderNo}]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement x="0" y="180" width="140" height="30" uuid="e03fcb92-259c-4427-a68e-60fe5924d763">
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="16"/>
-				</textElement>
-				<text><![CDATA[店鋪採購單編號：
+    <property name="com.jaspersoft.studio.unit." value="pixel"/>
+    <property name="com.jaspersoft.studio.unit.pageHeight" value="pixel"/>
+    <property name="com.jaspersoft.studio.unit.pageWidth" value="pixel"/>
+    <property name="com.jaspersoft.studio.unit.topMargin" value="pixel"/>
+    <property name="com.jaspersoft.studio.unit.bottomMargin" value="pixel"/>
+    <property name="com.jaspersoft.studio.unit.leftMargin" value="pixel"/>
+    <property name="com.jaspersoft.studio.unit.rightMargin" value="pixel"/>
+    <property name="com.jaspersoft.studio.unit.columnWidth" value="pixel"/>
+    <property name="com.jaspersoft.studio.unit.columnSpacing" value="pixel"/>
+    <parameter name="shopPurchaseOrderNo" class="java.lang.String"/>
+    <parameter name="shopName" class="java.lang.String"/>
+    <parameter name="shopAddress" class="java.lang.String"/>
+    <parameter name="deliveryNoteCode" class="java.lang.String"/>
+    <parameter name="truckNo" class="java.lang.String"/>
+    <parameter name="shopCode" class="java.lang.String"/>
+    <parameter name="shopCodeAbbr" class="java.lang.String"/>
+    <queryString>
+        <![CDATA[]]>
+    </queryString>
+    <background>
+        <band splitType="Stretch"/>
+    </background>
+    <detail>
+        <band height="243" splitType="Stretch">
+            <property name="com.jaspersoft.studio.unit.height" value="px"/>
+            <textField>
+                <reportElement x="142" y="210" width="240" height="30" uuid="8fac39f8-4936-43a5-8e1f-1afbc8ccca9c">
+                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
+                    <property name="com.jaspersoft.studio.unit.width" value="px"/>
+                </reportElement>
+                <textElement verticalAlignment="Middle">
+                    <font fontName="微軟正黑體" size="16"/>
+                </textElement>
+                <textFieldExpression><![CDATA[$P{shopPurchaseOrderNo}]]></textFieldExpression>
+            </textField>
+            <staticText>
+                <reportElement x="2" y="210" width="140" height="30" uuid="e03fcb92-259c-4427-a68e-60fe5924d763">
+                    <property name="com.jaspersoft.studio.unit.width" value="px"/>
+                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
+                </reportElement>
+                <textElement verticalAlignment="Middle">
+                    <font fontName="微軟正黑體" size="16"/>
+                </textElement>
+                <text><![CDATA[店鋪採購單編號：
 ]]></text>
-			</staticText>
-			<staticText>
-				<reportElement x="0" y="213" width="140" height="30" uuid="c8e417ed-73ce-4349-b83c-e59e25258544">
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="16"/>
-				</textElement>
-				<text><![CDATA[箱數：]]></text>
-			</staticText>
-			<staticText>
-				<reportElement x="0" y="150" width="140" height="30" uuid="f3ffd4ee-0513-41a5-94d7-f1fdb9966a76">
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="16"/>
-				</textElement>
-				<text><![CDATA[送貨單編號：]]></text>
-			</staticText>
-			<textField>
-				<reportElement x="140" y="150" width="240" height="30" uuid="4319059b-9096-4c49-8275-287be93d3e6a">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-				</reportElement>
-				<textElement verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="16"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{deliveryNoteCode}]]></textFieldExpression>
-			</textField>
-			<textField textAdjust="ScaleFont">
-				<reportElement x="0" y="0" width="380" height="40" uuid="9a440925-1bd4-4001-9b4b-7163ac27551e">
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="18" isBold="true" isUnderline="false"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{shopName}]]></textFieldExpression>
-			</textField>
-			<textField textAdjust="ScaleFont">
-				<reportElement x="0" y="40" width="380" height="70" uuid="26b2c156-341b-4f59-abce-bd84ea000d9d">
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement verticalAlignment="Top">
-					<font fontName="微軟正黑體" size="16" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{shopAddress}]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement x="255" y="213" width="35" height="30" uuid="7467bc85-22c2-4b2a-bed0-a2e82a5dba6d">
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="16"/>
-				</textElement>
-				<text><![CDATA[箱]]></text>
-			</staticText>
-			<textField>
-				<reportElement x="140" y="213" width="40" height="30" uuid="e340a673-9fdc-4559-8431-af8ea391c472">
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="16"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
-			</textField>
-			<textField evaluationTime="Report">
-				<reportElement x="215" y="213" width="40" height="30" uuid="89ccad73-0571-4291-ae26-7804925d47eb">
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="16"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement x="180" y="213" width="35" height="30" uuid="1cdd7507-299b-406b-baab-d2c23e44eeb0">
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="16"/>
-				</textElement>
-				<text><![CDATA[/]]></text>
-			</staticText>
-			<staticText>
-				<reportElement x="0" y="120" width="140" height="30" uuid="c8b9fafb-9e8b-479f-9a9f-dadda7854f95">
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<textElement verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="16"/>
-				</textElement>
-				<text><![CDATA[貨車班次：
+            </staticText>
+            <staticText>
+                <reportElement x="2" y="180" width="140" height="30" uuid="f3ffd4ee-0513-41a5-94d7-f1fdb9966a76">
+                    <property name="com.jaspersoft.studio.unit.width" value="px"/>
+                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
+                </reportElement>
+                <textElement verticalAlignment="Middle">
+                    <font fontName="微軟正黑體" size="16"/>
+                </textElement>
+                <text><![CDATA[送貨單編號：]]></text>
+            </staticText>
+            <textField>
+                <reportElement x="142" y="180" width="240" height="30" uuid="4319059b-9096-4c49-8275-287be93d3e6a">
+                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
+                    <property name="com.jaspersoft.studio.unit.width" value="px"/>
+                </reportElement>
+                <textElement verticalAlignment="Middle">
+                    <font fontName="微軟正黑體" size="16"/>
+                </textElement>
+                <textFieldExpression><![CDATA[$P{deliveryNoteCode}]]></textFieldExpression>
+            </textField>
+            <textField textAdjust="ScaleFont">
+                <reportElement x="0" y="0" width="220" height="50" uuid="9a440925-1bd4-4001-9b4b-7163ac27551e">
+                    <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="38" isBold="true" isUnderline="false"/>
+                </textElement>
+                <textFieldExpression><![CDATA[$P{shopCode}]]></textFieldExpression>
+            </textField>
+            <staticText>
+                <reportElement x="2" y="150" width="140" height="30" uuid="c8b9fafb-9e8b-479f-9a9f-dadda7854f95">
+                    <property name="com.jaspersoft.studio.unit.width" value="px"/>
+                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
+                </reportElement>
+                <textElement verticalAlignment="Middle">
+                    <font fontName="微軟正黑體" size="16"/>
+                </textElement>
+                <text><![CDATA[貨車班次：
 ]]></text>
-			</staticText>
-			<textField>
-				<reportElement x="140" y="120" width="240" height="30" uuid="57f8e4fa-cea0-42c5-b9e5-a33f0a2710b8">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-				</reportElement>
-				<textElement verticalAlignment="Middle">
-					<font fontName="微軟正黑體" size="16" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{truckNo}]]></textFieldExpression>
-			</textField>
-			<line>
-				<reportElement x="0" y="110" width="380" height="1" uuid="3e37c027-d6e9-4a88-b64d-58ba1dd3b22e">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-			</line>
-		</band>
-	</detail>
+            </staticText>
+            <textField>
+                <reportElement x="142" y="150" width="240" height="30" uuid="57f8e4fa-cea0-42c5-b9e5-a33f0a2710b8">
+                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
+                    <property name="com.jaspersoft.studio.unit.width" value="px"/>
+                </reportElement>
+                <textElement verticalAlignment="Middle">
+                    <font fontName="微軟正黑體" size="16" isBold="true"/>
+                </textElement>
+                <textFieldExpression><![CDATA[$P{truckNo}]]></textFieldExpression>
+            </textField>
+            <line>
+                <reportElement x="2" y="140" width="380" height="1" uuid="3e37c027-d6e9-4a88-b64d-58ba1dd3b22e">
+                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
+                </reportElement>
+            </line>
+            <textField textAdjust="ScaleFont">
+                <reportElement x="230" y="0" width="152" height="99" uuid="ed6f8ce7-e351-4eeb-9f95-49d64e7ed2dd">
+                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
+                    <property name="com.jaspersoft.studio.unit.width" value="px"/>
+                </reportElement>
+                <box>
+                    <pen lineWidth="4.0"/>
+                </box>
+                <textElement textAlignment="Center" verticalAlignment="Middle">
+                    <font fontName="微軟正黑體" size="100" isBold="true" isUnderline="false"/>
+                </textElement>
+                <textFieldExpression><![CDATA[$P{shopCodeAbbr}]]></textFieldExpression>
+            </textField>
+            <textField textAdjust="ScaleFont">
+                <reportElement x="0" y="50" width="220" height="49" uuid="75a47bc6-5830-4636-9c62-1285163bf0b6">
+                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
+                </reportElement>
+                <textElement textAlignment="Left" verticalAlignment="Top">
+                    <font fontName="微軟正黑體" size="22" isBold="true" isUnderline="false"/>
+                </textElement>
+                <textFieldExpression><![CDATA[$P{shopName}]]></textFieldExpression>
+            </textField>
+            <staticText>
+                <reportElement x="2" y="106" width="140" height="30" uuid="0ccaeebc-681b-449e-b547-97fc86c35662">
+                    <property name="com.jaspersoft.studio.unit.width" value="px"/>
+                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
+                </reportElement>
+                <textElement verticalAlignment="Middle">
+                    <font fontName="微軟正黑體" size="16"/>
+                </textElement>
+                <text><![CDATA[箱數：]]></text>
+            </staticText>
+            <staticText>
+                <reportElement x="262" y="106" width="120" height="30" uuid="05bc180b-a58d-4ad8-95f6-bc3090ee2c2d">
+                    <property name="com.jaspersoft.studio.unit.width" value="px"/>
+                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
+                </reportElement>
+                <textElement textAlignment="Left" verticalAlignment="Middle">
+                    <font fontName="微軟正黑體" size="16"/>
+                </textElement>
+                <text><![CDATA[ 箱（蛋類除外）]]></text>
+            </staticText>
+            <textField>
+                <reportElement x="142" y="106" width="40" height="30" uuid="dab335a5-e253-498c-a9bf-b9707d8e1099">
+                    <property name="com.jaspersoft.studio.unit.width" value="px"/>
+                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
+                </reportElement>
+                <textElement textAlignment="Center" verticalAlignment="Middle">
+                    <font size="16"/>
+                </textElement>
+                <textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
+            </textField>
+            <textField evaluationTime="Report">
+                <reportElement x="217" y="106" width="40" height="30" uuid="66d50bad-7b39-49c1-b127-4d763133ee0c">
+                    <property name="com.jaspersoft.studio.unit.width" value="px"/>
+                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
+                </reportElement>
+                <textElement textAlignment="Center" verticalAlignment="Middle">
+                    <font size="16"/>
+                </textElement>
+                <textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
+            </textField>
+            <staticText>
+                <reportElement x="182" y="106" width="35" height="30" uuid="73c18ae5-a07b-4215-a753-fa72d6db87eb">
+                    <property name="com.jaspersoft.studio.unit.width" value="px"/>
+                    <property name="com.jaspersoft.studio.unit.height" value="px"/>
+                </reportElement>
+                <textElement textAlignment="Center" verticalAlignment="Middle">
+                    <font fontName="微軟正黑體" size="16"/>
+                </textElement>
+                <text><![CDATA[/]]></text>
+            </staticText>
+        </band>
+    </detail>
 </jasperReport>

src/main/resources/fonts/fonts.xml

@@ -2,7 +2,7 @@
 <fontFamilies>
     <fontFamily name="微軟正黑體">
         <normal>fonts/msjh_0.ttf</normal>
-        <bold>fonts/msjhbd.ttc</bold>
+        <bold>fonts/msjh_0.ttf</bold>
         <italic>fonts/msjh_0.ttf</italic>
         <boldItalic>fonts/msjh_0.ttf</boldItalic>
         <pdfEncoding>Identity-H</pdfEncoding>
@@ -24,5 +24,4 @@
             <export key="net.sf.jasperreports.xhtml">'華文宋體', Arial, Helvetica, sans-serif</export>
         </exportFonts>
     </fontFamily>
-</fontFamilies>
-
+</fontFamilies>